feat(spanner): support totalCPUUtilizationPercent in autoscaling target for spanner instances (#15919)

Author: rahul2393

mmv1/products/spanner/Instance.yaml

@@ -235,6 +235,13 @@ properties:
               Specifies the target storage utilization percentage that the autoscaler
               should be trying to achieve for the instance.
               This number is on a scale from 0 (no utilization) to 100 (full utilization).
+          - name: 'totalCpuUtilizationPercent'
+            type: Integer
+            description: |
+              The target total cpu utilization percentage that the autoscaler should be trying to achieve for the instance.
+              This number is on a scale from 0 (no utilization) to 100 (full utilization). The valid range is [10, 90] inclusive.
+              If not specified or set to 0, the autoscaler will skip scaling based on total cpu utilization.
+              The value should be higher than high_priority_cpu_utilization_percent if present.
 
       - name: 'asymmetricAutoscalingOptions'
         type: Array

mmv1/templates/terraform/encoders/spanner_instance_update.go.tmpl

@@ -52,6 +52,9 @@ if d.HasChange("autoscaling_config") {
 		if d.HasChange("autoscaling_config.0.autoscaling_targets.0.storage_utilization_percent") {
 			updateMask = append(updateMask, "autoscalingConfig.autoscalingTargets.storageUtilizationPercent")
 		}
+		if d.HasChange("autoscaling_config.0.autoscaling_targets.0.total_cpu_utilization_percent") {
+			updateMask = append(updateMask, "autoscalingConfig.autoscalingTargets.totalCpuUtilizationPercent")
+		}
 		if d.HasChange("autoscaling_config.0.asymmetric_autoscaling_options") {
 			updateMask = append(updateMask, "autoscalingConfig.asymmetricAutoscalingOptions")
 		}

mmv1/third_party/terraform/services/spanner/resource_spanner_instance_test.go

@@ -543,6 +543,45 @@ func TestAccSpannerInstance_freeInstanceBasicUpdate(t *testing.T) {
 	})
 }
 
+func TestAccSpannerInstance_autoscalingWithTotalCPUUtilizationPercent(t *testing.T) {
+	t.Parallel()
+
+	displayName := fmt.Sprintf("tf-test-%s", acctest.RandString(t, 10))
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckSpannerInstanceDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccSpannerInstance_autoscalingWithTotalCPUUtilizationPercent(displayName, 2000, 4000, 65, 85, 95),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("google_spanner_instance.test", "state"),
+					resource.TestCheckResourceAttr("google_spanner_instance.test", "autoscaling_config.0.autoscaling_targets.0.total_cpu_utilization_percent", "85"),
+				),
+			},
+			{
+				ResourceName:            "google_spanner_instance.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
+			},
+			{
+				Config: testAccSpannerInstance_autoscalingWithTotalCPUUtilizationPercent(displayName, 3000, 5000, 75, 90, 95),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("google_spanner_instance.test", "state"),
+					resource.TestCheckResourceAttr("google_spanner_instance.test", "autoscaling_config.0.autoscaling_targets.0.total_cpu_utilization_percent", "90"),
+				),
+			},
+			{
+				ResourceName:            "google_spanner_instance.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
 func testAccSpannerInstance_basic(name string) string {
 	return fmt.Sprintf(`
 resource "google_spanner_instance" "basic" {
@@ -701,6 +740,7 @@ resource "google_spanner_instance" "basic" {
     }
     autoscaling_targets {
       high_priority_cpu_utilization_percent = %v
+      total_cpu_utilization_percent         = 85
       storage_utilization_percent           = %v
     }
   }
@@ -905,3 +945,25 @@ resource "google_spanner_instance" "main" {
 }
 `, context)
 }
+
+func testAccSpannerInstance_autoscalingWithTotalCPUUtilizationPercent(name string, minProcessingUnits, maxProcessingUnits, highPriorityCPU, totalCPU, storageUtilization int) string {
+	return fmt.Sprintf(`
+resource "google_spanner_instance" "test" {
+  name         = "%s"
+  config       = "regional-us-central1"
+  display_name = "%s"
+  autoscaling_config {
+    autoscaling_limits {
+      max_processing_units = %d
+      min_processing_units = %d
+    }
+    autoscaling_targets {
+      high_priority_cpu_utilization_percent = %d
+      total_cpu_utilization_percent         = %d
+      storage_utilization_percent           = %d
+    }
+  }
+  edition = "ENTERPRISE"
+}
+`, name, name, maxProcessingUnits, minProcessingUnits, highPriorityCPU, totalCPU, storageUtilization)
+}