feat: move emptydir to GA for cloudrun and cloudrunv2 (GoogleCloudPla…

…tform#12230)
zeleena · Nov 4, 2024 · 8a6f281 · 8a6f281
1 parent 151f8f2
commit 8a6f281
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 15 deletions.
diff --git a/mmv1/products/cloudrun/Service.yaml b/mmv1/products/cloudrun/Service.yaml
@@ -848,7 +848,6 @@ properties:
                       type: NestedObject
                       description: |-
                         Ephemeral storage which can be backed by real disks (HD, SSD), network storage or memory (i.e. tmpfs). For now only in memory (tmpfs) is supported. It is ephemeral in the sense that when the sandbox is taken down, the data is destroyed with it (it does not persist across sandbox runs).
-                      min_version: 'beta'
                       properties:
                         - name: 'medium'
                           type: String

diff --git a/mmv1/products/cloudrunv2/Job.yaml b/mmv1/products/cloudrunv2/Job.yaml
@@ -112,7 +112,6 @@ examples:
   - name: 'cloudrunv2_job_emptydir'
     primary_resource_id: 'default'
     primary_resource_name: 'fmt.Sprintf("tf-test-cloudrun-job%s", context["random_suffix"])'
-    min_version: 'beta'
     vars:
       cloud_run_job_name: 'cloudrun-job'
     ignore_read_extra:
@@ -507,7 +506,6 @@ properties:
                   type: NestedObject
                   description: |-
                     Ephemeral storage used as a shared volume.
-                  min_version: 'beta'
                   # exactly_one_of:
                   #   - template.0.template.0.volumes.0.secret
                   #   - template.0.template.0.volumes.0.cloudSqlInstance

diff --git a/mmv1/products/cloudrunv2/Service.yaml b/mmv1/products/cloudrunv2/Service.yaml
@@ -127,7 +127,6 @@ examples:
   - name: 'cloudrunv2_service_multicontainer'
     primary_resource_id: 'default'
     primary_resource_name: 'fmt.Sprintf("tf-test-cloudrun-service%s", context["random_suffix"])'
-    min_version: 'beta'
     vars:
       cloud_run_service_name: 'cloudrun-service'
     ignore_read_extra:
@@ -837,7 +836,6 @@ properties:
               type: NestedObject
               description: |-
                 Ephemeral storage used as a shared volume.
-              min_version: 'beta'
               # exactly_one_of:
               #   - template.0.volumes.0.secret
               #   - template.0.volumes.0.cloudSqlInstance

diff --git a/mmv1/templates/terraform/examples/cloudrunv2_job_emptydir.tf.tmpl b/mmv1/templates/terraform/examples/cloudrunv2_job_emptydir.tf.tmpl
@@ -1,9 +1,7 @@
 resource "google_cloud_run_v2_job" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
   name     = "{{index $.Vars "cloud_run_job_name"}}"
   location = "us-central1"
   deletion_protection = false
-  launch_stage = "BETA"
   template {
     template {
       containers {

diff --git a/mmv1/templates/terraform/examples/cloudrunv2_service_multicontainer.tf.tmpl b/mmv1/templates/terraform/examples/cloudrunv2_service_multicontainer.tf.tmpl
@@ -1,9 +1,7 @@
 resource "google_cloud_run_v2_service" "{{$.PrimaryResourceId}}" {
-  provider = google-beta
   name     = "{{index $.Vars "cloud_run_service_name"}}"
   location = "us-central1"
   deletion_protection = false
-  launch_stage = "BETA"
   ingress = "INGRESS_TRAFFIC_ALL"
   template {
     containers {

diff --git a/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_service_test.go.tmpl b/mmv1/third_party/terraform/services/cloudrun/resource_cloud_run_service_test.go.tmpl
@@ -1425,8 +1425,6 @@ resource "google_cloud_run_service" "default" {
 `, name, project)
 }
 
-  {{ if ne $.TargetVersionName `ga` -}}
-
 func TestAccCloudRunService_emptyDirVolume(t *testing.T) {
 	t.Parallel()
 
@@ -1435,7 +1433,7 @@ func TestAccCloudRunService_emptyDirVolume(t *testing.T) {
 
 	acctest.VcrTest(t, resource.TestCase{
 		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
-		ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
 		Steps: []resource.TestStep{
 			{
 				Config: testAccCloudRunService_cloudRunServiceWithEmptyDirVolume(name, project),
@@ -1454,15 +1452,13 @@ func TestAccCloudRunService_emptyDirVolume(t *testing.T) {
 func testAccCloudRunService_cloudRunServiceWithEmptyDirVolume(name, project string) string {
 	return fmt.Sprintf(`
 resource "google_cloud_run_service" "default" {
-  provider = google-beta
   name     = "%s"
   location = "us-central1"
 
   metadata {
     namespace = "%s"
     annotations = {
       generated-by = "magic-modules"
-      "run.googleapis.com/launch-stage" = "BETA"
     }
   }
 
@@ -1485,7 +1481,6 @@ resource "google_cloud_run_service" "default" {
 }
 `, name, project)
 }
-  {{- end }}
 
 {{ if ne $.TargetVersionName `ga` -}}
 func TestAccCloudRunService_resourcesRequirements(t *testing.T) {