Refactored adding Imports() method to AssocExtType and switching attr…

…ibutes to implementing AssocExtType (#31)
hashicorp · Aug 14, 2023 · 05abb31 · 05abb31
1 parent 63e9d9a
commit 05abb31
Show file tree

Hide file tree

Showing 51 changed files with 246 additions and 161 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/provider_output/provider_provider_gen.go b/internal/cmd/testdata/custom_and_external/provider_output/provider_provider_gen.go
diff --git a/internal/datasource_convert/bool_attribute.go b/internal/datasource_convert/bool_attribute.go
@@ -28,8 +28,7 @@ func convertBoolAttribute(a *datasource.BoolAttribute) (datasource_generate.Gene
 			DeprecationMessage:  deprecationMessage(a.DeprecationMessage),
 		},
 
-		AssociatedExternalType: a.AssociatedExternalType,
-		CustomType:             a.CustomType,
-		Validators:             a.Validators,
+		CustomType: a.CustomType,
+		Validators: a.Validators,
 	}, nil
 }
diff --git a/internal/datasource_convert/list_nested_attribute.go b/internal/datasource_convert/list_nested_attribute.go
@@ -75,7 +75,7 @@ func convertListNestedAttribute(a *datasource.ListNestedAttribute) (datasource_g
 
 		CustomType: a.CustomType,
 		NestedObject: datasource_generate.GeneratorNestedAttributeObject{
-			AssociatedExternalType: a.NestedObject.AssociatedExternalType,
+			AssociatedExternalType: generatorschema.NewAssocExtType(a.NestedObject.AssociatedExternalType),
 			Attributes:             attributes,
 			CustomType:             a.NestedObject.CustomType,
 			Validators:             a.NestedObject.Validators,

diff --git a/internal/datasource_convert/list_nested_block.go b/internal/datasource_convert/list_nested_block.go
@@ -95,10 +95,9 @@ func convertListNestedBlock(b *datasource.ListNestedBlock) (datasource_generate.
 
 		CustomType: b.CustomType,
 		NestedObject: datasource_generate.GeneratorNestedBlockObject{
-			Attributes: attributes,
-			Blocks:     blocks,
-
-			AssociatedExternalType: b.NestedObject.AssociatedExternalType,
+			AssociatedExternalType: generatorschema.NewAssocExtType(b.NestedObject.AssociatedExternalType),
+			Attributes:             attributes,
+			Blocks:                 blocks,
 			CustomType:             b.NestedObject.CustomType,
 			Validators:             b.NestedObject.Validators,
 		},

diff --git a/internal/datasource_convert/map_nested_attribute.go b/internal/datasource_convert/map_nested_attribute.go
@@ -75,7 +75,7 @@ func convertMapNestedAttribute(a *datasource.MapNestedAttribute) (datasource_gen
 
 		CustomType: a.CustomType,
 		NestedObject: datasource_generate.GeneratorNestedAttributeObject{
-			AssociatedExternalType: a.NestedObject.AssociatedExternalType,
+			AssociatedExternalType: generatorschema.NewAssocExtType(a.NestedObject.AssociatedExternalType),
 			Attributes:             attributes,
 			CustomType:             a.NestedObject.CustomType,
 			Validators:             a.NestedObject.Validators,

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

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

diff --git a/internal/datasource_convert/single_nested_attribute.go b/internal/datasource_convert/single_nested_attribute.go
@@ -73,7 +73,7 @@ func convertSingleNestedAttribute(a *datasource.SingleNestedAttribute) (datasour
 			DeprecationMessage:  deprecationMessage(a.DeprecationMessage),
 		},
 
-		AssociatedExternalType: a.AssociatedExternalType,
+		AssociatedExternalType: generatorschema.NewAssocExtType(a.AssociatedExternalType),
 		Attributes:             attributes,
 		CustomType:             a.CustomType,
 		Validators:             a.Validators,

diff --git a/internal/datasource_convert/single_nested_block.go b/internal/datasource_convert/single_nested_block.go
@@ -93,7 +93,7 @@ func convertSingleNestedBlock(b *datasource.SingleNestedBlock) (datasource_gener
 			DeprecationMessage:  deprecationMessage(b.DeprecationMessage),
 		},
 
-		AssociatedExternalType: b.AssociatedExternalType,
+		AssociatedExternalType: generatorschema.NewAssocExtType(b.AssociatedExternalType),
 		Attributes:             attributes,
 		Blocks:                 blocks,
 		CustomType:             b.CustomType,

diff --git a/internal/datasource_generate/bool_attribute.go b/internal/datasource_generate/bool_attribute.go
@@ -21,13 +21,8 @@ type GeneratorBoolAttribute struct {
 
 	// The "specschema" types are used instead of the types within the attribute
 	// because support for extracting custom import information is required.
-	AssociatedExternalType *specschema.AssociatedExternalType
-	CustomType             *specschema.CustomType
-	Validators             []specschema.BoolValidator
-}
-
-func (g GeneratorBoolAttribute) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.AssociatedExternalType)
+	CustomType *specschema.CustomType
+	Validators []specschema.BoolValidator
 }
 
 func (g GeneratorBoolAttribute) AttrType() attr.Type {
@@ -45,9 +40,6 @@ func (g GeneratorBoolAttribute) Imports() *generatorschema.Imports {
 		imports.Append(customValidatorImports)
 	}
 
-	assocExtTypeImports := generatorschema.AssociatedExternalTypeImports(g.AssociatedExternalType)
-	imports.Append(assocExtTypeImports)
-
 	return imports
 }
 

diff --git a/internal/datasource_generate/list_nested_attribute.go b/internal/datasource_generate/list_nested_attribute.go
@@ -27,7 +27,7 @@ type GeneratorListNestedAttribute struct {
 }
 
 func (g GeneratorListNestedAttribute) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.NestedObject.AssociatedExternalType)
+	return g.NestedObject.AssociatedExternalType
 }
 
 func (g GeneratorListNestedAttribute) AttrType() attr.Type {
@@ -62,8 +62,7 @@ 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)
+	imports.Append(g.NestedObject.AssociatedExternalType.Imports())
 
 	return imports
 }

