Skip to content

Fix workload identity pool ID validation to strip the literal .svc.id.goog suffix #18470

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

Open
nikolauspschuetz wants to merge 2 commits into
base: main
Choose a base branch
from
+3 −3
Open

Fix workload identity pool ID validation to strip the literal .svc.id.goog suffix #18470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba781d7
Add failing tests for workload identity pool ID suffix handling
nikolauspschuetz Jul 30, 2026
0fb0bd9
Use TrimSuffix to strip the workload identity pool ID suffix
nikolauspschuetz Jul 30, 2026
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
4 changes: 1 addition & 3 deletions mmv1/templates/terraform/constants/iam_workload_identity_pool.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,7 @@ func ValidateWorkloadIdentityPoolId(v interface{}, k string) (ws []string, error
"%q (%q) can not start with \"gcp-\"", k, value))
}

if strings.HasSuffix(value, defaultWorkloadIdentityPoolIdSuffix) {
value = strings.TrimRight(value, defaultWorkloadIdentityPoolIdSuffix)
}
value = strings.TrimSuffix(value, defaultWorkloadIdentityPoolIdSuffix)

if !regexp.MustCompile(workloadIdentityPoolIdRegexp).MatchString(value) {
errors = append(errors, fmt.Errorf(
Expand Down
2 changes: 2 additions & 0 deletions mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_id_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ func TestValidateIAMBetaWorkloadIdentityPoolId(t *testing.T) {
{TestName: "long", Value: "12345678901234567890123456789012"},
{TestName: "has a hyphen", Value: "foo-bar"},
{TestName: "default pool format", Value: "foo-bar.svc.id.goog"},
{TestName: "default pool format with base name ending in a suffix character", Value: "goods.svc.id.goog"},

// With errors
{TestName: "empty", Value: "", ExpectError: true},
Expand All @@ -26,6 +27,7 @@ func TestValidateIAMBetaWorkloadIdentityPoolId(t *testing.T) {
{TestName: "has an backslash", Value: "foo\bar", ExpectError: true},
{TestName: "too short", Value: "foo", ExpectError: true},
{TestName: "too long", Value: strings.Repeat("f", 33), ExpectError: true},
{TestName: "too long with suffix", Value: strings.Repeat("a", 32) + "g.svc.id.goog", ExpectError: true},
}

es := verify.TestStringValidationCases(x, iambeta.ValidateWorkloadIdentityPoolId)
Expand Down
Loading