diff --git a/.changelog/6309.txt b/.changelog/6309.txt new file mode 100644 index 00000000000..3d5369e8417 --- /dev/null +++ b/.changelog/6309.txt @@ -0,0 +1,3 @@ +```release-note:bug +Cloud IAM: fixed incorrect basePath for `IAMBetaBasePathKey` on `google_iam_workload_identity_pool` (ga) +``` diff --git a/google/config.go b/google/config.go index 06214709b0b..bb46c3f1b7f 100644 --- a/google/config.go +++ b/google/config.go @@ -382,7 +382,7 @@ var DefaultBasePaths = map[string]string{ GameServicesBasePathKey: "https://gameservices.googleapis.com/v1/", GKEHubBasePathKey: "https://gkehub.googleapis.com/v1/", HealthcareBasePathKey: "https://healthcare.googleapis.com/v1/", - IAMBetaBasePathKey: "https://iam.googleapis.com/v/", + IAMBetaBasePathKey: "https://iam.googleapis.com/v1/", IapBasePathKey: "https://iap.googleapis.com/v1/", IdentityPlatformBasePathKey: "https://identitytoolkit.googleapis.com/v2/", KMSBasePathKey: "https://cloudkms.googleapis.com/v1/", diff --git a/google/resource_iam_workload_identity_pool_provider_sweeper_test.go b/google/resource_iam_workload_identity_pool_provider_sweeper_test.go index 62b8d2cfe84..7df0ab08fd4 100644 --- a/google/resource_iam_workload_identity_pool_provider_sweeper_test.go +++ b/google/resource_iam_workload_identity_pool_provider_sweeper_test.go @@ -61,7 +61,7 @@ func testSweepIAMBetaWorkloadIdentityPoolProvider(region string) error { }, } - listTemplate := strings.Split("https://iam.googleapis.com/v/projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}/providers", "?")[0] + listTemplate := strings.Split("https://iam.googleapis.com/v1/projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}/providers", "?")[0] listUrl, err := replaceVars(d, config, listTemplate) if err != nil { log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err) @@ -103,7 +103,7 @@ func testSweepIAMBetaWorkloadIdentityPoolProvider(region string) error { continue } - deleteTemplate := "https://iam.googleapis.com/v/projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}/providers/{{workload_identity_pool_provider_id}}" + deleteTemplate := "https://iam.googleapis.com/v1/projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}/providers/{{workload_identity_pool_provider_id}}" deleteUrl, err := replaceVars(d, config, deleteTemplate) if err != nil { log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err) diff --git a/google/resource_iam_workload_identity_pool_sweeper_test.go b/google/resource_iam_workload_identity_pool_sweeper_test.go index 25f2c195f28..c6098cd7f3e 100644 --- a/google/resource_iam_workload_identity_pool_sweeper_test.go +++ b/google/resource_iam_workload_identity_pool_sweeper_test.go @@ -61,7 +61,7 @@ func testSweepIAMBetaWorkloadIdentityPool(region string) error { }, } - listTemplate := strings.Split("https://iam.googleapis.com/v/projects/{{project}}/locations/global/workloadIdentityPools", "?")[0] + listTemplate := strings.Split("https://iam.googleapis.com/v1/projects/{{project}}/locations/global/workloadIdentityPools", "?")[0] listUrl, err := replaceVars(d, config, listTemplate) if err != nil { log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err) @@ -103,7 +103,7 @@ func testSweepIAMBetaWorkloadIdentityPool(region string) error { continue } - deleteTemplate := "https://iam.googleapis.com/v/projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}" + deleteTemplate := "https://iam.googleapis.com/v1/projects/{{project}}/locations/global/workloadIdentityPools/{{workload_identity_pool_id}}" deleteUrl, err := replaceVars(d, config, deleteTemplate) if err != nil { log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)