FEAT: Add dependsOn support in cloudrunv2 worker pool (#15444) (#10970)

[upstream:81daec8c2844c8abfc213bf3b0a46a4ad79b05e6]

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

Author: modular-magician

.changelog/15444.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+cloudrunv2: added `depends_on`  to `template.container` on `google_cloud_run_v2_worker_pool` resource
+```

google-beta/services/cloudrunv2/resource_cloud_run_v2_worker_pool.go

@@ -116,6 +116,15 @@ This field follows Kubernetes annotations' namespacing, limits, and rules.`,
 											Type: schema.TypeString,
 										},
 									},
+									"depends_on": {
+										Type:        schema.TypeList,
+										Optional:    true,
+										ForceNew:    true,
+										Description: `Names of the containers that must start before this container.`,
+										Elem: &schema.Schema{
+											Type: schema.TypeString,
+										},
+									},
 									"env": {
 										Type:        schema.TypeSet,
 										Optional:    true,
@@ -1887,6 +1896,7 @@ func flattenCloudRunV2WorkerPoolTemplateContainers(v interface{}, d *schema.Reso
 			"image":          flattenCloudRunV2WorkerPoolTemplateContainersImage(original["image"], d, config),
 			"command":        flattenCloudRunV2WorkerPoolTemplateContainersCommand(original["command"], d, config),
 			"args":           flattenCloudRunV2WorkerPoolTemplateContainersArgs(original["args"], d, config),
+			"depends_on":     flattenCloudRunV2WorkerPoolTemplateContainersDependsOn(original["dependsOn"], d, config),
 			"env":            flattenCloudRunV2WorkerPoolTemplateContainersEnv(original["env"], d, config),
 			"resources":      flattenCloudRunV2WorkerPoolTemplateContainersResources(original["resources"], d, config),
 			"volume_mounts":  flattenCloudRunV2WorkerPoolTemplateContainersVolumeMounts(original["volumeMounts"], d, config),
@@ -1913,6 +1923,10 @@ func flattenCloudRunV2WorkerPoolTemplateContainersArgs(v interface{}, d *schema.
 	return v
 }
 
+func flattenCloudRunV2WorkerPoolTemplateContainersDependsOn(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	return v
+}
+
 func flattenCloudRunV2WorkerPoolTemplateContainersEnv(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
 	if v == nil {
 		return v
@@ -3381,6 +3395,13 @@ func expandCloudRunV2WorkerPoolTemplateContainers(v interface{}, d tpgresource.T
 			transformed["args"] = transformedArgs
 		}
 
+		transformedDependsOn, err := expandCloudRunV2WorkerPoolTemplateContainersDependsOn(original["depends_on"], d, config)
+		if err != nil {
+			return nil, err
+		} else if val := reflect.ValueOf(transformedDependsOn); val.IsValid() && !tpgresource.IsEmptyValue(val) {
+			transformed["dependsOn"] = transformedDependsOn
+		}
+
 		transformedEnv, err := expandCloudRunV2WorkerPoolTemplateContainersEnv(original["env"], d, config)
 		if err != nil {
 			return nil, err
@@ -3444,6 +3465,10 @@ func expandCloudRunV2WorkerPoolTemplateContainersArgs(v interface{}, d tpgresour
 	return v, nil
 }
 
+func expandCloudRunV2WorkerPoolTemplateContainersDependsOn(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandCloudRunV2WorkerPoolTemplateContainersEnv(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
 	v = v.(*schema.Set).List()
 	if v == nil {

google-beta/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_meta.yaml

@@ -57,6 +57,7 @@ fields:
   - api_field: 'template.annotations'
   - api_field: 'template.containers.args'
   - api_field: 'template.containers.command'
+  - api_field: 'template.containers.dependsOn'
   - api_field: 'template.containers.env.name'
   - api_field: 'template.containers.env.value'
   - api_field: 'template.containers.env.valueSource.secretKeyRef.secret'

google-beta/services/cloudrunv2/resource_cloud_run_v2_worker_pool_generated_test.go

@@ -72,6 +72,63 @@ resource "google_cloud_run_v2_worker_pool" "default" {
 `, context)
 }
 
+func TestAccCloudRunV2WorkerPool_cloudrunv2WorkerPoolBasicDependsOnExample(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"random_suffix": acctest.RandString(t, 10),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckCloudRunV2WorkerPoolDestroyProducer(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccCloudRunV2WorkerPool_cloudrunv2WorkerPoolBasicDependsOnExample(context),
+			},
+			{
+				ResourceName:            "google_cloud_run_v2_worker_pool.default",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"annotations", "deletion_protection", "labels", "location", "name", "terraform_labels"},
+			},
+		},
+	})
+}
+
+func testAccCloudRunV2WorkerPool_cloudrunv2WorkerPoolBasicDependsOnExample(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_cloud_run_v2_worker_pool" "default" {
+  name     = "tf-test-cloudrun-worker-pool%{random_suffix}"
+  location = "us-central1"
+  deletion_protection = false
+  launch_stage = "BETA"
+  
+  template {
+    containers {
+        name = "foo-1"
+        image = "us-docker.pkg.dev/cloudrun/container/worker-pool"
+        depends_on = ["foo-2"]
+    }
+    containers {
+        name = "foo-2"
+        image = "us-docker.pkg.dev/cloudrun/container/worker-pool"
+        startup_probe {
+            http_get {
+                path = "/healthz"
+                port = 8080
+            }
+            period_seconds    = 5
+            timeout_seconds   = 2
+            failure_threshold = 3
+        }
+    }
+  }
+}
+`, context)
+}
+
 func TestAccCloudRunV2WorkerPool_cloudrunv2WorkerPoolLimitsExample(t *testing.T) {
 	t.Parallel()
 

website/docs/r/cloud_run_v2_worker_pool.html.markdown

@@ -52,6 +52,43 @@ resource "google_cloud_run_v2_worker_pool" "default" {
   }
 }
 ```
+<div class = "oics-button" style="float: right; margin: 0 0 -15px">
+  <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=cloudrunv2_worker_pool_basic_depends_on&open_in_editor=main.tf" target="_blank">
+    <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
+  </a>
+</div>
+## Example Usage - Cloudrunv2 Worker Pool Basic Depends On
+
+
+```hcl
+resource "google_cloud_run_v2_worker_pool" "default" {
+  name     = "cloudrun-worker-pool"
+  location = "us-central1"
+  deletion_protection = false
+  launch_stage = "BETA"
+  
+  template {
+    containers {
+        name = "foo-1"
+        image = "us-docker.pkg.dev/cloudrun/container/worker-pool"
+        depends_on = ["foo-2"]
+    }
+    containers {
+        name = "foo-2"
+        image = "us-docker.pkg.dev/cloudrun/container/worker-pool"
+        startup_probe {
+            http_get {
+                path = "/healthz"
+                port = 8080
+            }
+            period_seconds    = 5
+            timeout_seconds   = 2
+            failure_threshold = 3
+        }
+    }
+  }
+}
+```
 <div class = "oics-button" style="float: right; margin: 0 0 -15px">
   <a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=cloudrunv2_worker_pool_limits&open_in_editor=main.tf" target="_blank">
     <img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
@@ -726,6 +763,10 @@ When the field is set to false, deleting the WorkerPool is allowed.
   (Optional)
   Arguments to the entrypoint. The docker image's CMD is used if this is not provided. Variable references are not supported in Cloud Run.
 
+* `depends_on` -
+  (Optional)
+  Names of the containers that must start before this container.
+
 * `env` -
   (Optional)
   List of environment variables to set in the container.