Skip to content

Commit 46d34c6

Browse files
BBBmauBBBmau
authored
cloudrun_service: examples -> samples test migration (GoogleCloudPlatform#17443)
1 parent b5b629b commit 46d34c6

12 files changed

Lines changed: 103 additions & 80 deletions

‎mmv1/products/cloudrun/Service.yaml‎

Lines changed: 89 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -69,95 +69,118 @@ sweeper:
6969
- region: "us-central1"
7070
- region: "europe-west1"
7171
- region: "europe-north1"
72-
examples:
72+
samples:
7373
- name: 'cloud_run_service_basic'
7474
primary_resource_id: 'default'
75-
vars:
76-
cloud_run_service_name: 'cloudrun-srv'
77-
test_env_vars:
78-
project: 'PROJECT_NAME'
75+
steps:
76+
- name: 'cloud_run_service_basic'
77+
resource_id_vars:
78+
cloud_run_service_name: 'cloudrun-srv'
79+
test_env_vars:
80+
project: 'PROJECT_NAME'
7981
- name: 'cloud_run_service_gpu'
8082
primary_resource_id: 'default'
81-
vars:
82-
cloud_run_service_name: 'cloudrun-srv'
83-
test_env_vars:
84-
project: 'PROJECT_NAME'
83+
steps:
84+
- name: 'cloud_run_service_gpu'
85+
resource_id_vars:
86+
cloud_run_service_name: 'cloudrun-srv'
87+
test_env_vars:
88+
project: 'PROJECT_NAME'
8589
- name: 'cloud_run_service_sql'
8690
primary_resource_id: 'default'
87-
vars:
88-
cloud_run_service_name: 'cloudrun-srv'
89-
cloud_run_sql_name: 'cloudrun-sql'
90-
deletion_protection: 'true'
91-
test_vars_overrides:
92-
'deletion_protection': 'false'
93-
oics_vars_overrides:
94-
'deletion_protection': 'false'
95-
ignore_read_extra:
96-
- 'autogenerate_revision_name'
91+
steps:
92+
- name: 'cloud_run_service_sql'
93+
resource_id_vars:
94+
cloud_run_service_name: 'cloudrun-srv'
95+
cloud_run_sql_name: 'cloudrun-sql'
96+
vars:
97+
deletion_protection: 'true'
98+
test_vars_overrides:
99+
'deletion_protection': 'false'
100+
oics_vars_overrides:
101+
'deletion_protection': 'false'
102+
ignore_read_extra:
103+
- 'autogenerate_revision_name'
97104
- name: 'cloud_run_service_noauth'
98105
primary_resource_id: 'default'
99-
vars:
100-
cloud_run_service_name: 'cloudrun-srv'
101-
test_env_vars:
102-
project: 'PROJECT_NAME'
106+
steps:
107+
- name: 'cloud_run_service_noauth'
108+
resource_id_vars:
109+
cloud_run_service_name: 'cloudrun-srv'
110+
test_env_vars:
111+
project: 'PROJECT_NAME'
103112
- name: 'cloud_run_service_multiple_environment_variables'
104113
primary_resource_id: 'default'
105-
vars:
106-
cloud_run_service_name: 'cloudrun-srv'
107-
test_env_vars:
108-
project: 'PROJECT_NAME'
109-
ignore_read_extra:
110-
- 'autogenerate_revision_name'
111-
exclude_docs: true
114+
exclude_basic_doc: true
115+
steps:
116+
- name: 'cloud_run_service_multiple_environment_variables'
117+
resource_id_vars:
118+
cloud_run_service_name: 'cloudrun-srv'
119+
test_env_vars:
120+
project: 'PROJECT_NAME'
121+
ignore_read_extra:
122+
- 'autogenerate_revision_name'
112123
- name: 'cloud_run_service_secret_environment_variables'
113124
primary_resource_id: 'default'
114-
vars:
115-
cloud_run_service_name: 'cloudrun-srv'
116-
secret_id: 'secret'
117-
test_vars_overrides:
118-
# for backward compatible
119-
secret_id: '"secret" + randomSuffix'
120-
test_env_vars:
121-
project: 'PROJECT_NAME'
122-
ignore_read_extra:
123-
- 'autogenerate_revision_name'
124-
exclude_docs: true
125+
exclude_basic_doc: true
126+
steps:
127+
- name: 'cloud_run_service_secret_environment_variables'
128+
resource_id_vars:
129+
cloud_run_service_name: 'cloudrun-srv'
130+
secret_id: 'secret'
131+
test_vars_overrides:
132+
# for backward compatible
133+
secret_id: '"secret" + randomSuffix'
134+
test_env_vars:
135+
project: 'PROJECT_NAME'
136+
ignore_read_extra:
137+
- 'autogenerate_revision_name'
125138
- name: 'cloud_run_service_secret_volumes'
126139
primary_resource_id: 'default'
127-
vars:
128-
cloud_run_service_name: 'cloudrun-srv'
129-
secret_id: 'secret'
130-
test_vars_overrides:
131-
# for backward compatible
132-
secret_id: '"secret" + randomSuffix'
133-
test_env_vars:
134-
project: 'PROJECT_NAME'
135-
ignore_read_extra:
136-
- 'autogenerate_revision_name'
137-
exclude_docs: true
140+
exclude_basic_doc: true
141+
steps:
142+
- name: 'cloud_run_service_secret_volumes'
143+
resource_id_vars:
144+
cloud_run_service_name: 'cloudrun-srv'
145+
secret_id: 'secret'
146+
test_vars_overrides:
147+
# for backward compatible
148+
secret_id: '"secret" + randomSuffix'
149+
test_env_vars:
150+
project: 'PROJECT_NAME'
151+
ignore_read_extra:
152+
- 'autogenerate_revision_name'
138153
- name: 'cloud_run_service_probes'
139154
primary_resource_id: 'default'
140-
vars:
141-
cloud_run_service_name: 'cloudrun-srv'
155+
steps:
156+
- name: 'cloud_run_service_probes'
157+
resource_id_vars:
158+
cloud_run_service_name: 'cloudrun-srv'
142159
- name: 'cloud_run_service_readiness_probe'
143160
primary_resource_id: 'default'
144-
vars:
145-
cloud_run_service_name: 'cloudrun-srv-rp'
146-
test_env_vars:
147-
project: 'PROJECT_NAME'
161+
steps:
162+
- name: 'cloud_run_service_readiness_probe'
163+
resource_id_vars:
164+
cloud_run_service_name: 'cloudrun-srv-rp'
165+
test_env_vars:
166+
project: 'PROJECT_NAME'
148167
- name: 'cloud_run_service_multicontainer'
149168
primary_resource_id: 'default'
150169
min_version: 'beta'
151-
vars:
152-
cloud_run_service_name: 'cloudrun-srv'
153-
test_env_vars:
154-
project: 'PROJECT_NAME'
170+
steps:
171+
- name: 'cloud_run_service_multicontainer'
172+
resource_id_vars:
173+
cloud_run_service_name: 'cloudrun-srv'
174+
test_env_vars:
175+
project: 'PROJECT_NAME'
155176
- name: 'cloud_run_service_iap'
156177
primary_resource_id: 'default'
157-
vars:
158-
cloud_run_service_name: 'cloudrun-srv'
159-
test_env_vars:
160-
project: 'PROJECT_NAME'
178+
steps:
179+
- name: 'cloud_run_service_iap'
180+
resource_id_vars:
181+
cloud_run_service_name: 'cloudrun-srv'
182+
test_env_vars:
183+
project: 'PROJECT_NAME'
161184
virtual_fields:
162185
- name: 'autogenerate_revision_name'
163186
description: |

mmv1/templates/terraform/examples/cloud_run_service_basic.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_basic.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
2-
name = "{{index $.Vars "cloud_run_service_name"}}"
2+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
33
location = "us-central1"
44

55
template {

mmv1/templates/terraform/examples/cloud_run_service_gpu.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_gpu.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
2-
name = "{{index $.Vars "cloud_run_service_name"}}"
2+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
33
location = "us-central1"
44

55
metadata {

mmv1/templates/terraform/examples/cloud_run_service_iap.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_iap.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
2-
name = "{{index $.Vars "cloud_run_service_name"}}"
2+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
33
location = "us-central1"
44

55
metadata {

mmv1/templates/terraform/examples/cloud_run_service_multicontainer.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multicontainer.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
2-
name = "{{index $.Vars "cloud_run_service_name"}}"
2+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
33
location = "us-central1"
44
provider = google-beta
55

mmv1/templates/terraform/examples/cloud_run_service_multiple_environment_variables.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_multiple_environment_variables.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
2-
name = "{{index $.Vars "cloud_run_service_name"}}"
2+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
33
location = "us-central1"
44

55
template {

mmv1/templates/terraform/examples/cloud_run_service_noauth.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_noauth.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
3-
name = "{{index $.Vars "cloud_run_service_name"}}"
3+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
44
location = "us-central1"
55

66
template {

mmv1/templates/terraform/examples/cloud_run_service_probes.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_probes.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
2-
name = "{{index $.Vars "cloud_run_service_name"}}"
2+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
33
location = "us-central1"
44

55
template {

mmv1/templates/terraform/examples/cloud_run_service_readiness_probe.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_readiness_probe.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
2-
name = "{{index $.Vars "cloud_run_service_name"}}"
2+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
33
location = "us-central1"
44

55
metadata {

mmv1/templates/terraform/examples/cloud_run_service_secret_environment_variables.tf.tmpl renamed to mmv1/templates/terraform/samples/services/cloudrun/cloud_run_service_secret_environment_variables.tf.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ data "google_project" "project" {
22
}
33

44
resource "google_secret_manager_secret" "secret" {
5-
secret_id = "{{index $.Vars "secret_id"}}"
5+
secret_id = "{{index $.ResourceIdVars "secret_id"}}"
66
replication {
77
auto {}
88
}
@@ -21,7 +21,7 @@ resource "google_secret_manager_secret_iam_member" "secret-access" {
2121
}
2222

2323
resource "google_cloud_run_service" "{{$.PrimaryResourceId}}" {
24-
name = "{{index $.Vars "cloud_run_service_name"}}"
24+
name = "{{index $.ResourceIdVars "cloud_run_service_name"}}"
2525
location = "us-central1"
2626

2727
template {

0 commit comments

Comments
 (0)