Skip to content

feat(google_deployment_accounts): add gha_branch_assertions#480

Open
whd wants to merge 3 commits into
mainfrom
MZCLD-924
Open

feat(google_deployment_accounts): add gha_branch_assertions#480
whd wants to merge 3 commits into
mainfrom
MZCLD-924

Conversation

@whd

@whd whd commented Jun 9, 2026

Copy link
Copy Markdown
Member

Description

This is a no-op against existing configuration but introduces some new GHA options for branch-based OIDC configuration. See the Jira ticket for details.

Most of this is copypasta from the similar CircleCI config. There's a slight difference in precedence for GHA since there's no CircleCI context to consider but I expect only a couple people to ever need to do any advanced configuration.

I reordered the examples to make it clearer that GHA is the preferred CI system.

I've also updated CODEOWNERS to remove the individual members of gcp-wg since they already get reviews on all the things, and in the spirit of https://mozilla-hub.atlassian.net/browse/MZCLD-3214 removed Sven's old CODEOWNER access.

https://github.com/mozilla/global-platform-admin/pull/6590 was required to add the new repository_ref attribute upon which this is based.

Related Tickets & Documents

@whd whd added the minor This PR will increment a minor version label Jun 9, 2026
@github-actions

github-actions Bot commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

Release plan

Directory Previous version New version
google_deployment_accounts 0.3.0 0.4.0

default = []
validation {
condition = alltrue(
[for attribute_specifier in var.gha_attribute_specifiers :

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This set of attributes is statically encoded for additional safety but it does introduce an extra manual step if we add and rely on new attributes. I believe the additional plan-time safety is warranted especially since attribute updates are uncommon.

circleci = var.wip_name == "circleci"
# explicit attributes replace all other kinds of assertions
# explicit attributes replace all other kinds of assertions. A subject
# specifier maps to a single identity (principal://); all other attributes

@whd whd Jun 9, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The 🤖 caught this edge case that wasn't accounted for before. It doesn't affect any existing config and isn't likely to affect any config in the future, but it is technically correct to make this change so I'm fixing it for CircleCI and the new GHA logic has the same logic.

@whd whd marked this pull request as ready for review June 9, 2026 23:10
@whd whd requested review from a team, bkochendorfer, jasonthomas, jbuck and smarnach as code owners June 9, 2026 23:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

minor This PR will increment a minor version

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants