diff --git a/.changelog/7001.txt b/.changelog/7001.txt new file mode 100644 index 0000000000..ff185f1ef7 --- /dev/null +++ b/.changelog/7001.txt @@ -0,0 +1,6 @@ +```release-note:new-resource +`google_iam_workforce_pool` (ga only) +``` +```release-note:new-resource +`google_iam_workforce_pool_provider` (ga only) +``` diff --git a/google-beta/resource_iam_workforce_pool_generated_test.go b/google-beta/resource_iam_workforce_pool_generated_test.go index 7810276693..dfcaaad47c 100644 --- a/google-beta/resource_iam_workforce_pool_generated_test.go +++ b/google-beta/resource_iam_workforce_pool_generated_test.go @@ -33,7 +33,7 @@ func TestAccIAMWorkforcePoolWorkforcePool_iamWorkforcePoolBasicExample(t *testin vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckIAMWorkforcePoolWorkforcePoolDestroyProducer(t), Steps: []resource.TestStep{ { @@ -52,8 +52,6 @@ func TestAccIAMWorkforcePoolWorkforcePool_iamWorkforcePoolBasicExample(t *testin func testAccIAMWorkforcePoolWorkforcePool_iamWorkforcePoolBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_iam_workforce_pool" "example" { - provider = google-beta - workforce_pool_id = "tf-test-example-pool%{random_suffix}" parent = "organizations/%{org_id}" location = "global" @@ -71,7 +69,7 @@ func TestAccIAMWorkforcePoolWorkforcePool_iamWorkforcePoolFullExample(t *testing vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckIAMWorkforcePoolWorkforcePoolDestroyProducer(t), Steps: []resource.TestStep{ { @@ -90,8 +88,6 @@ func TestAccIAMWorkforcePoolWorkforcePool_iamWorkforcePoolFullExample(t *testing func testAccIAMWorkforcePoolWorkforcePool_iamWorkforcePoolFullExample(context map[string]interface{}) string { return Nprintf(` resource "google_iam_workforce_pool" "example" { - provider = google-beta - workforce_pool_id = "tf-test-example-pool%{random_suffix}" parent = "organizations/%{org_id}" location = "global" diff --git a/google-beta/resource_iam_workforce_pool_provider_generated_test.go b/google-beta/resource_iam_workforce_pool_provider_generated_test.go index 982e8c349d..44526fad52 100644 --- a/google-beta/resource_iam_workforce_pool_provider_generated_test.go +++ b/google-beta/resource_iam_workforce_pool_provider_generated_test.go @@ -33,7 +33,7 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderSamlBa vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckIAMWorkforcePoolWorkforcePoolProviderDestroyProducer(t), Steps: []resource.TestStep{ { @@ -52,16 +52,12 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderSamlBa func testAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderSamlBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "tf-test-example-pool%{random_suffix}" parent = "organizations/%{org_id}" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "tf-test-example-prvdr%{random_suffix}" @@ -85,7 +81,7 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderSamlFu vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckIAMWorkforcePoolWorkforcePoolProviderDestroyProducer(t), Steps: []resource.TestStep{ { @@ -104,16 +100,12 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderSamlFu func testAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderSamlFullExample(context map[string]interface{}) string { return Nprintf(` resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "tf-test-example-pool%{random_suffix}" parent = "organizations/%{org_id}" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "tf-test-example-prvdr%{random_suffix}" @@ -141,7 +133,7 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderOidcBa vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckIAMWorkforcePoolWorkforcePoolProviderDestroyProducer(t), Steps: []resource.TestStep{ { @@ -160,16 +152,12 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderOidcBa func testAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderOidcBasicExample(context map[string]interface{}) string { return Nprintf(` resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "tf-test-example-pool%{random_suffix}" parent = "organizations/%{org_id}" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "tf-test-example-prvdr%{random_suffix}" @@ -194,7 +182,7 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderOidcFu vcrTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProvidersOiCS, + Providers: testAccProviders, CheckDestroy: testAccCheckIAMWorkforcePoolWorkforcePoolProviderDestroyProducer(t), Steps: []resource.TestStep{ { @@ -213,16 +201,12 @@ func TestAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderOidcFu func testAccIAMWorkforcePoolWorkforcePoolProvider_iamWorkforcePoolProviderOidcFullExample(context map[string]interface{}) string { return Nprintf(` resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "tf-test-example-pool%{random_suffix}" parent = "organizations/%{org_id}" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "tf-test-example-prvdr%{random_suffix}" diff --git a/website/docs/r/iam_workforce_pool.html.markdown b/website/docs/r/iam_workforce_pool.html.markdown index 40dbbc27a8..bbb2b6e170 100644 --- a/website/docs/r/iam_workforce_pool.html.markdown +++ b/website/docs/r/iam_workforce_pool.html.markdown @@ -26,8 +26,6 @@ Note: Ask your Google Cloud account team to request access to workforce identity federation for your billing/quota project. The account team notifies you when the project is granted access. -~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources. To get more information about WorkforcePool, see: @@ -40,8 +38,6 @@ To get more information about WorkforcePool, see: ```hcl resource "google_iam_workforce_pool" "example" { - provider = google-beta - workforce_pool_id = "example-pool" parent = "organizations/123456789" location = "global" @@ -52,8 +48,6 @@ resource "google_iam_workforce_pool" "example" { ```hcl resource "google_iam_workforce_pool" "example" { - provider = google-beta - workforce_pool_id = "example-pool" parent = "organizations/123456789" location = "global" diff --git a/website/docs/r/iam_workforce_pool_provider.html.markdown b/website/docs/r/iam_workforce_pool_provider.html.markdown index 0d0a8cc60e..63e1286364 100644 --- a/website/docs/r/iam_workforce_pool_provider.html.markdown +++ b/website/docs/r/iam_workforce_pool_provider.html.markdown @@ -25,8 +25,6 @@ A configuration for an external identity provider. federation for your billing/quota project. The account team notifies you when the project is granted access. -~> **Warning:** This resource is in beta, and should be used with the terraform-provider-google-beta provider. -See [Provider Versions](https://terraform.io/docs/providers/google/guides/provider_versions.html) for more details on beta resources. To get more information about WorkforcePoolProvider, see: @@ -39,16 +37,12 @@ To get more information about WorkforcePoolProvider, see: ```hcl resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "example-pool" parent = "organizations/123456789" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "example-prvdr" @@ -65,16 +59,12 @@ resource "google_iam_workforce_pool_provider" "example" { ```hcl resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "example-pool" parent = "organizations/123456789" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "example-prvdr" @@ -95,16 +85,12 @@ resource "google_iam_workforce_pool_provider" "example" { ```hcl resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "example-pool" parent = "organizations/123456789" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "example-prvdr" @@ -122,16 +108,12 @@ resource "google_iam_workforce_pool_provider" "example" { ```hcl resource "google_iam_workforce_pool" "pool" { - provider = google-beta - workforce_pool_id = "example-pool" parent = "organizations/123456789" location = "global" } resource "google_iam_workforce_pool_provider" "example" { - provider = google-beta - workforce_pool_id = google_iam_workforce_pool.pool.workforce_pool_id location = google_iam_workforce_pool.pool.location provider_id = "example-prvdr"