Loading imports for associated external type for list, map, set, sing…

…le nested attributes and blocks (#31)
hashicorp · Aug 10, 2023 · 4f10b1e · 4f10b1e
1 parent 780b5d4
commit 4f10b1e
Show file tree

Hide file tree

Showing 23 changed files with 65 additions and 0 deletions.
diff --git a/internal/cmd/testdata/custom_and_external/all_output/provider_provider_gen.go b/internal/cmd/testdata/custom_and_external/all_output/provider_provider_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/all_output/resource_resource_gen.go b/internal/cmd/testdata/custom_and_external/all_output/resource_resource_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/provider_output/provider_provider_gen.go b/internal/cmd/testdata/custom_and_external/provider_output/provider_provider_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/resources_output/resource_resource_gen.go b/internal/cmd/testdata/custom_and_external/resources_output/resource_resource_gen.go
diff --git a/internal/datasource_generate/list_nested_attribute.go b/internal/datasource_generate/list_nested_attribute.go
@@ -62,6 +62,9 @@ func (g GeneratorListNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/datasource_generate/list_nested_block.go b/internal/datasource_generate/list_nested_block.go
@@ -66,6 +66,9 @@ func (g GeneratorListNestedBlock) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/datasource_generate/map_nested_attribute.go b/internal/datasource_generate/map_nested_attribute.go
@@ -62,6 +62,9 @@ func (g GeneratorMapNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/datasource_generate/set_nested_attribute.go b/internal/datasource_generate/set_nested_attribute.go
@@ -62,6 +62,9 @@ func (g GeneratorSetNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/datasource_generate/set_nested_block.go b/internal/datasource_generate/set_nested_block.go
@@ -66,6 +66,9 @@ func (g GeneratorSetNestedBlock) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/datasource_generate/single_nested_attribute.go b/internal/datasource_generate/single_nested_attribute.go
@@ -55,6 +55,9 @@ func (g GeneratorSingleNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/provider_generate/list_nested_attribute.go b/internal/provider_generate/list_nested_attribute.go
@@ -62,6 +62,9 @@ func (g GeneratorListNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/provider_generate/map_nested_attribute.go b/internal/provider_generate/map_nested_attribute.go
@@ -62,6 +62,9 @@ func (g GeneratorMapNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/provider_generate/set_nested_attribute.go b/internal/provider_generate/set_nested_attribute.go
@@ -62,6 +62,9 @@ func (g GeneratorSetNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/provider_generate/set_nested_block.go b/internal/provider_generate/set_nested_block.go
@@ -66,6 +66,9 @@ func (g GeneratorSetNestedBlock) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/provider_generate/single_nested_attribute.go b/internal/provider_generate/single_nested_attribute.go
@@ -55,6 +55,9 @@ func (g GeneratorSingleNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/provider_generate/single_nested_block.go b/internal/provider_generate/single_nested_block.go
@@ -60,6 +60,9 @@ func (g GeneratorSingleNestedBlock) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/resource_generate/list_nested_attribute.go b/internal/resource_generate/list_nested_attribute.go
@@ -79,6 +79,9 @@ func (g GeneratorListNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/resource_generate/list_nested_block.go b/internal/resource_generate/list_nested_block.go
@@ -77,6 +77,9 @@ func (g GeneratorListNestedBlock) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/resource_generate/map_nested_attribute.go b/internal/resource_generate/map_nested_attribute.go
@@ -79,6 +79,9 @@ func (g GeneratorMapNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/resource_generate/set_nested_attribute.go b/internal/resource_generate/set_nested_attribute.go
@@ -79,6 +79,9 @@ func (g GeneratorSetNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/resource_generate/set_nested_block.go b/internal/resource_generate/set_nested_block.go
@@ -77,6 +77,9 @@ func (g GeneratorSetNestedBlock) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.NestedObject.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/resource_generate/single_nested_attribute.go b/internal/resource_generate/single_nested_attribute.go
@@ -67,6 +67,9 @@ func (g GeneratorSingleNestedAttribute) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }
 

diff --git a/internal/resource_generate/single_nested_block.go b/internal/resource_generate/single_nested_block.go
@@ -66,6 +66,9 @@ func (g GeneratorSingleNestedBlock) Imports() *generatorschema.Imports {
 	// TODO: This should only be added if model object helper functions are being generated.
 	imports.Append(generatorschema.AttrImports())
 
+	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.AssociatedExternalType)
+	imports.Append(assocExtTypeImports)
+
 	return imports
 }