resourceIdentity: add d.Identity to Create and Update to cover new validation in sdk/v2 - 2.28.1 (#15925)

Author: BBBmau

mmv1/templates/terraform/custom_update/storage_folder_update.go.tmpl

@@ -6,5 +6,23 @@ if d.Get("force_destroy") != nil {
     }
 }
 
+identity, err := d.Identity()
+if err == nil && identity != nil {
+    if v, ok := identity.GetOk("bucket"); !ok && v == "" {
+        err = identity.Set("bucket", d.Get("bucket").(string))
+        if err != nil {
+            return fmt.Errorf("Error setting bucket: %s", err)
+        }
+    }
+    if v, ok := identity.GetOk("name"); !ok && v == "" {
+        err = identity.Set("name", d.Get("name").(string))
+        if err != nil {
+            return fmt.Errorf("Error setting name: %s", err)
+        }
+    }
+} else {
+    log.Printf("[DEBUG] (Read) identity not set: %s", err)
+}
+
 // all other fields are immutable, don't do anything else
 return nil

mmv1/templates/terraform/custom_update/storage_managed_folder.go.tmpl

@@ -7,5 +7,23 @@ if d.Get("force_destroy") != nil {
 	}
 }
 
+identity, err := d.Identity()
+if err == nil && identity != nil {
+	if v, ok := identity.GetOk("bucket"); !ok && v == "" {
+		err = identity.Set("bucket", d.Get("bucket").(string))
+		if err != nil {
+			return fmt.Errorf("Error setting bucket: %s", err)
+		}
+	}
+	if v, ok := identity.GetOk("name"); !ok && v == "" {
+		err = identity.Set("name", d.Get("name").(string))
+		if err != nil {
+			return fmt.Errorf("Error setting name: %s", err)
+		}
+	}
+} else {
+	log.Printf("[DEBUG] (Read) identity not set: %s", err)
+}
+
 // all other fields are immutable, don't do anything else
 return nil

mmv1/templates/terraform/pre_read/sql_database_activation_policy.tmpl

@@ -4,5 +4,28 @@ if err != nil {
 	return err
 }
 if databaseInstance.Settings != nil && databaseInstance.Settings.ActivationPolicy != "ALWAYS" {
+	identity, err := d.Identity()
+	if err == nil && identity != nil {
+		if v, ok := identity.GetOk("name"); !ok && v == "" {
+			err = identity.Set("name", d.Get("name").(string))
+			if err != nil {
+				return fmt.Errorf("Error setting name: %s", err)
+			}
+		}
+		if v, ok := identity.GetOk("instance"); !ok && v == "" {
+			err = identity.Set("instance", d.Get("instance").(string))
+			if err != nil {
+				return fmt.Errorf("Error setting instance: %s", err)
+			}
+		}
+		if v, ok := identity.GetOk("project"); !ok && v == "" {
+			err = identity.Set("project", d.Get("project").(string))
+			if err != nil {
+				return fmt.Errorf("Error setting project: %s", err)
+			}
+		}
+	} else {
+		log.Printf("[DEBUG] (Read) identity not set: %s", err)
+	}
 	return nil
 }

mmv1/templates/terraform/resource.go.tmpl

@@ -367,6 +367,19 @@ func resource{{ $.ResourceName -}}Create(d *schema.ResourceData, meta interface{
     }
     d.SetId(id)
 
+    identity, err := d.Identity()
+    if err == nil && identity != nil {
+    {{- range $p := $.IdentityProperties }}
+        if {{ $p.CamelizeProperty }}Value, ok := d.GetOk("{{ underscore $p.Name}}"); ok && {{ $p.CamelizeProperty }}Value.(string)!= "" {
+            if err = identity.Set("{{ underscore $p.Name}}", {{ $p.CamelizeProperty }}Value.(string)); err != nil {
+                return fmt.Errorf("Error setting {{ underscore $p.Name}}: %s", err)
+            }
+        }
+    {{- end }}
+    } else {
+        log.Printf("[DEBUG] (Create) identity not set: %s", err)
+    }
+
 {{if and $.GetAsync ($.GetAsync.Allow "Create") -}}
 {{  if ($.GetAsync.IsA "OpAsync") -}}
 {{    if and $.GetAsync.Result.ResourceInsideResponse $.HasPostCreateComputedFields -}}
@@ -747,17 +760,17 @@ func resource{{ $.ResourceName -}}Read(d *schema.ResourceData, meta interface{})
 {{- end}}
 
 	identity, err := d.Identity()
-    if err != nil && identity != nil {
+    if err == nil && identity != nil {
     {{- range $p := $.IdentityProperties }}
-    if v, ok := identity.GetOk("{{ underscore $p.Name}}"); ok && v != "" {
+    if v, ok := identity.GetOk("{{ underscore $p.Name}}");!ok && v == "" {
         err = identity.Set("{{ underscore $p.Name}}", d.Get("{{ underscore $p.Name}}").(string))
             if err != nil {
                 return fmt.Errorf("Error setting {{ underscore $p.Name}}: %s", err)
             }     
     }
     {{- end }}
     } else {
-        log.Printf("[DEBUG] identity not set: %s", err)
+        log.Printf("[DEBUG] (Read) identity not set: %s", err)
     }
 {{- end }}
     return nil
@@ -777,6 +790,19 @@ func resource{{ $.ResourceName -}}Update(d *schema.ResourceData, meta interface{
         return err
     }
 
+    identity, err := d.Identity()
+    if err == nil && identity != nil {
+    {{- range $p := $.IdentityProperties }}
+        if {{ $p.CamelizeProperty }}Value, ok := d.GetOk("{{ underscore $p.Name}}"); ok && {{ $p.CamelizeProperty }}Value.(string)!= "" {
+            if err = identity.Set("{{ underscore $p.Name}}", {{ $p.CamelizeProperty }}Value.(string)); err != nil {
+                return fmt.Errorf("Error setting {{ underscore $p.Name}}: %s", err)
+            }
+        }
+    {{- end }}
+    } else {
+        log.Printf("[DEBUG] (Update) identity not set: %s", err)
+    }
+
     billingProject := ""
 
 {{          if $.HasProject -}}