fix: rewrite onlyDataResources

mtojek · mtojek · commit 0a5c90dc572d · 2023-08-23T11:07:14.000+02:00
diff --git a/provisioner/terraform/executor.go b/provisioner/terraform/executor.go
@@ -264,18 +264,21 @@ func (e *executor) plan(ctx, killCtx context.Context, env, vars []string, logr l
 	}, nil
 }
 
-func onlyDataResources(sm *tfjson.StateModule) *tfjson.StateModule {
-	sm2 := *sm
-	sm2.Resources = make([]*tfjson.StateResource, 0, len(sm.Resources))
+func onlyDataResources(sm tfjson.StateModule) tfjson.StateModule {
+	filtered := sm
+	filtered.Resources = []*tfjson.StateResource{}
 	for _, r := range sm.Resources {
 		if r.Mode == "data" {
-			sm2.Resources = append(sm2.Resources, r)
+			filtered.Resources = append(filtered.Resources, r)
 		}
 	}
+
+	filtered.ChildModules = []*tfjson.StateModule{}
 	for _, c := range sm.ChildModules {
-		sm2.ChildModules = append(sm2.ChildModules, onlyDataResources(c))
+		filteredChild := onlyDataResources(*c)
+		filtered.ChildModules = append(filtered.ChildModules, &filteredChild)
 	}
-	return &sm2
+	return filtered
 }
 
 // planResources must only be called while the lock is held.
@@ -300,10 +303,9 @@ func (e *executor) planResources(ctx, killCtx context.Context, planfilePath stri
 		// We don't want all prior resources, because Quotas (and
 		// future features) would never know which resources are getting
 		// deleted by a stop.
-		modules = append(
-			modules,
-			onlyDataResources(plan.PriorState.Values.RootModule),
-		)
+
+		filtered := onlyDataResources(*plan.PriorState.Values.RootModule)
+		modules = append(modules, &filtered)
 	}
 	modules = append(modules, plan.PlannedValues.RootModule)
 
diff --git a/provisioner/terraform/executor_internal_test.go b/provisioner/terraform/executor_internal_test.go
@@ -3,6 +3,7 @@ package terraform
 import (
 	"testing"
 
+	tfjson "github.com/hashicorp/terraform-json"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/provisionersdk/proto"
@@ -41,3 +42,60 @@ From standing in the English rain`))
 	}
 	require.Equal(t, expected, logr.logs)
 }
+
+func TestOnlyDataResources(t *testing.T) {
+	t.Parallel()
+
+	sm := &tfjson.StateModule{
+		Resources: []*tfjson.StateResource{
+			{
+				Name:    "cat",
+				Type:    "coder_parameter",
+				Mode:    "data",
+				Address: "cat-address",
+			},
+			{
+				Name:    "dog",
+				Type:    "foobar",
+				Mode:    "magic",
+				Address: "dog-address",
+			},
+			{
+				Name:    "cow",
+				Type:    "foobaz",
+				Mode:    "data",
+				Address: "cow-address",
+			},
+		},
+		ChildModules: []*tfjson.StateModule{
+			{
+				Resources: []*tfjson.StateResource{
+					{
+						Name:    "child-cat",
+						Type:    "coder_parameter",
+						Mode:    "data",
+						Address: "child-cat-address",
+					},
+					{
+						Name:    "child-dog",
+						Type:    "foobar",
+						Mode:    "data",
+						Address: "child-dog-address",
+					},
+					{
+						Name:    "child-cow",
+						Mode:    "data",
+						Type:    "magic",
+						Address: "child-cow-address",
+					},
+				},
+				Address: "child-module-1",
+			},
+		},
+		Address: "fake-module",
+	}
+
+	filtered := onlyDataResources(*sm)
+	require.Len(t, filtered.Resources, 2)
+	require.Len(t, filtered.ChildModules, 1)
+}
