Add support for processing_units to google_spanner_instance (#4993)

Co-authored-by: upodroid <[email protected]> Co-authored-by: Cameron Thornton <[email protected]>
GoogleCloudPlatform · Aug 3, 2021 · d9c69c1 · d9c69c1
1 parent 509318c
commit d9c69c1
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 3 deletions.
diff --git a/mmv1/products/spanner/api.yaml b/mmv1/products/spanner/api.yaml
@@ -102,8 +102,14 @@ objects:
         required: true
       - !ruby/object:Api::Type::Integer
         name: 'nodeCount'
-        description: 'The number of nodes allocated to this instance.'
-        default_value: 1
+        description: |
+          The number of nodes allocated to this instance. At most one of either node_count or processing_units
+          can be present in terraform. 
+      - !ruby/object:Api::Type::Integer
+        name: 'processingUnits'
+        description: |
+          The number of processing units allocated to this instance. At most one of processing_units 
+          or node_count can be present in terraform. 
       - !ruby/object:Api::Type::KeyValuePairs
         name: 'labels'
         description: |
@@ -197,4 +203,3 @@ objects:
             description: |
               Fully qualified name of the KMS key to use to encrypt this database. This key must exist
               in the same location as the Spanner Database.
-
diff --git a/mmv1/products/spanner/terraform.yaml b/mmv1/products/spanner/terraform.yaml
@@ -81,6 +81,11 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         primary_resource_id: "example"
         # Randomness
         skip_vcr: true
+      - !ruby/object:Provider::Terraform::Examples
+        name: "spanner_instance_processing_units"
+        primary_resource_id: "example"
+        # Randomness
+        skip_vcr: true
       - !ruby/object:Provider::Terraform::Examples
         name: "spanner_instance_multi_regional"
         primary_resource_id: "example"
@@ -108,6 +113,9 @@ overrides: !ruby/object:Overrides::ResourceOverrides
         custom_flatten: 'templates/terraform/custom_flatten/name_from_self_link.erb'
       nodeCount: !ruby/object:Overrides::Terraform::PropertyOverride
         name: num_nodes
+        default_from_api: true
+      processingUnits: !ruby/object:Overrides::Terraform::PropertyOverride
+        default_from_api: true
       config: !ruby/object:Overrides::Terraform::PropertyOverride
         custom_expand: templates/terraform/custom_expand/spanner_instance_config.go.erb
       state: !ruby/object:Overrides::Terraform::PropertyOverride

diff --git a/mmv1/templates/terraform/encoders/spanner_instance.go.erb b/mmv1/templates/terraform/encoders/spanner_instance.go.erb
@@ -1,3 +1,7 @@
+// Temp Logic to accomodate processing_units and num_nodes
+if obj["processingUnits"] == nil && obj["nodeCount"] == nil {
+	obj["nodeCount"] = 1
+}
 newObj := make(map[string]interface{})
 newObj["instance"] = obj
 if obj["name"] == nil {

diff --git a/mmv1/templates/terraform/examples/spanner_instance_processing_units.tf.erb b/mmv1/templates/terraform/examples/spanner_instance_processing_units.tf.erb
@@ -0,0 +1,8 @@
+resource "google_spanner_instance" "example" {
+  config       = "regional-us-central1"
+  display_name = "Test Spanner Instance"
+  processing_units    = 200
+  labels = {
+    "foo" = "bar"
+  }
+}
diff --git a/mmv1/third_party/terraform/tests/resource_spanner_instance_test.go b/mmv1/third_party/terraform/tests/resource_spanner_instance_test.go
@@ -71,6 +71,30 @@ func TestAccSpannerInstance_basic(t *testing.T) {
 	})
 }
 
+func TestAccSpannerInstance_noNodeCountSpecified(t *testing.T) {
+	t.Parallel()
+
+	idName := fmt.Sprintf("spanner-test-%s", randString(t, 10))
+	vcrTest(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckSpannerInstanceDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccSpannerInstance_noNodeCountSpecified(idName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("google_spanner_instance.basic", "state"),
+				),
+			},
+			{
+				ResourceName:      "google_spanner_instance.basic",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
+
 func TestAccSpannerInstance_basicWithAutogenName(t *testing.T) {
 	// Randomness
 	skipIfVcr(t)
@@ -140,6 +164,16 @@ resource "google_spanner_instance" "basic" {
 `, name, name)
 }
 
+func testAccSpannerInstance_noNodeCountSpecified(name string) string {
+	return fmt.Sprintf(`
+resource "google_spanner_instance" "basic" {
+  name         = "%s"
+  config       = "regional-us-central1"
+  display_name = "%s-dname"
+}
+`, name, name)
+}
+
 func testAccSpannerInstance_basicWithAutogenName(name string) string {
 	return fmt.Sprintf(`
 resource "google_spanner_instance" "basic" {