adding source_instance_deletion_time

Author: tambalo-lgtm

mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_latest_recovery_time.go

@@ -11,7 +11,6 @@ import (
 func DataSourceSqlDatabaseInstanceLatestRecoveryTime() *schema.Resource {
 	return &schema.Resource{
 		Read: dataSourceSqlDatabaseInstanceLatestRecoveryTimeRead,
-
 		Schema: map[string]*schema.Schema{
 			"instance": {
 				Type:             schema.TypeString,
@@ -29,6 +28,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.`,
+			},
 		},
 	}
 }
@@ -39,23 +43,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)
 	}

mmv1/third_party/terraform/services/sql/data_source_sql_database_instance_latest_recovery_time_test.go

@@ -57,3 +57,30 @@ data "google_sql_database_instance_latest_recovery_time" "default" {
 }
 `, context)
 }
+
+func testAccDataSourceSqlDatabaseInstanceLatestRecoveryTime_withDeletionTime(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_sql_database_instance" "main" {
+  name             = "tf-test-instance-%{random_suffix}"
+  database_version = "POSTGRES_14"
+  region           = "us-central1"
+
+  settings {
+    tier = "db-g1-small"
+    backup_configuration {
+      enabled                        = true
+      point_in_time_recovery_enabled = true
+      start_time                     = "20:55"
+      transaction_log_retention_days = "3"
+    }
+  }
+
+  deletion_protection = false
+}
+
+data "google_sql_database_instance_latest_recovery_time" "default" {
+  instance = resource.google_sql_database_instance.main.name
+  source_instance_deletion_time = "2025-06-20T17:23:59.648821586Z"
+}
+`, context)
+}

mmv1/third_party/terraform/services/sql/resource_sql_database_instance.go.tmpl

@@ -1251,6 +1251,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.`,
+						},
 					},
 				},
 			},
@@ -1675,6 +1681,7 @@ func expandCloneContext(configured []interface{}) (*sqladmin.CloneContext, strin
 		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)
 }
 

mmv1/third_party/terraform/services/sql/resource_sql_database_instance_test.go.tmpl

@@ -1610,6 +1610,129 @@ func TestAccSqlDatabaseInstance_cloneWithDatabaseNames(t *testing.T) {
 	})
 }
 
