Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

Author: actions-user

mmv1/templates/terraform/resource.go.tmpl

@@ -815,34 +815,11 @@ func resource{{ $.ResourceName -}}Read(d *schema.ResourceData, meta interface{})
         return fmt.Errorf("Error reading {{ $.Name -}}: %s", err)
     }
 {{- end}}
-{{ range $prop := $.GettableProperties }}
-{{if $prop.FlattenObject -}}
-// Terraform must set the top level schema field, but since this object contains collapsed properties
-// it's difficult to know what the top level should be. Instead we just loop over the map returned from flatten.
-    if flattenedProp := flatten{{ if $.NestedQuery -}}Nested{{end}}{{ $.ResourceName -}}{{ camelize $prop.Name "upper"  -}}(res["{{ $prop.ApiName -}}"], d, config); flattenedProp != nil {
-        if gerr, ok := flattenedProp.(*googleapi.Error); ok {
-            return fmt.Errorf("Error reading {{ $.Name -}}: %s", gerr)
-        }
-        casted := flattenedProp.([]interface{})[0]
-        if casted != nil {
-            for k, v := range casted.(map[string]interface{}) {
-                if err := d.Set(k, v); err != nil {
-                    return fmt.Errorf("Error setting %s: %s", k, err)
-                }
-            }
-        }
-    }
-{{-    else -}}
-    if err := d.Set("{{ underscore $prop.Name -}}", flatten{{ if $.NestedQuery -}}Nested{{end}}{{ $.ResourceName -}}{{ camelize $prop.Name "upper" -}}(res["{{ $prop.ApiName -}}"], d, config)); err != nil {
-        return fmt.Errorf("Error reading {{ $.Name -}}: %s", err)
-    }
-{{- end}}
-{{- end}}
-{{if $.HasSelfLink -}}
-    if err := d.Set("self_link", tpgresource.ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil {
-        return fmt.Errorf("Error reading {{ $.Name -}}: %s", err)
+    err = Resource{{ $.ResourceName -}}Flatten(d, meta, res, config, {{- if $.HasProject }}project,{{ end }} userAgent, billingProject, url, headers)
+    if err != nil {
+        return err
     }
-{{- end}}
+
 {{ if and (not $.ExcludeIdentityGeneration) (not $.ExcludeRead) }}
     identity, err := d.Identity()
     if err == nil && identity != nil {
@@ -1541,3 +1518,40 @@ func resource{{ $.ResourceName -}}PostCreateSetComputedFields(d *schema.Resource
     return nil
 }
 {{- end }}
+
+{{ if not $.ExcludeRead }}
+func Resource{{ $.ResourceName -}}Flatten(d *schema.ResourceData, meta interface{}, res map[string]interface{}, config *transport_tpg.Config,{{if $.HasProject -}}project string, {{end -}}userAgent string, billingProject string, url string, headers http.Header) error {
+{{- if or $.GettableProperties $.HasSelfLink }}
+var err error
+{{- end }}
+{{ range $prop := $.GettableProperties }}
+{{if $prop.FlattenObject -}}
+// Terraform must set the top level schema field, but since this object contains collapsed properties
+// it's difficult to know what the top level should be. Instead we just loop over the map returned from flatten.
+if flattenedProp := flatten{{ if $.NestedQuery -}}Nested{{end}}{{ $.ResourceName -}}{{ camelize $prop.Name "upper"  -}}(res["{{ $prop.ApiName -}}"], d, config); flattenedProp != nil {
+    if gerr, ok := flattenedProp.(*googleapi.Error); ok {
+        return fmt.Errorf("Error reading {{ $.Name -}}: %s", gerr)
+    }
+    casted := flattenedProp.([]interface{})[0]
+    if casted != nil {
+        for k, v := range casted.(map[string]interface{}) {
+            if err := d.Set(k, v); err != nil {
+                return fmt.Errorf("Error setting %s: %s", k, err)
+            }
+        }
+    }
+}
+{{- else -}}
+    if err = d.Set("{{ underscore $prop.Name -}}", flatten{{ if $.NestedQuery -}}Nested{{end}}{{ $.ResourceName -}}{{ camelize $prop.Name "upper" -}}(res["{{ $prop.ApiName -}}"], d, config)); err != nil {
+        return fmt.Errorf("Error reading {{ $.Name -}}: %s", err)
+    }
+{{- end}}
+{{- end}}
+{{if $.HasSelfLink -}}
+    if err = d.Set("self_link", tpgresource.ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil {
+        return fmt.Errorf("Error reading {{ $.Name -}}: %s", err)
+    }
+{{- end }}
+    return nil
+}
+{{- end -}}