Compute: Add storage_pool support to instance template disks (#16571)

yihanl-google · web-flow · commit 047381f5bed2 · 2026-03-05T17:01:03.000Z
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template.go.tmpl
@@ -394,6 +394,13 @@ Google Cloud KMS. Only one of kms_key_self_link, rsa_encrypted_key and raw_key m
 								DiffSuppressFunc: tpgresource.CompareResourceNames,
 							},
 						},
+						"storage_pool": {
+							Type:             schema.TypeString,
+							Optional:         true,
+							ForceNew:         true,
+							DiffSuppressFunc: tpgresource.CompareResourceNames,
+							Description:      `The self_link or ID of the Storage Pool to create this disk in.`,
+						},
 					},
 				},
 			},
@@ -1534,6 +1541,15 @@ func buildDisks(d *schema.ResourceData, config *transport_tpg.Config) ([]*comput
 				// instance template only supports a resource name here (not uri)
 				disk.InitializeParams.ResourcePolicies = expandInstanceTemplateResourcePolicies(d, prefix + ".resource_policies")
 			}
+			
+			if v, ok := d.GetOk(prefix + ".storage_pool"); ok {
+    			// Convert name/partial ID to a full URL
+    			storagePoolUrl, err := ExpandStoragePoolUrl(v, d, config)
+    			if err != nil {
+        			return nil, err
+    			}
+    			disk.InitializeParams.StoragePool = storagePoolUrl
+			}
 		}
 
 		if v, ok := d.GetOk(prefix + ".interface"); ok {
@@ -1810,6 +1826,9 @@ func flattenDisk(disk *compute.AttachedDisk, configDisk map[string]any, defaultP
 		}
 		diskMap["resource_policies"] = disk.InitializeParams.ResourcePolicies
 		diskMap["resource_manager_tags"] = disk.InitializeParams.ResourceManagerTags
+		if disk.InitializeParams.StoragePool != "" {
+    		diskMap["storage_pool"] = tpgresource.GetResourceNameFromSelfLink(disk.InitializeParams.StoragePool)
+		}
 	}
 
 	if disk.DiskEncryptionKey != nil {
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_meta.yaml.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_meta.yaml.tmpl
@@ -86,6 +86,8 @@ fields:
     api_field: 'properties.disks.initializeParams.sourceSnapshotEncryptionKey.rawKey'
   - field: 'disk.source_snapshot_encryption_key.rsa_encrypted_key'
     api_field: 'properties.disks.initializeParams.sourceSnapshotEncryptionKey.rsaEncryptedKey'
+  - field: 'disk.storage_pool'
+    api_field: 'properties.disks.initializeParams.storagePool'
   - field: 'disk.type'
     api_field: 'properties.disks.type'
   - field: 'effective_labels'
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_instance_template_test.go.tmpl
@@ -2168,6 +2168,88 @@ resource "google_compute_instance_template" "foobar" {
 `, context)
 }
 
+func TestAccComputeInstanceTemplate_storagePool(t *testing.T) {
+	t.Parallel()
+
+	var instanceTemplate compute.InstanceTemplate
+	suffix := acctest.RandString(t, 10)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeInstanceTemplateDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeInstanceTemplate_storagePool(suffix),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeInstanceTemplateExists(
+						t, "google_compute_instance_template.foobar", &instanceTemplate),
+					// Verify that the storage_pool attribute is set correctly in state
+					resource.TestCheckResourceAttr("google_compute_instance_template.foobar", "disk.0.storage_pool", "tf-test-storage-pool-"+suffix),
+					// Optional: Verify the API response contains the storage pool
+					testAccCheckComputeInstanceTemplateHasDiskStoragePool(&instanceTemplate, "tf-test-storage-pool-"+suffix),
+				),
+			},
+			{
+				ResourceName:            "google_compute_instance_template.foobar",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccCheckComputeInstanceTemplateHasDiskStoragePool(instanceTemplate *compute.InstanceTemplate, poolName string) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		for _, disk := range instanceTemplate.Properties.Disks {
+			if disk.InitializeParams != nil && strings.Contains(disk.InitializeParams.StoragePool, poolName) {
+				return nil
+			}
+		}
+		return fmt.Errorf("Storage pool %s not found in instance template disks", poolName)
+	}
+}
+
+func testAccComputeInstanceTemplate_storagePool(suffix string) string {
+	return fmt.Sprintf(`
+resource "google_compute_storage_pool" "example" {
+  name                         = "tf-test-storage-pool-%s"
+  zone                         = "us-central1-a"
+  pool_provisioned_capacity_gb = 10240
+  pool_provisioned_throughput  = 1024
+  pool_provisioned_iops        = 10000
+  storage_pool_type            = "hyperdisk-balanced"
+  # Required for automated tests to clean up successfully
+  deletion_protection          = false 
+}
+
+data "google_compute_image" "my_image" {
+  family  = "debian-11"
+  project = "debian-cloud"
+}
+
+resource "google_compute_instance_template" "foobar" {
+  name         = "tf-test-instance-template-%s"
+  machine_type = "e2-medium"
+
+  disk {
+    source_image = data.google_compute_image.my_image.self_link
+    auto_delete  = true
+    boot         = true
+    # Reference the ID (URL format) instead of the name
+    storage_pool = google_compute_storage_pool.example.id
+    disk_type    = "hyperdisk-balanced"
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+`, suffix, suffix)
+}
+
+
 func TestUnitComputeInstanceTemplate_IpCidrRangeDiffSuppress(t *testing.T) {
 	cases := map[string]struct {
 		Old, New           string
@@ -4172,6 +4254,7 @@ data "google_compute_image" "my_image" {
   project = "debian-cloud"
 }
 
+
 resource "google_compute_instance_template" "foobar" {
   name         = "tf-test-instance-template-%s"
   machine_type = "e2-standard-4"
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template.go.tmpl
@@ -364,6 +364,13 @@ Google Cloud KMS. Only one of kms_key_self_link, rsa_encrypted_key and raw_key m
 								DiffSuppressFunc: tpgresource.CompareResourceNames,
 							},
 						},
+						"storage_pool": {
+							Type:             schema.TypeString,
+							Optional:         true,
+							ForceNew:         true,
+							DiffSuppressFunc: tpgresource.CompareResourceNames,
+							Description:      `The self_link or ID of the Storage Pool to create this disk in.`,
+						},
 					},
 				},
 			},
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_meta.yaml.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_meta.yaml.tmpl
@@ -86,6 +86,8 @@ fields:
     api_field: 'properties.disks.initializeParams.sourceSnapshotEncryptionKey.rawKey'
   - field: 'disk.source_snapshot_encryption_key.rsa_encrypted_key'
     api_field: 'properties.disks.initializeParams.sourceSnapshotEncryptionKey.rsaEncryptedKey'
+  - field: 'disk.storage_pool'
+    api_field: 'properties.disks.initializeParams.storagePool'
   - field: 'disk.type'
     api_field: 'properties.disks.type'
   - field: 'effective_labels'
diff --git a/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.tmpl b/mmv1/third_party/terraform/services/compute/resource_compute_region_instance_template_test.go.tmpl
@@ -1955,6 +1955,72 @@ func testAccCheckComputeRegionInstanceTemplateDestroyProducer(t *testing.T) func
 	}
 }
 
+func TestAccComputeRegionInstanceTemplate_storagePool(t *testing.T) {
+	t.Parallel()
+
+	var instanceTemplate compute.InstanceTemplate
+	suffix := acctest.RandString(t, 10)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckComputeRegionInstanceTemplateDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccComputeRegionInstanceTemplate_storagePool(suffix),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckComputeRegionInstanceTemplateExists(
+						t, "google_compute_region_instance_template.foobar", &instanceTemplate),
+					resource.TestCheckResourceAttr("google_compute_region_instance_template.foobar", "disk.0.storage_pool", "tf-test-storage-pool-"+suffix),
+				),
+			},
+			{
+				ResourceName:            "google_compute_region_instance_template.foobar",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"labels", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccComputeRegionInstanceTemplate_storagePool(suffix string) string {
+	return fmt.Sprintf(`
+resource "google_compute_storage_pool" "example" {
+  name                         = "tf-test-storage-pool-%s"
+  zone                         = "us-central1-a"
+  pool_provisioned_capacity_gb = 10240
+  pool_provisioned_throughput  = 1024
+  pool_provisioned_iops        = 10000
+  storage_pool_type            = "hyperdisk-balanced"
+  deletion_protection          = false
+}
+
+data "google_compute_image" "my_image" {
+  family  = "debian-11"
+  project = "debian-cloud"
+}
+
+resource "google_compute_region_instance_template" "foobar" {
+  name         = "tf-test-instance-template-%s"
+  region       = "us-central1"
+  machine_type = "e2-medium"
+
+  disk {
+    source_image = data.google_compute_image.my_image.self_link
+    auto_delete  = true
+    boot         = true
+    storage_pool = google_compute_storage_pool.example.id
+    disk_type    = "hyperdisk-balanced"
+  }
+
+  network_interface {
+    network = "default"
+  }
+}
+`, suffix, suffix)
+}
+
 func testAccCheckComputeRegionInstanceTemplateExists(t *testing.T, n string, instanceTemplate interface{}) resource.TestCheckFunc {
 	if instanceTemplate == nil {
 		panic("Attempted to check existence of Instance template that was nil.")
diff --git a/mmv1/third_party/terraform/website/docs/r/compute_instance_template.html.markdown b/mmv1/third_party/terraform/website/docs/r/compute_instance_template.html.markdown
@@ -516,6 +516,11 @@ The following arguments are supported:
 
 * `resource_policies` (Optional) -- A list (short name or id) of resource policies to attach to this disk for automatic snapshot creations. Currently a max of 1 resource policy is supported.
 
+* `storage_pool` - (Optional) The URL of the storage pool in which the new disk is created.
+    For example:
+    * `https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/storagePools/{storagePool}`
+    * `/projects/{project}/zones/{zone}/storagePools/{storagePool}`
+
 <a name="nested_source_image_encryption_key"></a>The `source_image_encryption_key` block supports:
 
 * `raw_key` - (Optional)  A 256-bit [customer-supplied encryption key]
diff --git a/mmv1/third_party/terraform/website/docs/r/compute_region_instance_template.html.markdown b/mmv1/third_party/terraform/website/docs/r/compute_region_instance_template.html.markdown
@@ -481,6 +481,12 @@ The following arguments are supported:
 
 * `resource_policies` (Optional) -- A list (short name or id) of resource policies to attach to this disk for automatic snapshot creations. Currently a max of 1 resource policy is supported.
 
+* `storage_pool` - (Optional) The URL of the storage pool in which the new disk is created.
+    For example:
+    * `https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/storagePools/{storagePool}`
+    * `/projects/{project}/zones/{zone}/storagePools/{storagePool}`
+
+
 <a name="nested_source_image_encryption_key"></a>The `source_image_encryption_key` block supports:
 
 * `raw_key` - (Optional)  A 256-bit [customer-supplied encryption key]
