Add handling for set nested attribute/block with associated external …

…type (#31)
hashicorp · Aug 10, 2023 · 5f9e61a · 5f9e61a
1 parent 46c3f0e
commit 5f9e61a
Show file tree

Hide file tree

Showing 13 changed files with 1,827 additions and 36 deletions.
diff --git a/internal/cmd/testdata/custom_and_external/all_output/datasource_data_source_gen.go b/internal/cmd/testdata/custom_and_external/all_output/datasource_data_source_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/data_sources_output/datasource_data_source_gen.go b/internal/cmd/testdata/custom_and_external/data_sources_output/datasource_data_source_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/ir.json b/internal/cmd/testdata/custom_and_external/ir.json
@@ -289,6 +289,52 @@
               "computed_optional_required": "optional"
             }
           },
+          {
+            "name": "set_nested_attribute_assoc_ext_type",
+            "set_nested": {
+              "nested_object": {
+                "associated_external_type": {
+                  "import": {
+                    "path": "example.com/apisdk"
+                  },
+                  "type": "*apisdk.Type"
+                },
+                "attributes": [
+                  {
+                    "name": "bool_attribute",
+                    "bool": {
+                      "computed_optional_required": "computed"
+                    }
+                  },
+                  {
+                    "name": "float64_attribute",
+                    "float64": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  },
+                  {
+                    "name": "int64_attribute",
+                    "int64": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  },
+                  {
+                    "name": "number_attribute",
+                    "number": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  },
+                  {
+                    "name": "string_attribute",
+                    "string": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  }
+                ]
+              },
+              "computed_optional_required": "optional"
+            }
+          },
           {
             "name": "single_nested_attribute_one",
             "single_nested": {
@@ -521,6 +567,51 @@
               }
             }
           },
+          {
+            "name": "set_nested_block_assoc_ext_type",
+            "set_nested": {
+              "nested_object": {
+                "associated_external_type": {
+                  "import": {
+                    "path": "example.com/apisdk"
+                  },
+                  "type": "*apisdk.Type"
+                },
+                "attributes": [
+                  {
+                    "name": "bool_attribute",
+                    "bool": {
+                      "computed_optional_required": "computed"
+                    }
+                  },
+                  {
+                    "name": "float64_attribute",
+                    "float64": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  },
+                  {
+                    "name": "int64_attribute",
+                    "int64": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  },
+                  {
+                    "name": "number_attribute",
+                    "number": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  },
+                  {
+                    "name": "string_attribute",
+                    "string": {
+                      "computed_optional_required": "computed_optional"
+                    }
+                  }
+                ]
+              }
+            }
+          },
           {
             "name": "single_nested_block_one",
             "single_nested": {

diff --git a/internal/datasource_convert/set_nested_attribute.go b/internal/datasource_convert/set_nested_attribute.go
@@ -75,9 +75,10 @@ func convertSetNestedAttribute(a *datasource.SetNestedAttribute) (datasource_gen
 
 		CustomType: a.CustomType,
 		NestedObject: datasource_generate.GeneratorNestedAttributeObject{
-			Attributes: attributes,
-			CustomType: a.NestedObject.CustomType,
-			Validators: a.NestedObject.Validators,
+			AssociatedExternalType: a.NestedObject.AssociatedExternalType,
+			Attributes:             attributes,
+			CustomType:             a.NestedObject.CustomType,
+			Validators:             a.NestedObject.Validators,
 		},
 		Validators: a.Validators,
 	}, nil

diff --git a/internal/datasource_convert/set_nested_block.go b/internal/datasource_convert/set_nested_block.go
@@ -95,10 +95,11 @@ func convertSetNestedBlock(b *datasource.SetNestedBlock) (datasource_generate.Ge
 
 		CustomType: b.CustomType,
 		NestedObject: datasource_generate.GeneratorNestedBlockObject{
-			Attributes: attributes,
-			Blocks:     blocks,
-			CustomType: b.NestedObject.CustomType,
-			Validators: b.NestedObject.Validators,
+			AssociatedExternalType: b.NestedObject.AssociatedExternalType,
+			Attributes:             attributes,
+			Blocks:                 blocks,
+			CustomType:             b.NestedObject.CustomType,
+			Validators:             b.NestedObject.Validators,
 		},
 		Validators: b.Validators,
 	}, nil

diff --git a/internal/datasource_generate/set_nested_attribute.go b/internal/datasource_generate/set_nested_attribute.go
@@ -26,6 +26,10 @@ type GeneratorSetNestedAttribute struct {
 	Validators   []specschema.SetValidator
 }
 
+func (g GeneratorSetNestedAttribute) AssocExtType() *generatorschema.AssocExtType {
+	return generatorschema.NewAssocExtType(g.NestedObject.AssociatedExternalType)
+}
+
 func (g GeneratorSetNestedAttribute) AttrType() attr.Type {
 	return types.SetType{
 		//TODO: Add ElemType?
@@ -55,6 +59,9 @@ func (g GeneratorSetNestedAttribute) Imports() *generatorschema.Imports {
 		imports.Append(v.Imports())
 	}
 
+	// TODO: This should only be added if model object helper functions are being generated.
+	imports.Append(generatorschema.AttrImports())
+
 	return imports
 }