Skip to content

Commit bebe165

Browse files
stevenyang72stevenyang72
authored
Promote google_iam_workload_identity_pool_managed_identity to GA (GoogleCloudPlatform#16808)
1 parent d8774aa commit bebe165

4 files changed

Lines changed: 3 additions & 36 deletions

File tree

‎mmv1/products/iambeta/WorkloadIdentityPoolManagedIdentity.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ references:
2020
'Configure managed workload identity authentication for Compute Engine': 'https://cloud.google.com/iam/docs/create-managed-workload-identities'
2121
'Configure managed workload identity authentication for GKE': 'https://cloud.google.com/iam/docs/create-managed-workload-identities-gke'
2222
api: 'https://cloud.google.com/iam/docs/reference/rest/v1/projects.locations.workloadIdentityPools.namespaces.managedIdentities'
23-
min_version: beta
2423
base_url: 'projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}/namespaces/{{workload_identity_pool_namespace_id}}/managedIdentities'
2524
self_link: 'projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}/namespaces/{{workload_identity_pool_namespace_id}}/managedIdentities/{{workload_identity_pool_managed_identity_id}}'
2625
create_url: 'projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}/namespaces/{{workload_identity_pool_namespace_id}}/managedIdentities?workloadIdentityPoolManagedIdentityId={{workload_identity_pool_managed_identity_id}}'

‎mmv1/templates/terraform/examples/iam_workload_identity_pool_managed_identity_basic.tf.tmpl‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
resource "google_iam_workload_identity_pool" "pool" {
2-
provider = google-beta
3-
42
workload_identity_pool_id = "{{index $.Vars "workload_identity_pool_id"}}"
53
mode = "TRUST_DOMAIN"
64
}
75

86
resource "google_iam_workload_identity_pool_namespace" "ns" {
9-
provider = google-beta
10-
117
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
128
workload_identity_pool_namespace_id = "{{index $.Vars "workload_identity_pool_namespace_id"}}"
139
}
1410

1511
resource "google_iam_workload_identity_pool_managed_identity" "{{$.PrimaryResourceId}}" {
16-
provider = google-beta
17-
1812
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
1913
workload_identity_pool_namespace_id = google_iam_workload_identity_pool_namespace.ns.workload_identity_pool_namespace_id
2014
workload_identity_pool_managed_identity_id = "{{index $.Vars "workload_identity_pool_managed_identity_id"}}"

‎mmv1/templates/terraform/examples/iam_workload_identity_pool_managed_identity_full.tf.tmpl‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,14 @@
11
resource "google_iam_workload_identity_pool" "pool" {
2-
provider = google-beta
3-
42
workload_identity_pool_id = "{{index $.Vars "workload_identity_pool_id"}}"
53
mode = "TRUST_DOMAIN"
64
}
75

86
resource "google_iam_workload_identity_pool_namespace" "ns" {
9-
provider = google-beta
10-
117
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
128
workload_identity_pool_namespace_id = "{{index $.Vars "workload_identity_pool_namespace_id"}}"
139
}
1410

1511
resource "google_iam_workload_identity_pool_managed_identity" "{{$.PrimaryResourceId}}" {
16-
provider = google-beta
17-
1812
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
1913
workload_identity_pool_namespace_id = google_iam_workload_identity_pool_namespace.ns.workload_identity_pool_namespace_id
2014
workload_identity_pool_managed_identity_id = "{{index $.Vars "workload_identity_pool_managed_identity_id"}}"

mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_managed_identity_test.go.tmpl renamed to mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_managed_identity_test.go

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{{- if ne $.TargetVersionName "ga" -}}
21
package iambeta_test
32

43
import (
@@ -20,7 +19,7 @@ func TestAccIAMBetaWorkloadIdentityPoolManagedIdentity_minimal(t *testing.T) {
2019

2120
acctest.VcrTest(t, resource.TestCase{
2221
PreCheck: func() { acctest.AccTestPreCheck(t) },
23-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
22+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
2423
CheckDestroy: testAccCheckIAMBetaWorkloadIdentityPoolManagedIdentityDestroyProducer(t),
2524
Steps: []resource.TestStep{
2625
{
@@ -60,7 +59,7 @@ func TestAccIAMBetaWorkloadIdentityPoolManagedIdentity_full(t *testing.T) {
6059

6160
acctest.VcrTest(t, resource.TestCase{
6261
PreCheck: func() { acctest.AccTestPreCheck(t) },
63-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
62+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
6463
CheckDestroy: testAccCheckIAMBetaWorkloadIdentityPoolManagedIdentityDestroyProducer(t),
6564
Steps: []resource.TestStep{
6665
{
@@ -75,7 +74,7 @@ func TestAccIAMBetaWorkloadIdentityPoolManagedIdentity_full(t *testing.T) {
7574
{
7675
Config: testAccIAMBetaWorkloadIdentityPoolManagedIdentity_updated(context),
7776
ConfigPlanChecks: resource.ConfigPlanChecks{
78-
PreApply: []plancheck.PlanCheck{
77+
PreApply: []plancheck.PlanCheck{
7978
plancheck.ExpectResourceAction("google_iam_workload_identity_pool_managed_identity.example", plancheck.ResourceActionUpdate),
8079
},
8180
},
@@ -93,22 +92,16 @@ func TestAccIAMBetaWorkloadIdentityPoolManagedIdentity_full(t *testing.T) {
9392
func testAccIAMBetaWorkloadIdentityPoolManagedIdentity_minimal(context map[string]interface{}) string {
9493
return acctest.Nprintf(`
9594
resource "google_iam_workload_identity_pool" "pool" {
96-
provider = google-beta
97-
9895
workload_identity_pool_id = "tf-test-example-pool%{random_suffix}"
9996
mode = "TRUST_DOMAIN"
10097
}
10198
10299
resource "google_iam_workload_identity_pool_namespace" "ns" {
103-
provider = google-beta
104-
105100
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
106101
workload_identity_pool_namespace_id = "tf-test-example-namespace%{random_suffix}"
107102
}
108103
109104
resource "google_iam_workload_identity_pool_managed_identity" "example" {
110-
provider = google-beta
111-
112105
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
113106
workload_identity_pool_namespace_id = google_iam_workload_identity_pool_namespace.ns.workload_identity_pool_namespace_id
114107
workload_identity_pool_managed_identity_id = "tf-test-example-managed-identity%{random_suffix}"
@@ -119,22 +112,16 @@ resource "google_iam_workload_identity_pool_managed_identity" "example" {
119112
func testAccIAMBetaWorkloadIdentityPoolManagedIdentity_full(context map[string]interface{}) string {
120113
return acctest.Nprintf(`
121114
resource "google_iam_workload_identity_pool" "pool" {
122-
provider = google-beta
123-
124115
workload_identity_pool_id = "tf-test-example-pool%{random_suffix}"
125116
mode = "TRUST_DOMAIN"
126117
}
127118
128119
resource "google_iam_workload_identity_pool_namespace" "ns" {
129-
provider = google-beta
130-
131120
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
132121
workload_identity_pool_namespace_id = "tf-test-example-namespace%{random_suffix}"
133122
}
134123
135124
resource "google_iam_workload_identity_pool_managed_identity" "example" {
136-
provider = google-beta
137-
138125
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
139126
workload_identity_pool_namespace_id = google_iam_workload_identity_pool_namespace.ns.workload_identity_pool_namespace_id
140127
workload_identity_pool_managed_identity_id = "tf-test-example-managed-identity%{random_suffix}"
@@ -153,22 +140,16 @@ resource "google_iam_workload_identity_pool_managed_identity" "example" {
153140
func testAccIAMBetaWorkloadIdentityPoolManagedIdentity_updated(context map[string]interface{}) string {
154141
return acctest.Nprintf(`
155142
resource "google_iam_workload_identity_pool" "pool" {
156-
provider = google-beta
157-
158143
workload_identity_pool_id = "tf-test-example-pool%{random_suffix}"
159144
mode = "TRUST_DOMAIN"
160145
}
161146
162147
resource "google_iam_workload_identity_pool_namespace" "ns" {
163-
provider = google-beta
164-
165148
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
166149
workload_identity_pool_namespace_id = "tf-test-example-namespace%{random_suffix}"
167150
}
168151
169152
resource "google_iam_workload_identity_pool_managed_identity" "example" {
170-
provider = google-beta
171-
172153
workload_identity_pool_id = google_iam_workload_identity_pool.pool.workload_identity_pool_id
173154
workload_identity_pool_namespace_id = google_iam_workload_identity_pool_namespace.ns.workload_identity_pool_namespace_id
174155
workload_identity_pool_managed_identity_id = "tf-test-example-managed-identity%{random_suffix}"
@@ -177,4 +158,3 @@ resource "google_iam_workload_identity_pool_managed_identity" "example" {
177158
}
178159
`, context)
179160
}
180-
{{- end -}}

0 commit comments

Comments
 (0)