Skip to content

fix: Correct repository_name_templates when using single repo #103

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

Merged
jaredfholgate merged 2 commits into from
Jul 11, 2025
Merged

fix: Correct repository_name_templates when using single repo #103

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
b2c76d7
Correct repository_name_templates when using single repo
Jul 9, 2025
7707e8e
terraform fmt -recursive
Jul 11, 2025
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 alz/github/actions/terraform/templates/workflows/cd-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
uses: hashicorp/setup-terraform@v3
with:
terraform_wrapper: false
terraform_version: $${{ inputs.terraform_cli_versions }}
terraform_version: $${{ inputs.terraform_cli_version }}

- name: Terraform Init
run: |
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
uses: hashicorp/setup-terraform@v3
with:
terraform_wrapper: false
terraform_version: $${{ inputs.terraform_cli_versions }}
terraform_version: $${{ inputs.terraform_cli_version }}

- name: Terraform Init
run: |
Expand Down
4 changes: 2 additions & 2 deletions alz/github/actions/terraform/templates/workflows/ci-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
uses: hashicorp/setup-terraform@v3
with:
terraform_wrapper: false
terraform_version: $${{ inputs.terraform_cli_versions }}
terraform_version: $${{ inputs.terraform_cli_version }}

- name: Terraform Format Check
run: |
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
uses: hashicorp/setup-terraform@v3
with:
terraform_wrapper: false
terraform_version: $${{ inputs.terraform_cli_versions }}
terraform_version: $${{ inputs.terraform_cli_version }}

- name: Terraform Init
run: |
Expand Down
9 changes: 5 additions & 4 deletions alz/github/locals.files.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
locals {
self_hosted_runner_name = local.use_runner_group ? "group: ${local.resource_names.version_control_system_runner_group}" : "self-hosted"
runner_name = var.use_self_hosted_runners ? local.self_hosted_runner_name : "ubuntu-latest"
self_hosted_runner_name = local.use_runner_group ? "group: ${local.resource_names.version_control_system_runner_group}" : "self-hosted"
runner_name = var.use_self_hosted_runners ? local.self_hosted_runner_name : "ubuntu-latest"
repository_name_templates = var.use_separate_repository_for_templates ? local.resource_names.version_control_system_repository_templates : local.resource_names.version_control_system_repository
}

locals {
Expand Down Expand Up @@ -47,7 +48,7 @@ locals {
{
content = templatefile("${local.pipeline_files_directory_path}/${pipeline_file}", {
organization_name = var.github_organization_name
repository_name_templates = local.resource_names.version_control_system_repository_templates
repository_name_templates = local.repository_name_templates
ci_template_path = "${local.target_folder_name}/${local.ci_template_file_name}"
cd_template_path = "${local.target_folder_name}/${local.cd_template_file_name}"
script_files = local.script_files
Expand All @@ -62,7 +63,7 @@ locals {
{
content = templatefile("${local.pipeline_template_files_directory_path}/${pipeline_template_file}", {
organization_name = var.github_organization_name
repository_name_templates = local.resource_names.version_control_system_repository_templates
repository_name_templates = local.repository_name_templates
runner_name = local.runner_name
environment_name_plan = local.resource_names.version_control_system_environment_plan
environment_name_apply = local.resource_names.version_control_system_environment_apply
Expand Down
Loading