Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Promote Workforce Pool resources to GA from beta #5003

Merged
merged 1 commit into from
Dec 20, 2022
Merged

Promote Workforce Pool resources to GA from beta #5003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changelog/7001.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
```
8 changes: 2 additions & 6 deletions google-beta/resource_iam_workforce_pool_generated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
{
Expand All @@ -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"
Expand All @@ -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{
{
Expand All @@ -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"
Expand Down
24 changes: 4 additions & 20 deletions google-beta/resource_iam_workforce_pool_provider_generated_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
{
Expand All @@ -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}"
Expand All @@ -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{
{
Expand All @@ -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}"
Expand Down Expand Up @@ -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{
{
Expand All @@ -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}"
Expand All @@ -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{
{
Expand All @@ -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}"
Expand Down
6 changes: 0 additions & 6 deletions website/docs/r/iam_workforce_pool.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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"
Expand All @@ -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"
Expand Down
18 changes: 0 additions & 18 deletions website/docs/r/iam_workforce_pool_provider.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand All @@ -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"
Expand Down