add tests for dynamic<->static block overrides

Author: geokat

override_test.go

@@ -185,6 +185,89 @@ func TestMergeBlock(t *testing.T) {
 		assert.Empty(t, blocks[0].Labels())
 	})
 
+	t.Run("MixedStaticDynamicSuppression", func(t *testing.T) {
+		t.Parallel()
+		primary := parseBlock(t, `resource "a" "b" {
+  option {
+    name = "static"
+  }
+  dynamic "option" {
+    for_each = var.list
+    content {
+      name = option.value
+    }
+  }
+}`)
+		override := parseBlock(t, `resource "a" "b" {
+  option {
+    name = "replaced"
+  }
+}`)
+		mergeBlock(primary, override)
+
+		blocks := primary.Body().Blocks()
+		require.Len(t, blocks, 1)
+		assert.Equal(t, "option", blocks[0].Type())
+		assert.Empty(t, blocks[0].Labels())
+	})
+
+	t.Run("MixedStaticDynamicSuppressionByDynamic", func(t *testing.T) {
+		t.Parallel()
+		primary := parseBlock(t, `resource "a" "b" {
+  option {
+    name = "static"
+  }
+  dynamic "option" {
+    for_each = var.list
+    content {
+      name = option.value
+    }
+  }
+}`)
+		override := parseBlock(t, `resource "a" "b" {
+  dynamic "option" {
+    for_each = var.other
+    content {
+      name = option.value
+    }
+  }
+}`)
+		mergeBlock(primary, override)
+
+		blocks := primary.Body().Blocks()
+		require.Len(t, blocks, 1)
+		assert.Equal(t, "dynamic", blocks[0].Type())
+		require.Len(t, blocks[0].Labels(), 1)
+		assert.Equal(t, "option", blocks[0].Labels()[0])
+	})
+
+	t.Run("StaticSuppressionByMixedOverride", func(t *testing.T) {
+		t.Parallel()
+		primary := parseBlock(t, `resource "a" "b" {
+  option {
+    name = "old"
+  }
+}`)
+		override := parseBlock(t, `resource "a" "b" {
+  option {
+    name = "static"
+  }
+  dynamic "option" {
+    for_each = var.list
+    content {
+      name = option.value
+    }
+  }
+}`)
+		mergeBlock(primary, override)
+
+		blocks := primary.Body().Blocks()
+		require.Len(t, blocks, 2)
+		assert.Equal(t, "option", blocks[0].Type())
+		assert.Equal(t, "dynamic", blocks[1].Type())
+		assert.Equal(t, "option", blocks[1].Labels()[0])
+	})
+
 	t.Run("NoNestedBlocksInOverride", func(t *testing.T) {
 		t.Parallel()
 		primary := parseBlock(t, `resource "a" "b" {

preview_test.go

@@ -612,8 +612,10 @@ func Test_Extract(t *testing.T) {
 			name: "override",
 			dir:  "override",
 			params: map[string]assertParam{
-				"region": ap().value("ap").def("ap").optVals("ap"),
-				"size":   ap().value("100").def("100").optVals("10", "50", "100"),
+				"region":            ap().value("ap").def("ap").optVals("ap"),
+				"size":              ap().value("100").def("100").optVals("10", "50", "100"),
+				"static_to_dynamic": ap().value("a").def("a").optVals("a", "b", "c"),
+				"dynamic_to_static": ap().value("x").def("x").optVals("x", "y"),
 			},
 			presets: map[string]assertPreset{
 				"dev-override": aPre().value("region", "ap"),
@@ -623,6 +625,7 @@ func Test_Extract(t *testing.T) {
 			},
 			variables: map[string]assertVariable{
 				"string_to_number": av().def(cty.NumberIntVal(40)).typeEq(cty.Number),
+				"zones":            av().def(cty.SetVal([]cty.Value{cty.StringVal("a"), cty.StringVal("b"), cty.StringVal("c")})).typeEq(cty.Set(cty.String)),
 			},
 		},
 	} {

testdata/override/a_override.tf

@@ -39,6 +39,29 @@ data "coder_workspace_tags" "tags" {
   }
 }
 
+# Override static options with dynamic.
+data "coder_parameter" "static_to_dynamic" {
+  dynamic "option" {
+    for_each = var.zones
+    content {
+      name  = option.value
+      value = option.value
+    }
+  }
+}
+
+# Override dynamic options with static.
+data "coder_parameter" "dynamic_to_static" {
+  option {
+    name  = "X"
+    value = "x"
+  }
+  option {
+    name  = "Y"
+    value = "y"
+  }
+}
+
 # Override variable.
 variable "string_to_number" {
   type = number

testdata/override/main.tf

@@ -51,6 +51,42 @@ data "coder_workspace_tags" "tags" {
   }
 }
 
+variable "zones" {
+  type    = set(string)
+  default = ["a", "b", "c"]
+}
+
+# Static options, will be overridden by dynamic "option" in a_override.
+data "coder_parameter" "static_to_dynamic" {
+  name    = "static_to_dynamic"
+  type    = "string"
+  default = "a"
+
+  option {
+    name  = "A"
+    value = "a"
+  }
+  option {
+    name  = "B"
+    value = "b"
+  }
+}
+
+# Dynamic options, will be overridden by static option blocks in a_override.
+data "coder_parameter" "dynamic_to_static" {
+  name    = "dynamic_to_static"
+  type    = "string"
+  default = "x"
+
+  dynamic "option" {
+    for_each = var.zones
+    content {
+      name  = option.value
+      value = option.value
+    }
+  }
+}
+
 variable "string_to_number" {
   type    = string
   default = "foo"