Skip to content

Remove marking of entire object as unknown when child attribute is unknown #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Remove marking of entire object as unknown when child attribute is unknown #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9aa48b
remove marking of unknown for nested attributes
austinvalle Oct 10, 2023
600f64f
update diag return to unknown
austinvalle Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
786 changes: 219 additions & 567 deletions ...om_and_external/all_output/default_pkg_name/datasource_example/example_data_source_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

406 changes: 77 additions & 329 deletions .../custom_and_external/all_output/default_pkg_name/provider_example/example_provider_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

406 changes: 77 additions & 329 deletions .../custom_and_external/all_output/default_pkg_name/resource_example/example_resource_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

786 changes: 219 additions & 567 deletions ...cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_data_source_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

406 changes: 77 additions & 329 deletions ...al/cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_provider_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

406 changes: 77 additions & 329 deletions ...al/cmd/testdata/custom_and_external/all_output/specified_pkg_name/example_resource_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

786 changes: 219 additions & 567 deletions internal/cmd/testdata/custom_and_external/data_sources_output/example_data_source_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

406 changes: 77 additions & 329 deletions internal/cmd/testdata/custom_and_external/provider_output/example_provider_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

406 changes: 77 additions & 329 deletions internal/cmd/testdata/custom_and_external/resources_output/example_resource_gen.go
View file
Open in desktop

Large diffs are not rendered by default.

22 changes: 9 additions & 13 deletions internal/schema/custom_object_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,6 @@ if diags.HasError() {
return NewExampleValueUnknown(), diags
}

state := attr.ValueStateKnown


boolAttribute, ok := attributes["bool_attribute"]

Expand All @@ -238,7 +236,7 @@ diags.AddError(
"Attribute Missing",
` + "`bool_attribute is missing from object`" + `)

return NewExampleValueNull(), diags
return NewExampleValueUnknown(), diags
}

boolAttributeVal, ok := boolAttribute.(basetypes.BoolValue)
Expand All @@ -249,14 +247,14 @@ diags.AddError(
fmt.Sprintf(` + "`bool_attribute expected to be basetypes.BoolValue, was: %T`" + `, boolAttribute))
}

if boolAttributeVal.IsUnknown() {
state = attr.ValueStateUnknown
}

if diags.HasError() {
return NewExampleValueUnknown(), diags
}

return ExampleValue{
BoolAttribute: boolAttributeVal,
state: state,
state: attr.ValueStateKnown,
}, diags
}`),
},
Expand Down Expand Up @@ -301,8 +299,6 @@ func TestCustomObjectType_renderValueFromObject(t *testing.T) {
func (t ExampleType) ValueFromObject(ctx context.Context, in basetypes.ObjectValue) (basetypes.ObjectValuable, diag.Diagnostics) {
var diags diag.Diagnostics

state := attr.ValueStateKnown

attributes := in.Attributes()


Expand All @@ -324,14 +320,14 @@ diags.AddError(
fmt.Sprintf(` + "`bool_attribute expected to be basetypes.BoolValue, was: %T`" + `, boolAttribute))
}

if boolAttributeVal.IsUnknown() {
state = attr.ValueStateUnknown
}

if diags.HasError() {
return nil, diags
}

return ExampleValue{
BoolAttribute: boolAttributeVal,
state: state,
state: attr.ValueStateKnown,
}, diags
}`),
},
Expand Down
12 changes: 5 additions & 7 deletions internal/schema/templates/object_type_value.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ if diags.HasError() {
return New{{.Name}}ValueUnknown(), diags
}

state := attr.ValueStateKnown

{{range $key, $value := .AttrValues }}
{{$key.ToCamelCase}}, ok := attributes["{{$key}}"]

Expand All @@ -60,7 +58,7 @@ diags.AddError(
"Attribute Missing",
`{{$key}} is missing from object`)

return New{{$.Name}}ValueNull(), diags
return New{{$.Name}}ValueUnknown(), diags
}

{{$key.ToCamelCase}}Val, ok := {{$key.ToCamelCase}}.({{$value}})
Expand All @@ -70,16 +68,16 @@ diags.AddError(
"Attribute Wrong Type",
fmt.Sprintf(`{{$key}} expected to be {{$value}}, was: %T`, {{$key.ToCamelCase}}))
}
{{end}}

if {{$key.ToCamelCase}}Val.IsUnknown() {
state = attr.ValueStateUnknown
if diags.HasError() {
return New{{.Name}}ValueUnknown(), diags
}
{{end}}

return {{.Name}}Value{
{{- range $key, $value := .AttrValues }}
{{$key.ToPascalCase}}: {{$key.ToCamelCase}}Val,
{{- end}}
state: state,
state: attr.ValueStateKnown,
}, diags
}
10 changes: 4 additions & 6 deletions internal/schema/templates/object_type_value_from_object.gotmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
func (t {{.Name}}Type) ValueFromObject(ctx context.Context, in basetypes.ObjectValue) (basetypes.ObjectValuable, diag.Diagnostics) {
var diags diag.Diagnostics

state := attr.ValueStateKnown

attributes := in.Attributes()

{{range $key, $value := .AttrValues }}
Expand All @@ -24,16 +22,16 @@ diags.AddError(
"Attribute Wrong Type",
fmt.Sprintf(`{{$key}} expected to be {{$value}}, was: %T`, {{$key.ToCamelCase}}))
}
{{end}}

if {{$key.ToCamelCase}}Val.IsUnknown() {
state = attr.ValueStateUnknown
if diags.HasError() {
return nil, diags
}
{{end}}

return {{.Name}}Value{
{{- range $key, $value := .AttrValues }}
{{$key.ToPascalCase}}: {{$key.ToCamelCase}}Val,
{{- end}}
state: state,
state: attr.ValueStateKnown,
}, diags
}