From 1c1ed2df57cd8295665ed1a6ea31e8b9d6fdbf01 Mon Sep 17 00:00:00 2001 From: "V. Alex Brennen" Date: Thu, 5 Feb 2026 14:44:10 -0500 Subject: [PATCH] dsc makefile output updates for arm64 support Why these changes are being introduced: This commit updates the TFC Makefile outputs for the DSC app to support the ARM64 architecture. Terraform was also updated to the most recent version and the pre-commit pipeline apps were updated to the latest version. How this addresses that need: * Update the TfCloud outputs for the dsc Makefile and caller workflows * Upgrade Terraform to v1.14 * Upgrade pre-commit pipeline apps Side effects of this change: None. Relevant ticket(s): https://mitlibraries.atlassian.net/browse/IN-1631 Changes to be committed: modified: .pre-commit-config.yaml modified: .terraform.lock.hcl modified: README.md modified: dsc_ecr.tf modified: versions.tf --- .pre-commit-config.yaml | 6 +++--- .terraform.lock.hcl | 1 + README.md | 4 ++-- dsc_ecr.tf | 8 ++++---- versions.tf | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 44dcf72..93bdb74 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,18 +1,18 @@ repos: - repo: https://github.com/antonbabenko/pre-commit-terraform - rev: "v1.103.0" + rev: "v1.105.0" hooks: - id: terraform_fmt args: - --args=-recursive - id: terraform_validate - repo: https://github.com/terraform-docs/terraform-docs - rev: "v0.20.0" + rev: "v0.21.0" hooks: - id: terraform-docs-go args: ["markdown", "table", "--config", "./.terraform-docs.yaml", "--recursive", "--output-file", "README.md", "./"] - repo: https://github.com/bridgecrewio/checkov.git - rev: '3.2.490' + rev: '3.2.500' hooks: - id: checkov verbose: false diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl index cdc1668..db1d5f3 100644 --- a/.terraform.lock.hcl +++ b/.terraform.lock.hcl @@ -6,6 +6,7 @@ provider "registry.terraform.io/hashicorp/aws" { constraints = "~> 5.0" hashes = [ "h1:Ijt7pOlB7Tr7maGQIqtsLFbl7pSMIj06TVdkoSBcYOw=", + "h1:edXOJWE4ORX8Fm+dpVpICzMZJat4AX0VRCAy/xkcOc0=", "zh:054b8dd49f0549c9a7cc27d159e45327b7b65cf404da5e5a20da154b90b8a644", "zh:0b97bf8d5e03d15d83cc40b0530a1f84b459354939ba6f135a0086c20ebbe6b2", "zh:1589a2266af699cbd5d80737a0fe02e54ec9cf2ca54e7e00ac51c7359056f274", diff --git a/README.md b/README.md index fcb5fe8..15b3197 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,7 @@ This is a core infrastructure repository that defines infrastructure related to * Owner: See [CODEOWNERS](./.github/CODEOWNERS) * Team: See [CODEOWNERS](./.github/CODEOWNERS) -* Last Maintenance: 2025-11 +* Last Maintenance: 2026-02 ## TF markdown is automatically inserted at the bottom of this file, nothing should be written beyond this point @@ -149,7 +149,7 @@ This is a core infrastructure repository that defines infrastructure related to | Name | Version | |------|---------| -| terraform | ~> 1.13 | +| terraform | ~> 1.14 | | aws | ~> 5.0 | ## Providers diff --git a/dsc_ecr.tf b/dsc_ecr.tf index a194165..025b9b8 100644 --- a/dsc_ecr.tf +++ b/dsc_ecr.tf @@ -21,7 +21,7 @@ module "ecr_dsc" { ## For dsc application repo and ECR repository # Outputs in dev output "dsc_fargate_dev_build_workflow" { - value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build.tpl", { + value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/dev-build-cpu-arch.tpl", { region = var.aws_region role = module.ecr_dsc.gha_role ecr = module.ecr_dsc.repository_name @@ -31,7 +31,7 @@ output "dsc_fargate_dev_build_workflow" { description = "Full contents of the dev-build.yml for the dsc repo" } output "dsc_fargate_makefile" { - value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile.tpl", { + value = var.environment == "prod" || var.environment == "stage" ? null : templatefile("${path.module}/files/makefile-cpu-arch.tpl", { ecr_name = module.ecr_dsc.repository_name ecr_url = module.ecr_dsc.repository_url function = "" @@ -42,7 +42,7 @@ output "dsc_fargate_makefile" { # Outputs in stage output "dsc_fargate_stage_build_workflow" { - value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build.tpl", { + value = var.environment == "prod" || var.environment == "dev" ? null : templatefile("${path.module}/files/stage-build-cpu-arch.tpl", { region = var.aws_region role = module.ecr_dsc.gha_role ecr = module.ecr_dsc.repository_name @@ -54,7 +54,7 @@ output "dsc_fargate_stage_build_workflow" { # Outputs after promotion to prod output "dsc_fargate_prod_promote_workflow" { - value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote.tpl", { + value = var.environment == "stage" || var.environment == "dev" ? null : templatefile("${path.module}/files/prod-promote-cpu-arch.tpl", { region = var.aws_region role_stage = "${module.ecr_dsc.repo_name}-gha-stage" role_prod = "${module.ecr_dsc.repo_name}-gha-prod" diff --git a/versions.tf b/versions.tf index 53d2406..bb54315 100644 --- a/versions.tf +++ b/versions.tf @@ -3,7 +3,7 @@ # Providers themselves are set in the `providers.tf` file. terraform { - required_version = "~> 1.13" + required_version = "~> 1.14" required_providers { aws = {