diff --git a/internal/datasource_generate/list_nested_block.go b/internal/datasource_generate/list_nested_block.go
@@ -27,7 +27,7 @@ type GeneratorListNestedBlock struct {
 }
 
 func (g GeneratorListNestedBlock) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.NestedObject.AssociatedExternalType)
+	return g.NestedObject.AssociatedExternalType
 }
 
 func (g GeneratorListNestedBlock) AttrType() attr.Type {
@@ -66,8 +66,7 @@ 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)
+	imports.Append(g.NestedObject.AssociatedExternalType.Imports())
 
 	return imports
 }

diff --git a/internal/datasource_generate/map_nested_attribute.go b/internal/datasource_generate/map_nested_attribute.go
@@ -27,7 +27,7 @@ type GeneratorMapNestedAttribute struct {
 }
 
 func (g GeneratorMapNestedAttribute) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.NestedObject.AssociatedExternalType)
+	return g.NestedObject.AssociatedExternalType
 }
 
 func (g GeneratorMapNestedAttribute) AttrType() attr.Type {
@@ -62,8 +62,7 @@ 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)
+	imports.Append(g.NestedObject.AssociatedExternalType.Imports())
 
 	return imports
 }

diff --git a/internal/datasource_generate/set_nested_attribute.go b/internal/datasource_generate/set_nested_attribute.go
@@ -27,7 +27,7 @@ type GeneratorSetNestedAttribute struct {
 }
 
 func (g GeneratorSetNestedAttribute) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.NestedObject.AssociatedExternalType)
+	return g.NestedObject.AssociatedExternalType
 }
 
 func (g GeneratorSetNestedAttribute) AttrType() attr.Type {
@@ -62,8 +62,7 @@ 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)
+	imports.Append(g.NestedObject.AssociatedExternalType.Imports())
 
 	return imports
 }

