Merge remote-tracking branch 'origin/main'

# Conflicts:
#	cmd/internal/model/terraform/terraform_provider.go

Author: mcasperson

cmd/convert_project_js_wasm.go

@@ -202,7 +202,7 @@ func processJavaScriptResources(resources []converters.ResourceDetails) (map[str
 		return resourcesSlice[i].ResourceType < resourcesSlice[j].ResourceType
 	})
 
-	for _, r := range resourcesSlice {
+	for index, r := range resourcesSlice {
 		// Some resources are already resolved by their parent, but exist in the resource details map as a lookup.
 		// In these cases, ToHclByProjectId is nil.
 		if r.ToHcl == nil {
@@ -216,7 +216,7 @@ func processJavaScriptResources(resources []converters.ResourceDetails) (map[str
 		}
 
 		if len(strings.TrimSpace(hcl)) != 0 {
-			fileMap[r.FileName] = hcl
+			fileMap["tf"+fmt.Sprintln(index)+".tf"] = hcl
 		}
 	}
 

cmd/internal/converters/deployment_process_converter.go

@@ -136,7 +136,6 @@ func (c DeploymentProcessConverter) toHcl(resource octopus.DeploymentProcess, re
 								AcquisitionLocation:     p.AcquisitionLocation,
 								ExtractDuringDeployment: &p.ExtractDuringDeployment,
 								FeedId:                  dependencies.GetResourcePointer("Feeds", p.FeedId),
-								Id:                      p.Id,
 								Properties:              c.replaceIds(p.Properties, dependencies),
 							})
 					} else {
@@ -146,7 +145,6 @@ func (c DeploymentProcessConverter) toHcl(resource octopus.DeploymentProcess, re
 							AcquisitionLocation:     p.AcquisitionLocation,
 							ExtractDuringDeployment: nil,
 							FeedId:                  dependencies.GetResourcePointer("Feeds", p.FeedId),
-							Id:                      p.Id,
 							Properties:              c.replaceIds(p.Properties, dependencies),
 						}
 					}