Skip to content

fix(github): use API-resolved org login for OIDC subject claims #135

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
DanielBoring wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

fix(github): use API-resolved org login for OIDC subject claims #135

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
4 changes: 2 additions & 2 deletions modules/github/locals.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ locals {

locals {
repository_name_templates = var.use_template_repository ? var.repository_name_templates : var.repository_name
template_claim_structure = "${var.organization_name}/${local.repository_name_templates}/%s@refs/heads/main"
template_claim_structure = "${lower(data.github_organization.alz.login)}/${local.repository_name_templates}/%s@refs/heads/main"

oidc_subjects_flattened = flatten([for key, value in var.workflows : [
for environment_user_assigned_managed_identity_mapping in value.environment_user_assigned_managed_identity_mappings :
{
subject_key = "${key}-${environment_user_assigned_managed_identity_mapping.user_assigned_managed_identity_key}"
user_assigned_managed_identity_key = environment_user_assigned_managed_identity_mapping.user_assigned_managed_identity_key
subject = "repo:${var.organization_name}/${var.repository_name}:environment:${var.environments[environment_user_assigned_managed_identity_mapping.environment_key]}:job_workflow_ref:${format(local.template_claim_structure, value.workflow_file_name)}"
subject = "repo:${data.github_organization.alz.login}/${var.repository_name}:environment:${var.environments[environment_user_assigned_managed_identity_mapping.environment_key]}:job_workflow_ref:${format(local.template_claim_structure, value.workflow_file_name)}"
}
]
])
Expand Down
Loading