Skip to content

Commit 272b27f

Browse files
modular-magicianmodular-magician
authored
Graduating Cloud Workstations resources from "google-beta" to "google" provider (#16713) (#11772)
[upstream:c5f4fe11b67a21584f3408ef95af70dcbd7f58a0] Signed-off-by: Modular Magician <[email protected]>
1 parent c0ab286 commit 272b27f

17 files changed

+56
-387
lines changed

‎.changelog/16713.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:note
2+
Graduated Workstation, WorkstationConfig, and WorkstationCluster resources from beta to GA provider.
3+
```

‎google-beta/services/workstations/iam_workstations_workstation_config_generated_test.go‎

Lines changed: 3 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestAccWorkstationsWorkstationConfigIamBindingGenerated(t *testing.T) {
5252

5353
acctest.VcrTest(t, resource.TestCase{
5454
PreCheck: func() { acctest.AccTestPreCheck(t) },
55-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
55+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
5656
Steps: []resource.TestStep{
5757
{
5858
Config: testAccWorkstationsWorkstationConfigIamBinding_basicGenerated(context),
@@ -90,7 +90,7 @@ func TestAccWorkstationsWorkstationConfigIamMemberGenerated(t *testing.T) {
9090

9191
acctest.VcrTest(t, resource.TestCase{
9292
PreCheck: func() { acctest.AccTestPreCheck(t) },
93-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
93+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
9494
Steps: []resource.TestStep{
9595
{
9696
// Test Iam Member creation (no update for member, no need to test)
@@ -119,7 +119,7 @@ func TestAccWorkstationsWorkstationConfigIamPolicyGenerated(t *testing.T) {
119119

120120
acctest.VcrTest(t, resource.TestCase{
121121
PreCheck: func() { acctest.AccTestPreCheck(t) },
122-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
122+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
123123
Steps: []resource.TestStep{
124124
{
125125
Config: testAccWorkstationsWorkstationConfigIamPolicy_basicGenerated(context),
@@ -147,33 +147,28 @@ func TestAccWorkstationsWorkstationConfigIamPolicyGenerated(t *testing.T) {
147147
func testAccWorkstationsWorkstationConfigIamMember_basicGenerated(context map[string]interface{}) string {
148148
return acctest.Nprintf(`
149149
resource "google_tags_tag_key" "tag_key1" {
150-
provider = google-beta
151150
parent = "organizations/%{org_id}"
152151
short_name = "%{key_short_name}"
153152
}
154153
155154
resource "google_tags_tag_value" "tag_value1" {
156-
provider = google-beta
157155
parent = google_tags_tag_key.tag_key1.id
158156
short_name = "%{value_short_name}"
159157
}
160158
161159
resource "google_compute_network" "default" {
162-
provider = google-beta
163160
name = "tf-test-workstation-cluster%{random_suffix}"
164161
auto_create_subnetworks = false
165162
}
166163
167164
resource "google_compute_subnetwork" "default" {
168-
provider = google-beta
169165
name = "tf-test-workstation-cluster%{random_suffix}"
170166
ip_cidr_range = "10.0.0.0/24"
171167
region = "us-central1"
172168
network = google_compute_network.default.name
173169
}
174170
175171
resource "google_workstations_workstation_cluster" "default" {
176-
provider = google-beta
177172
workstation_cluster_id = "tf-test-workstation-cluster%{random_suffix}"
178173
network = google_compute_network.default.id
179174
subnetwork = google_compute_subnetwork.default.id
@@ -189,7 +184,6 @@ resource "google_workstations_workstation_cluster" "default" {
189184
}
190185
191186
resource "google_workstations_workstation_config" "default" {
192-
provider = google-beta
193187
workstation_config_id = "tf-test-workstation-config%{random_suffix}"
194188
workstation_cluster_id = google_workstations_workstation_cluster.default.workstation_cluster_id
195189
location = "us-central1"
@@ -222,7 +216,6 @@ resource "google_workstations_workstation_config" "default" {
222216
}
223217
224218
resource "google_workstations_workstation_config_iam_member" "foo" {
225-
provider = google-beta
226219
project = google_workstations_workstation_config.default.project
227220
location = google_workstations_workstation_config.default.location
228221
workstation_cluster_id = google_workstations_workstation_config.default.workstation_cluster_id
@@ -236,33 +229,28 @@ resource "google_workstations_workstation_config_iam_member" "foo" {
236229
func testAccWorkstationsWorkstationConfigIamPolicy_basicGenerated(context map[string]interface{}) string {
237230
return acctest.Nprintf(`
238231
resource "google_tags_tag_key" "tag_key1" {
239-
provider = google-beta
240232
parent = "organizations/%{org_id}"
241233
short_name = "%{key_short_name}"
242234
}
243235
244236
resource "google_tags_tag_value" "tag_value1" {
245-
provider = google-beta
246237
parent = google_tags_tag_key.tag_key1.id
247238
short_name = "%{value_short_name}"
248239
}
249240
250241
resource "google_compute_network" "default" {
251-
provider = google-beta
252242
name = "tf-test-workstation-cluster%{random_suffix}"
253243
auto_create_subnetworks = false
254244
}
255245
256246
resource "google_compute_subnetwork" "default" {
257-
provider = google-beta
258247
name = "tf-test-workstation-cluster%{random_suffix}"
259248
ip_cidr_range = "10.0.0.0/24"
260249
region = "us-central1"
261250
network = google_compute_network.default.name
262251
}
263252
264253
resource "google_workstations_workstation_cluster" "default" {
265-
provider = google-beta
266254
workstation_cluster_id = "tf-test-workstation-cluster%{random_suffix}"
267255
network = google_compute_network.default.id
268256
subnetwork = google_compute_subnetwork.default.id
@@ -278,7 +266,6 @@ resource "google_workstations_workstation_cluster" "default" {
278266
}
279267
280268
resource "google_workstations_workstation_config" "default" {
281-
provider = google-beta
282269
workstation_config_id = "tf-test-workstation-config%{random_suffix}"
283270
workstation_cluster_id = google_workstations_workstation_cluster.default.workstation_cluster_id
284271
location = "us-central1"
@@ -311,15 +298,13 @@ resource "google_workstations_workstation_config" "default" {
311298
}
312299
313300
data "google_iam_policy" "foo" {
314-
provider = google-beta
315301
binding {
316302
role = "%{role}"
317303
members = ["user:[email protected]"]
318304
}
319305
}
320306
321307
resource "google_workstations_workstation_config_iam_policy" "foo" {
322-
provider = google-beta
323308
project = google_workstations_workstation_config.default.project
324309
location = google_workstations_workstation_config.default.location
325310
workstation_cluster_id = google_workstations_workstation_config.default.workstation_cluster_id
@@ -328,7 +313,6 @@ resource "google_workstations_workstation_config_iam_policy" "foo" {
328313
}
329314
330315
data "google_workstations_workstation_config_iam_policy" "foo" {
331-
provider = google-beta
332316
project = google_workstations_workstation_config.default.project
333317
location = google_workstations_workstation_config.default.location
334318
workstation_cluster_id = google_workstations_workstation_config.default.workstation_cluster_id
@@ -343,33 +327,28 @@ data "google_workstations_workstation_config_iam_policy" "foo" {
343327
func testAccWorkstationsWorkstationConfigIamPolicy_emptyBinding(context map[string]interface{}) string {
344328
return acctest.Nprintf(`
345329
resource "google_tags_tag_key" "tag_key1" {
346-
provider = google-beta
347330
parent = "organizations/%{org_id}"
348331
short_name = "%{key_short_name}"
349332
}
350333
351334
resource "google_tags_tag_value" "tag_value1" {
352-
provider = google-beta
353335
parent = google_tags_tag_key.tag_key1.id
354336
short_name = "%{value_short_name}"
355337
}
356338
357339
resource "google_compute_network" "default" {
358-
provider = google-beta
359340
name = "tf-test-workstation-cluster%{random_suffix}"
360341
auto_create_subnetworks = false
361342
}
362343
363344
resource "google_compute_subnetwork" "default" {
364-
provider = google-beta
365345
name = "tf-test-workstation-cluster%{random_suffix}"
366346
ip_cidr_range = "10.0.0.0/24"
367347
region = "us-central1"
368348
network = google_compute_network.default.name
369349
}
370350
371351
resource "google_workstations_workstation_cluster" "default" {
372-
provider = google-beta
373352
workstation_cluster_id = "tf-test-workstation-cluster%{random_suffix}"
374353
network = google_compute_network.default.id
375354
subnetwork = google_compute_subnetwork.default.id
@@ -385,7 +364,6 @@ resource "google_workstations_workstation_cluster" "default" {
385364
}
386365
387366
resource "google_workstations_workstation_config" "default" {
388-
provider = google-beta
389367
workstation_config_id = "tf-test-workstation-config%{random_suffix}"
390368
workstation_cluster_id = google_workstations_workstation_cluster.default.workstation_cluster_id
391369
location = "us-central1"
@@ -418,11 +396,9 @@ resource "google_workstations_workstation_config" "default" {
418396
}
419397
420398
data "google_iam_policy" "foo" {
421-
provider = google-beta
422399
}
423400
424401
resource "google_workstations_workstation_config_iam_policy" "foo" {
425-
provider = google-beta
426402
project = google_workstations_workstation_config.default.project
427403
location = google_workstations_workstation_config.default.location
428404
workstation_cluster_id = google_workstations_workstation_config.default.workstation_cluster_id
@@ -435,33 +411,28 @@ resource "google_workstations_workstation_config_iam_policy" "foo" {
435411
func testAccWorkstationsWorkstationConfigIamBinding_basicGenerated(context map[string]interface{}) string {
436412
return acctest.Nprintf(`
437413
resource "google_tags_tag_key" "tag_key1" {
438-
provider = google-beta
439414
parent = "organizations/%{org_id}"
440415
short_name = "%{key_short_name}"
441416
}
442417
443418
resource "google_tags_tag_value" "tag_value1" {
444-
provider = google-beta
445419
parent = google_tags_tag_key.tag_key1.id
446420
short_name = "%{value_short_name}"
447421
}
448422
449423
resource "google_compute_network" "default" {
450-
provider = google-beta
451424
name = "tf-test-workstation-cluster%{random_suffix}"
452425
auto_create_subnetworks = false
453426
}
454427
455428
resource "google_compute_subnetwork" "default" {
456-
provider = google-beta
457429
name = "tf-test-workstation-cluster%{random_suffix}"
458430
ip_cidr_range = "10.0.0.0/24"
459431
region = "us-central1"
460432
network = google_compute_network.default.name
461433
}
462434
463435
resource "google_workstations_workstation_cluster" "default" {
464-
provider = google-beta
465436
workstation_cluster_id = "tf-test-workstation-cluster%{random_suffix}"
466437
network = google_compute_network.default.id
467438
subnetwork = google_compute_subnetwork.default.id
@@ -477,7 +448,6 @@ resource "google_workstations_workstation_cluster" "default" {
477448
}
478449
479450
resource "google_workstations_workstation_config" "default" {
480-
provider = google-beta
481451
workstation_config_id = "tf-test-workstation-config%{random_suffix}"
482452
workstation_cluster_id = google_workstations_workstation_cluster.default.workstation_cluster_id
483453
location = "us-central1"
@@ -510,7 +480,6 @@ resource "google_workstations_workstation_config" "default" {
510480
}
511481
512482
resource "google_workstations_workstation_config_iam_binding" "foo" {
513-
provider = google-beta
514483
project = google_workstations_workstation_config.default.project
515484
location = google_workstations_workstation_config.default.location
516485
workstation_cluster_id = google_workstations_workstation_config.default.workstation_cluster_id
@@ -524,33 +493,28 @@ resource "google_workstations_workstation_config_iam_binding" "foo" {
524493
func testAccWorkstationsWorkstationConfigIamBinding_updateGenerated(context map[string]interface{}) string {
525494
return acctest.Nprintf(`
526495
resource "google_tags_tag_key" "tag_key1" {
527-
provider = google-beta
528496
parent = "organizations/%{org_id}"
529497
short_name = "%{key_short_name}"
530498
}
531499
532500
resource "google_tags_tag_value" "tag_value1" {
533-
provider = google-beta
534501
parent = google_tags_tag_key.tag_key1.id
535502
short_name = "%{value_short_name}"
536503
}
537504
538505
resource "google_compute_network" "default" {
539-
provider = google-beta
540506
name = "tf-test-workstation-cluster%{random_suffix}"
541507
auto_create_subnetworks = false
542508
}
543509
544510
resource "google_compute_subnetwork" "default" {
545-
provider = google-beta
546511
name = "tf-test-workstation-cluster%{random_suffix}"
547512
ip_cidr_range = "10.0.0.0/24"
548513
region = "us-central1"
549514
network = google_compute_network.default.name
550515
}
551516
552517
resource "google_workstations_workstation_cluster" "default" {
553-
provider = google-beta
554518
workstation_cluster_id = "tf-test-workstation-cluster%{random_suffix}"
555519
network = google_compute_network.default.id
556520
subnetwork = google_compute_subnetwork.default.id
@@ -566,7 +530,6 @@ resource "google_workstations_workstation_cluster" "default" {
566530
}
567531
568532
resource "google_workstations_workstation_config" "default" {
569-
provider = google-beta
570533
workstation_config_id = "tf-test-workstation-config%{random_suffix}"
571534
workstation_cluster_id = google_workstations_workstation_cluster.default.workstation_cluster_id
572535
location = "us-central1"
@@ -599,7 +562,6 @@ resource "google_workstations_workstation_config" "default" {
599562
}
600563
601564
resource "google_workstations_workstation_config_iam_binding" "foo" {
602-
provider = google-beta
603565
project = google_workstations_workstation_config.default.project
604566
location = google_workstations_workstation_config.default.location
605567
workstation_cluster_id = google_workstations_workstation_config.default.workstation_cluster_id

0 commit comments

Comments
 (0)