diff --git a/mmv1/products/cloudrun/api.yaml b/mmv1/products/cloudrun/api.yaml index 14a49d27dc39..b5156ab55900 100644 --- a/mmv1/products/cloudrun/api.yaml +++ b/mmv1/products/cloudrun/api.yaml @@ -520,7 +520,6 @@ objects: Defaults to "". - !ruby/object:Api::Type::NestedObject name: valueFrom - min_version: beta description: |- Source for the environment variable's value. Only supports secret_key_ref. properties: @@ -589,7 +588,6 @@ objects: https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/api/resource/quantity.go - !ruby/object:Api::Type::Array name: volumeMounts - min_version: beta description: |- Volume to mount into the container's filesystem. Only supports SecretVolumeSources. @@ -629,7 +627,6 @@ objects: will use the project's default service account. - !ruby/object:Api::Type::Array name: volumes - min_version: beta description: |- Volume represents a named volume in a container. item_type: !ruby/object:Api::Type::NestedObject diff --git a/mmv1/products/cloudrun/terraform.yaml b/mmv1/products/cloudrun/terraform.yaml index 79335de69302..8269de8fb11b 100644 --- a/mmv1/products/cloudrun/terraform.yaml +++ b/mmv1/products/cloudrun/terraform.yaml @@ -132,7 +132,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides project: :PROJECT_NAME - !ruby/object:Provider::Terraform::Examples name: "cloud_run_service_secret_environment_variables" - min_version: beta primary_resource_id: "default" primary_resource_name: "fmt.Sprintf(\"tf-test-cloudrun-srv%s\", context[\"random_suffix\"])" vars: @@ -144,7 +143,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides - "autogenerate_revision_name" - !ruby/object:Provider::Terraform::Examples name: "cloud_run_service_secret_volumes" - min_version: beta primary_resource_id: "default" primary_resource_name: "fmt.Sprintf(\"tf-test-cloudrun-srv%s\", context[\"random_suffix\"])" vars: diff --git a/mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.erb b/mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.erb index 50811d3a54ab..b013ee437e30 100644 --- a/mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.erb +++ b/mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.erb @@ -1,10 +1,7 @@ data "google_project" "project" { - provider = google-beta } resource "google_secret_manager_secret" "secret" { - provider = google-beta - secret_id = "<%= ctx[:vars]['secret_id'] %>" replication { automatic = true @@ -12,15 +9,11 @@ resource "google_secret_manager_secret" "secret" { } resource "google_secret_manager_secret_version" "secret-version-data" { - provider = google-beta - secret = google_secret_manager_secret.secret.name secret_data = "secret-data" } resource "google_secret_manager_secret_iam_member" "secret-access" { - provider = google-beta - secret_id = google_secret_manager_secret.secret.id role = "roles/secretmanager.secretAccessor" member = "serviceAccount:${data.google_project.project.number}-compute@developer.gserviceaccount.com" @@ -28,8 +21,6 @@ resource "google_secret_manager_secret_iam_member" "secret-access" { } resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta - name = "<%= ctx[:vars]['cloud_run_service_name'] %>" location = "us-central1" @@ -53,7 +44,6 @@ resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" { metadata { annotations = { generated-by = "magic-modules" - "run.googleapis.com/launch-stage" = "BETA" } } diff --git a/mmv1/templates/terraform/examples/cloud_run_service_secret_volumes.tf.erb b/mmv1/templates/terraform/examples/cloud_run_service_secret_volumes.tf.erb index 092cf67934ce..71dc2d92a2d5 100644 --- a/mmv1/templates/terraform/examples/cloud_run_service_secret_volumes.tf.erb +++ b/mmv1/templates/terraform/examples/cloud_run_service_secret_volumes.tf.erb @@ -1,10 +1,7 @@ data "google_project" "project" { - provider = google-beta } resource "google_secret_manager_secret" "secret" { - provider = google-beta - secret_id = "<%= ctx[:vars]['secret_id'] %>" replication { automatic = true @@ -12,15 +9,11 @@ resource "google_secret_manager_secret" "secret" { } resource "google_secret_manager_secret_version" "secret-version-data" { - provider = google-beta - secret = google_secret_manager_secret.secret.name secret_data = "secret-data" } resource "google_secret_manager_secret_iam_member" "secret-access" { - provider = google-beta - secret_id = google_secret_manager_secret.secret.id role = "roles/secretmanager.secretAccessor" member = "serviceAccount:${data.google_project.project.number}-compute@developer.gserviceaccount.com" @@ -28,8 +21,6 @@ resource "google_secret_manager_secret_iam_member" "secret-access" { } resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" { - provider = google-beta - name = "<%= ctx[:vars]['cloud_run_service_name'] %>" location = "us-central1" @@ -58,7 +49,6 @@ resource "google_cloud_run_service" "<%= ctx[:primary_resource_id] %>" { metadata { annotations = { generated-by = "magic-modules" - "run.googleapis.com/launch-stage" = "BETA" } } diff --git a/mmv1/third_party/terraform/tests/resource_cloud_run_service_test.go.erb b/mmv1/third_party/terraform/tests/resource_cloud_run_service_test.go.erb index 0e55465d1c94..c6ac54ac6c25 100644 --- a/mmv1/third_party/terraform/tests/resource_cloud_run_service_test.go.erb +++ b/mmv1/third_party/terraform/tests/resource_cloud_run_service_test.go.erb @@ -117,7 +117,6 @@ resource "google_cloud_run_service" "default" { `, name, project, concurrency, timeoutSeconds) } -<% unless version == 'ga' %> func TestAccCloudRunService_secretVolume(t *testing.T) { t.Parallel() @@ -223,7 +222,6 @@ resource "google_cloud_run_service" "default" { namespace = "%s" annotations = { generated-by = "magic-modules" - "run.googleapis.com/launch-stage" = "BETA" } } @@ -343,7 +341,6 @@ resource "google_cloud_run_service" "default" { namespace = "%s" annotations = { generated-by = "magic-modules" - "run.googleapis.com/launch-stage" = "BETA" } } @@ -362,4 +359,3 @@ resource "google_cloud_run_service" "default" { } `, secretName1, secretName2, name, secretRef, project) } -<% end -%>