+func testGoogleSqlDatabaseInstanceConfig_withPitrAndRetainBackups(instanceName string) string {
+	return fmt.Sprintf(`
+resource "google_sql_database_instance" "instance" {
+  name                = "%s"
+  region              = "us-central1"
+  database_version    = "MYSQL_5_7"
+  deletion_protection = false
+
+  settings {
+    tier = "db-n1-standard-1"
+
+    backup_configuration {
+      binary_log_enabled = "true"
+      enabled            = "true"
+      start_time         = "18:00"
+    }
+
+	retain_backups_on_delete = true
+  }
+}
+
+// Wait for the ten minutes (RPO is 5 minutes)
+resource "time_sleep" "wait_for_binlog" {
+  depends_on = [google_sql_database.database]
+
+  create_duration = "600s"
+
+  context.point_in_time = timestamp()
+}
+`, instanceName)
+
+}
+
+func testAccSqlDatabaseInstance_emptyConfig() string {
+	return "" 
+}
+
+func testAccSqlDatabaseInstance_captureDeletionTimeFromBackup(context map[string]interface{}) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		sourceInstanceName := context["source_db_name"].(string)
+        
+        // 1. Get the SQL Admin Client (assuming acctest provides one)
+		client, err := acctest.Client() // Placeholder: get provider client
+		if err != nil {
+			return fmt.Errorf("failed to get client: %w", err)
+		}
+        
+        // 2. Call the Cloud SQL Admin API List method for the deleted instance
+        resp, err := client.SqlAdmin.BackupRuns.List(acctest.ProjectID(), sourceInstanceName).Do()
+        if err != nil {
+            return fmt.Errorf("failed to list backup runs for instance %s: %w", sourceInstanceName, err)
+        }
+
+        var deletionTime int64
+        
+        // 3. Find the backup and extract the deletion timestamp
+        for _, backup := range resp.Items {
+            // Look for the specific manual backup created in the previous step
+            // This is a common field on a backup that was taken *before* instance deletion
+            if backup.InstanceDeletionTimestampMs > 0  {
+                deletionTime = backup.InstanceDeletionTimestampMs
+                break
+            }
+        }
+        
+        if deletionTime == 0 {
+            return fmt.Errorf("could not find a backup with a valid instance_deletion_timestamp_ms for instance %s", sourceInstanceName)
+        }
+
+        // 4. Convert the milliseconds timestamp to the required RFC3339 format
+        // The API returns milliseconds since epoch, but the clone operation expects RFC3339 string.
+        t := time.Unix(0, deletionTime*int64(time.Millisecond))
+        deletionTimeString := t.Format(time.RFC3339Nano)
+
+        // 5. Update the context map
+        context["deletion_time"] = deletionTimeString
+		context["point_in_time"] = pointInTimeString
+        
+		t.Logf("Captured instance deletion time from backup: %s (ms: %d)", deletionTimeString, deletionTime)
+
+		return nil
+	}
+}
+
+func TestAccSqlDatabaseInstance_cloneWithSourceInstanceDeletionTime(t *testing.T) {
+	// Sqladmin client
+	acctest.SkipIfVcr(t)
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix":    acctest.RandString(t, 10),
+		"original_db_name": acctest.BootstrapSharedSQLInstanceBackupRun(t),
+		"source_db_name":   "source-instance-" + acctest.RandString(t, 6),
+		"clone_db_name":    "clone-instance-" + acctest.RandString(t, 6),
+		// This will be set by the test after Step 2
+		"deletion_time":    "", 
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccSqlDatabaseInstanceDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testGoogleSqlDatabaseInstanceConfig_withPitrAndRetainBackups(source_db_name),
+			},
+			{
+				Config: testAccSqlDatabaseInstance_emptyConfig(context),
+			},
+			{
+				Config: testAccSqlDatabaseInstance_captureDeletionTimeFromBackup(source_db_name)
+			},
+			{
+				Config: testAccSqlDatabaseInstance_cloneWithDeletionTime(context),
+				ResourceName:            clone_db_name,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"deletion_protection", "clone"},
+			},
+		},
+	})
+}
+
 func TestAccSqlDatabaseInstance_pointInTimeRestore(t *testing.T) {
 	// Skipped due to randomness
 	acctest.SkipIfVcr(t)
@@ -1683,6 +1806,7 @@ func TestAccSqlDatabaseInstance_pointInTimeRestoreWithSettings(t *testing.T) {
 				ImportState:             true,
 				ImportStateVerify:       true,
 				ImportStateVerifyIgnore: []string{"deletion_protection", "point_in_time_restore_context"},
+
 			},
 		},
 	})
@@ -7266,6 +7390,29 @@ resource "google_sql_database_instance" "instance" {
 `, context)
 }
 
+func testAccSqlDatabaseInstance_cloneWithSourceInstanceDeletionTime(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_sql_database_instance" "instance" {
+  name             = "tf-test-%{random_suffix}"
+  database_version = "POSTGRES_11"
+  region           = "us-central1"
+
+  clone {
+    source_instance_name = context.source_instance_name
+    point_in_time = context.point_in_time
+	source_instance_deletion_time = context.source_instance_deletion_time
+  }
+
+  deletion_protection = false
+
+  // Ignore changes, since the most recent backup may change during the test
+  lifecycle{
+	ignore_changes = [clone[0].point_in_time]
+  }
+}
+`, context)
+}
+
 func checkPromoteReplicaSkipConfigurations(resourceName string) func(*terraform.State) error {
 	return func(s *terraform.State) error {
 		resource, ok := s.RootModule().Resources[resourceName]

mmv1/third_party/terraform/website/docs/r/sql_database_instance.html.markdown

@@ -625,6 +625,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:
@@ -641,6 +645,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.