fixup! fix provisioner, add resource test

mafredri · mafredri · commit 898bbafda551 · 2025-03-19T13:23:16.000Z
diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go
@@ -3,7 +3,6 @@ package terraform
 import (
 	"context"
 	"fmt"
-	"slices"
 	"strings"
 
 	"github.com/awalterschulze/gographviz"
@@ -622,17 +621,6 @@ func ConvertState(ctx context.Context, modules []*tfjson.StateModule, rawGraph s
 			}
 		}
 	}
-	// Stable order.
-	for _, agents := range resourceAgents {
-		for _, agent := range agents {
-			slices.SortStableFunc(agent.Devcontainers, func(a, b *proto.Devcontainer) int {
-				if n := strings.Compare(a.WorkspaceFolder, b.WorkspaceFolder); n != 0 {
-					return n
-				}
-				return strings.Compare(a.ConfigPath, b.ConfigPath)
-			})
-		}
-	}
 
 	// Associate metadata blocks with resources.
 	resourceMetadata := map[string][]*proto.Resource_Metadata{}
diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go
@@ -1403,6 +1403,9 @@ func sortResources(resources []*proto.Resource) {
 			sort.Slice(agent.Scripts, func(i, j int) bool {
 				return agent.Scripts[i].DisplayName < agent.Scripts[j].DisplayName
 			})
+			sort.Slice(agent.Devcontainers, func(i, j int) bool {
+				return agent.Devcontainers[i].WorkspaceFolder < agent.Devcontainers[j].WorkspaceFolder
+			})
 		}
 		sort.Slice(resource.Agents, func(i, j int) bool {
 			return resource.Agents[i].Name < resource.Agents[j].Name
