SDKv2 Diff tests for Defaults in sets and lists

Author: VenelinMartinov

pkg/tests/diff_test/detailed_diff_list_test.go

@@ -199,6 +199,28 @@ func TestSDKv2DetailedDiffList(t *testing.T) {
 		},
 	}
 
+	listBlockSchemaNestedDefault := schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"prop": {
+				Type:     schema.TypeList,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"nested_prop": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"default": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Default:  "default",
+						},
+					},
+				},
+			},
+		},
+	}
+
 	listPairs := []diffSchemaValueMakerPair[[]string]{
 		{"list attribute", listAttrSchema, listValueMaker},
 		{"list attribute force new", listAttrSchemaForceNew, listValueMaker},
@@ -207,6 +229,11 @@ func TestSDKv2DetailedDiffList(t *testing.T) {
 		{"list block nested force new", listBlockSchemaNestedForceNew, nestedListValueMaker},
 		{"list block sensitive", listBlockSchemaSensitive, nestedListValueMaker},
 		{"list block nested sensitive", listBlockSchemaNestedSensitive, nestedListValueMaker},
+		{"list block nested default", listBlockSchemaNestedDefault, nestedListValueMaker},
+		{
+			"list block nested default with default specified in program",
+			listBlockSchemaNestedDefault, nestedListValueMakerWithDefaultSpecified,
+		},
 	}
 
 	maxItemsOnePairs := []diffSchemaValueMakerPair[[]string]{

pkg/tests/diff_test/detailed_diff_set_test.go

@@ -546,3 +546,37 @@ func TestSDKv2DetailedDiffSetBlockSensitive(t *testing.T) {
 
 	runSDKv2TestMatrix(t, diffSchemaValueMakerPairs, setScenarios())
 }
+
+func TestSDKv2DetailedDiffSetDefault(t *testing.T) {
+	t.Parallel()
+	// Note Default is not valid for set types.
+
+	blockSchemaNestedDefault := schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"prop": {
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"nested_prop": {
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"default": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Default:  "default",
+						},
+					},
+				},
+			},
+		},
+	}
+
+	diffSchemaValueMakerPairs := []diffSchemaValueMakerPair[[]string]{
+		{"block nested default", blockSchemaNestedDefault, nestedListValueMaker},
+		{"block nested default with default specified in program", blockSchemaNestedDefault, nestedListValueMakerWithDefaultSpecified},
+	}
+
+	runSDKv2TestMatrix(t, diffSchemaValueMakerPairs, setScenarios())
+}

pkg/tests/diff_test/value_makers.go

@@ -294,6 +294,29 @@ func nestedListValueMakerWithComputedSpecified(arr *[]string) map[string]cty.Val
 	}
 }
 
+func nestedListValueMakerWithDefaultSpecified(arr *[]string) map[string]cty.Value {
+	if arr == nil {
+		return map[string]cty.Value{}
+	}
+
+	if len(*arr) == 0 {
+		return map[string]cty.Value{
+			"prop": cty.ListValEmpty(cty.DynamicPseudoType),
+		}
+	}
+
+	slice := make([]cty.Value, len(*arr))
+	for i, v := range *arr {
+		slice[i] = cty.ObjectVal(map[string]cty.Value{
+			"nested_prop": cty.StringVal(v),
+			"default":     cty.StringVal("non-default-" + v),
+		})
+	}
+	return map[string]cty.Value{
+		"prop": cty.ListVal(slice),
+	}
+}
+
 var _ valueMaker[[]string] = nestedListValueMakerWithComputedSpecified
 
 type testOutput struct {