adding source_instance_deletion_time (#15239) (#24576)

[upstream:bd6209a2bc78e3496d8cbd5b8a708c7241a9d912]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/15239.txt

@@ -0,0 +1,6 @@
+```release-note:enhancement
+sql: added `source_instance_deletion_time` field to `google_sql_database_instance` resource
+```
+```release-note:enhancement
+sql: added `source_instance_deletion_time` field to `google_sql_database_instance_latest_recovery_time` data source
+```

google/services/sql/data_source_sql_database_instance_latest_recovery_time.go

@@ -27,7 +27,6 @@ import (
 func DataSourceSqlDatabaseInstanceLatestRecoveryTime() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceSqlDatabaseInstanceLatestRecoveryTimeRead,
-
 		Schema: map[string]*schema.Schema{
 			"instance": {
 				Type:             schema.TypeString,
@@ -45,6 +44,11 @@ func DataSourceSqlDatabaseInstanceLatestRecoveryTime() *schema.Resource {
 				Computed:    true,
 				Description: `Timestamp, identifies the latest recovery time of the source instance.`,
 			},
+			"source_instance_deletion_time": {
+				Type:        schema.TypeString,
+				Optional:    true,
+				Description: `Timestamp, identifies when the source instance was deleted. If this instance is deleted, then you must set the timestamp.`,
+			},
 		},
 	}
 }
@@ -55,23 +59,28 @@ func dataSourceSqlDatabaseInstanceLatestRecoveryTimeRead(d *schema.ResourceData,
 	if err != nil {
 		return err
 	}
-
 	fv, err := tpgresource.ParseProjectFieldValue("instances", d.Get("instance").(string), "project", d, config, false)
 	if err != nil {
 		return err
 	}
 	project := fv.Project
 	instance := fv.Name
 
-	latestRecoveryTime, err := config.NewSqlAdminClient(userAgent).Projects.Instances.GetLatestRecoveryTime(project, instance).Do()
+	deletionTime := d.Get("source_instance_deletion_time").(string)
+
+	latestRecoveryTimeCall := config.NewSqlAdminClient(userAgent).Projects.Instances.GetLatestRecoveryTime(project, instance)
+
+	if deletionTime != "" {
+		latestRecoveryTimeCall = latestRecoveryTimeCall.SourceInstanceDeletionTime(deletionTime)
+	}
+
+	latestRecoveryTime, err := latestRecoveryTimeCall.Do()
 	if err != nil {
 		return err
 	}
-
 	if err := d.Set("project", project); err != nil {
 		return fmt.Errorf("Error setting project: %s", err)
 	}
-
 	if err := d.Set("latest_recovery_time", latestRecoveryTime.LatestRecoveryTime); err != nil {
 		return fmt.Errorf("Error setting latest_recovery_time: %s", err)
 	}

google/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go

@@ -35,6 +35,9 @@ func TestAccDataSourceSqlDatabaseInstanceLatestRecoveryTime_basic(t *testing.T)
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		CheckDestroy:             testAccSqlDatabaseInstanceDestroyProducer(t),
+		ExternalProviders: map[string]resource.ExternalProvider{
+			"time": {},
+		},
 		Steps: []resource.TestStep{
 			{
 				Config: testAccDataSourceSqlDatabaseInstanceLatestRecoveryTime_basic(context),
@@ -68,8 +71,15 @@ resource "google_sql_database_instance" "main" {
   deletion_protection = false
 }
 
+resource "time_sleep" "wait_for_instance" {
+  // Wait 30 seconds after the instance is created
+  depends_on = [google_sql_database_instance.main]
+  create_duration = "330s"
+}
+
 data "google_sql_database_instance_latest_recovery_time" "default" {
-  instance = resource.google_sql_database_instance.main.name
+  instance = google_sql_database_instance.main.name
+  depends_on = [time_sleep.wait_for_instance]
 }
 `, context)
 }

google/services/sql/resource_sql_database_instance.go

@@ -1250,6 +1250,12 @@ API (for read pools, effective_availability_type may differ from availability_ty
 							Optional:    true,
 							Description: `The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the cloned instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://tools.ietf.org/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?.`,
 						},
+						"source_instance_deletion_time": {
+							Type:             schema.TypeString,
+							Optional:         true,
+							DiffSuppressFunc: tpgresource.TimestampDiffSuppress(time.RFC3339Nano),
+							Description:      `The timestamp of when the source instance was deleted for a clone from a deleted instance.`,
+						},
 					},
 				},
 			},
@@ -1666,10 +1672,11 @@ func expandCloneContext(configured []interface{}) (*sqladmin.CloneContext, strin
 	}
 
 	return &sqladmin.CloneContext{
-		PointInTime:      _cloneConfiguration["point_in_time"].(string),
-		PreferredZone:    _cloneConfiguration["preferred_zone"].(string),
-		DatabaseNames:    databaseNames,
-		AllocatedIpRange: _cloneConfiguration["allocated_ip_range"].(string),
+		PointInTime:                _cloneConfiguration["point_in_time"].(string),
+		PreferredZone:              _cloneConfiguration["preferred_zone"].(string),
+		DatabaseNames:              databaseNames,
+		AllocatedIpRange:           _cloneConfiguration["allocated_ip_range"].(string),
+		SourceInstanceDeletionTime: _cloneConfiguration["source_instance_deletion_time"].(string),
 	}, _cloneConfiguration["source_instance_name"].(string)
 }
 

website/docs/r/sql_database_instance.html.markdown

@@ -639,6 +639,10 @@ The optional `point_in_time_restore_context` block supports:
 
 * `allocated_ip_range` -  (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the cloned instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://tools.ietf.org/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?.
 
+* `source_instance_deletion_time` -  (Optional) The timestamp of when the source instance was deleted for a clone from a deleted instance.
+
+    A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z".
+
 * `database_names` - (Optional) (SQL Server only, use with `point_in_time`) Clone only the specified databases from the source instance. Clone all databases if empty.
 
 The optional `clone` block supports:
@@ -655,6 +659,10 @@ The optional `clone` block supports:
 
 * `allocated_ip_range` -  (Optional) The name of the allocated ip range for the private ip CloudSQL instance. For example: "google-managed-services-default". If set, the cloned instance ip will be created in the allocated range. The range name must comply with [RFC 1035](https://tools.ietf.org/html/rfc1035). Specifically, the name must be 1-63 characters long and match the regular expression [a-z]([-a-z0-9]*[a-z0-9])?.
 
+* `source_instance_deletion_time` -  (Optional) The timestamp of when the source instance was deleted for a clone from a deleted instance.
+
+    A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z".
+
 The optional `restore_backup_context` block supports:
 **NOTE:** Restoring from a backup is an imperative action and not recommended via Terraform. Adding or modifying this
 block during resource creation/update will trigger the restore action after the resource is created/updated.