Removing handling of nested primitives with associated external type …

…from model object template (#31)
hashicorp · Aug 10, 2023 · 73f2f1a · 73f2f1a
1 parent ba58c02
commit 73f2f1a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 68 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/templates/model_object_to_from.gotmpl b/internal/templates/model_object_to_from.gotmpl
@@ -13,26 +13,10 @@ if diags.HasError() {
 return nil, diags
 }
 
-{{range $field := .Fields }}
-{{- if $field.HasAssocExtType}}
-to{{$field.Name}}, d := To{{$field.Name}}(ctx, tfModel.{{$field.Name}})
-
-diags.Append(d...)
-
-if diags.HasError() {
-return nil, diags
-}
-{{- end}}
-{{- end}}
-
 apiObject := &{{.TypeReference}}{
 {{- range $field := .Fields }}
-{{- if $field.HasAssocExtType}}
-{{$field.Name}}: to{{$field.Name}},
-{{- else}}
 {{$field.Name}}: tfModel.{{$field.Name}}.{{$field.DefaultTo}}(),
 {{- end}}
-{{- end}}
 }
 
 return apiObject, diags
@@ -47,24 +31,8 @@ return tfModel.ObjectNull(ctx), diags
 }
 
 {{range $field := .Fields }}
-{{- if $field.HasAssocExtType}}
-from{{$field.Name}}, d := From{{$field.Name}}(ctx, apiObject.{{$field.Name}})
-
-diags.Append(d...)
-
-if diags.HasError() {
-return tfModel.ObjectNull(ctx), diags
-}
-{{- end}}
-{{- end}}
-
-{{range $field := .Fields }}
-{{- if $field.HasAssocExtType}}
-tfModel.{{$field.Name}} = from{{$field.Name}}
-{{- else}}
 tfModel.{{$field.Name}} = types.{{$field.DefaultFrom}}(apiObject.{{$field.Name}})
 {{- end}}
-{{- end}}
 
 return tfModel.ObjectValueFrom(ctx, tfModel)
 }