diff --git a/internal/datasource_generate/set_nested_block.go b/internal/datasource_generate/set_nested_block.go
@@ -27,7 +27,7 @@ type GeneratorSetNestedBlock struct {
 }
 
 func (g GeneratorSetNestedBlock) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.NestedObject.AssociatedExternalType)
+	return g.NestedObject.AssociatedExternalType
 }
 
 func (g GeneratorSetNestedBlock) AttrType() attr.Type {
@@ -66,8 +66,7 @@ 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)
+	imports.Append(g.NestedObject.AssociatedExternalType.Imports())
 
 	return imports
 }

diff --git a/internal/datasource_generate/single_nested_attribute.go b/internal/datasource_generate/single_nested_attribute.go
@@ -19,16 +19,16 @@ import (
 type GeneratorSingleNestedAttribute struct {
 	schema.SingleNestedAttribute
 
+	AssociatedExternalType *generatorschema.AssocExtType
+	Attributes             generatorschema.GeneratorAttributes
 	// The "specschema" types are used instead of the types within the attribute
 	// because support for extracting custom import information is required.
-	AssociatedExternalType *specschema.AssociatedExternalType
-	Attributes             generatorschema.GeneratorAttributes
-	CustomType             *specschema.CustomType
-	Validators             []specschema.ObjectValidator
+	CustomType *specschema.CustomType
+	Validators []specschema.ObjectValidator
 }
 
 func (g GeneratorSingleNestedAttribute) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.AssociatedExternalType)
+	return g.AssociatedExternalType
 }
 
 func (g GeneratorSingleNestedAttribute) AttrType() attr.Type {
@@ -55,8 +55,7 @@ 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)
+	imports.Append(g.AssociatedExternalType.Imports())
 
 	return imports
 }

diff --git a/internal/datasource_generate/single_nested_block.go b/internal/datasource_generate/single_nested_block.go
@@ -19,17 +19,17 @@ import (
 type GeneratorSingleNestedBlock struct {
 	schema.SingleNestedBlock
 
-	// The "specschema" types are used instead of the types within the attribute
-	// because support for extracting custom import information is required.
-	AssociatedExternalType *specschema.AssociatedExternalType
+	AssociatedExternalType *generatorschema.AssocExtType
 	Attributes             generatorschema.GeneratorAttributes
 	Blocks                 generatorschema.GeneratorBlocks
-	CustomType             *specschema.CustomType
-	Validators             []specschema.ObjectValidator
+	// The "specschema" types are used instead of the types within the attribute
+	// because support for extracting custom import information is required.
+	CustomType *specschema.CustomType
+	Validators []specschema.ObjectValidator
 }
 
 func (g GeneratorSingleNestedBlock) AssocExtType() *generatorschema.AssocExtType {
-	return generatorschema.NewAssocExtType(g.AssociatedExternalType)
+	return g.AssociatedExternalType
 }
 
 func (g GeneratorSingleNestedBlock) AttrType() attr.Type {
@@ -60,8 +60,7 @@ 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)
+	imports.Append(g.AssociatedExternalType.Imports())
 
 	return imports
 }

diff --git a/internal/datasource_generate/types.go b/internal/datasource_generate/types.go
@@ -12,7 +12,7 @@ import (
 type GeneratorNestedAttributeObject struct {
 	Attributes schema.GeneratorAttributes
 
-	AssociatedExternalType *specschema.AssociatedExternalType
+	AssociatedExternalType *schema.AssocExtType
 	CustomType             *specschema.CustomType
 	Validators             []specschema.ObjectValidator
 }
@@ -21,7 +21,7 @@ type GeneratorNestedBlockObject struct {
 	Attributes schema.GeneratorAttributes
 	Blocks     schema.GeneratorBlocks
 
-	AssociatedExternalType *specschema.AssociatedExternalType
+	AssociatedExternalType *schema.AssocExtType
 	CustomType             *specschema.CustomType
 	Validators             []specschema.ObjectValidator
 }