Suffixing attribute name to prevent errors when nested attribute name…

…s are reserved Go keywords (#76)
hashicorp · Oct 24, 2023 · f674ce2 · f674ce2
1 parent 292ce20
commit f674ce2
Show file tree

Hide file tree

Showing 12 changed files with 2,298 additions and 2,298 deletions.
diff --git a/...om_and_external/all_output/default_pkg_name/datasource_example/example_data_source_gen.go b/...om_and_external/all_output/default_pkg_name/datasource_example/example_data_source_gen.go
diff --git a/.../custom_and_external/all_output/default_pkg_name/provider_example/example_provider_gen.go b/.../custom_and_external/all_output/default_pkg_name/provider_example/example_provider_gen.go
diff --git a/.../custom_and_external/all_output/default_pkg_name/resource_example/example_resource_gen.go b/.../custom_and_external/all_output/default_pkg_name/resource_example/example_resource_gen.go
diff --git a/...cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_data_source_gen.go b/...cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_data_source_gen.go
diff --git a/...al/cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_provider_gen.go b/...al/cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_provider_gen.go
diff --git a/...al/cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_resource_gen.go b/...al/cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_resource_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/data_sources_output/example_data_source_gen.go b/internal/cmd/testdata/custom_and_external/data_sources_output/example_data_source_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/provider_output/example_provider_gen.go b/internal/cmd/testdata/custom_and_external/provider_output/example_provider_gen.go
diff --git a/internal/cmd/testdata/custom_and_external/resources_output/example_resource_gen.go b/internal/cmd/testdata/custom_and_external/resources_output/example_resource_gen.go
diff --git a/internal/schema/custom_object_test.go b/internal/schema/custom_object_test.go
@@ -229,7 +229,7 @@ return NewExampleValueUnknown(), diags
 }
 
 
-boolAttribute, ok := attributes["bool_attribute"]
+boolAttributeAttribute, ok := attributes["bool_attribute"]
 
 if !ok {
 diags.AddError(
@@ -239,12 +239,12 @@ diags.AddError(
 return NewExampleValueUnknown(), diags
 }
 
-boolAttributeVal, ok := boolAttribute.(basetypes.BoolValue)
+boolAttributeVal, ok := boolAttributeAttribute.(basetypes.BoolValue)
 
 if !ok {
 diags.AddError(
 "Attribute Wrong Type",
-fmt.Sprintf(` + "`bool_attribute expected to be basetypes.BoolValue, was: %T`" + `, boolAttribute))
+fmt.Sprintf(` + "`bool_attribute expected to be basetypes.BoolValue, was: %T`" + `, boolAttributeAttribute))
 }
 
 
@@ -302,7 +302,7 @@ var diags diag.Diagnostics
 attributes := in.Attributes()
 
 
-boolAttribute, ok := attributes["bool_attribute"]
+boolAttributeAttribute, ok := attributes["bool_attribute"]
 
 if !ok {
 diags.AddError(
@@ -312,12 +312,12 @@ diags.AddError(
 return nil, diags
 }
 
-boolAttributeVal, ok := boolAttribute.(basetypes.BoolValue)
+boolAttributeVal, ok := boolAttributeAttribute.(basetypes.BoolValue)
 
 if !ok {
 diags.AddError(
 "Attribute Wrong Type",
-fmt.Sprintf(` + "`bool_attribute expected to be basetypes.BoolValue, was: %T`" + `, boolAttribute))
+fmt.Sprintf(` + "`bool_attribute expected to be basetypes.BoolValue, was: %T`" + `, boolAttributeAttribute))
 }
 
 

diff --git a/internal/schema/templates/object_type_value.gotmpl b/internal/schema/templates/object_type_value.gotmpl
@@ -51,7 +51,7 @@ return New{{.Name}}ValueUnknown(), diags
 }
 
 {{range $key, $value := .AttrValues }}
-{{$key.ToCamelCase}}, ok := attributes["{{$key}}"]
+{{$key.ToCamelCase}}Attribute, ok := attributes["{{$key}}"]
 
 if !ok {
 diags.AddError(
@@ -61,12 +61,12 @@ diags.AddError(
 return New{{$.Name}}ValueUnknown(), diags
 }
 
-{{$key.ToCamelCase}}Val, ok := {{$key.ToCamelCase}}.({{$value}})
+{{$key.ToCamelCase}}Val, ok := {{$key.ToCamelCase}}Attribute.({{$value}})
 
 if !ok {
 diags.AddError(
 "Attribute Wrong Type",
-fmt.Sprintf(`{{$key}} expected to be {{$value}}, was: %T`, {{$key.ToCamelCase}}))
+fmt.Sprintf(`{{$key}} expected to be {{$value}}, was: %T`, {{$key.ToCamelCase}}Attribute))
 }
 {{end}}
 

diff --git a/internal/schema/templates/object_type_value_from_object.gotmpl b/internal/schema/templates/object_type_value_from_object.gotmpl
@@ -5,7 +5,7 @@ var diags diag.Diagnostics
 attributes := in.Attributes()
 
 {{range $key, $value := .AttrValues }}
-{{$key.ToCamelCase}}, ok := attributes["{{$key}}"]
+{{$key.ToCamelCase}}Attribute, ok := attributes["{{$key}}"]
 
 if !ok {
 diags.AddError(
@@ -15,12 +15,12 @@ diags.AddError(
 return nil, diags
 }
 
-{{$key.ToCamelCase}}Val, ok := {{$key.ToCamelCase}}.({{$value}})
+{{$key.ToCamelCase}}Val, ok := {{$key.ToCamelCase}}Attribute.({{$value}})
 
 if !ok {
 diags.AddError(
 "Attribute Wrong Type",
-fmt.Sprintf(`{{$key}} expected to be {{$value}}, was: %T`, {{$key.ToCamelCase}}))
+fmt.Sprintf(`{{$key}} expected to be {{$value}}, was: %T`, {{$key.ToCamelCase}}Attribute))
 }
 {{end}}