@@ -143,9 +143,6 @@ func (c *{{ $.ResourceName -}}Cai2hclConverter) convertResourceData(asset caiass
143143 }
144144{{ end}}
145145
146- {{/* Attempt to parse all self-link parameters from asset name. */}}
147- outputFields := {{ $.OutputFieldSetStr }}
148- utils.ParseUrlParamValuesFromAssetName(asset.Name, "{{ $.Cai2hclAssetNameTemplate }}", outputFields, hclData)
149146{{ range $prop := $.ReadPropertiesForTgc }}
150147 {{ if $prop.FlattenObject -}}
151148 if flattenedProp := flatten{{ if $.NestedQuery -}}Nested{{end}}{{ $.ResourceName -}}{{ camelize $prop.Name "upper" -}}(res["{{ $prop.ApiName -}}"], d, config); flattenedProp != nil {
@@ -154,10 +151,22 @@ func (c *{{ $.ResourceName -}}Cai2hclConverter) convertResourceData(asset caiass
154151 }
155152 }
156153 {{- else -}}
157- hclData["{{ underscore $prop.Name -}}"] = flatten{{ if $.NestedQuery -}}Nested{{end}}{{ $.ResourceName -}}{{ camelize $prop.Name "upper" -}}(res["{{ $prop.ApiName -}}"], d, config)
154+ if err := d.Set("{{ underscore $prop.Name -}}", flatten{{ if $.NestedQuery -}}Nested{{end}}{{ $.ResourceName -}}{{ camelize $prop.Name "upper" -}}(res["{{ $prop.ApiName -}}"], d, config)); err != nil {
155+ return nil, fmt.Errorf("Error reading {{ $.Name -}}: %s", err)
156+ }
158157 {{- end}}
159158{{- end}}
160159
160+ for key, sch := range c.schema {
161+ if val, ok := d.GetOk(key); ok || sch.Required {
162+ hclData[key] = val
163+ }
164+ }
165+
166+ {{/* Attempt to parse all self-link parameters from asset name. */}}
167+ outputFields := {{ $.OutputFieldSetStr }}
168+ utils.ParseUrlParamValuesFromAssetName(asset.Name, "{{ $.Cai2hclAssetNameTemplate }}", outputFields, hclData)
169+
161170 ctyVal, err := utils.MapToCtyValWithSchema(hclData, c.schema)
162171 if err != nil {
163172 return nil, err
0 commit comments