From 97df1f275729dd03c880a64c41f96bb446e8e674 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 23 Dec 2024 09:20:58 +0000 Subject: [PATCH 1/5] Bump hashicorp/aws from 5.80.0 to 5.82.2 in /providers Bumps [hashicorp/aws](https://github.com/hashicorp/terraform-provider-aws) from 5.80.0 to 5.82.2. - [Release notes](https://github.com/hashicorp/terraform-provider-aws/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-aws/blob/main/CHANGELOG.md) - [Commits](https://github.com/hashicorp/terraform-provider-aws/compare/v5.80.0...v5.82.2) --- updated-dependencies: - dependency-name: hashicorp/aws dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- providers/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/providers/versions.tf b/providers/versions.tf index 1ae86c2..a246263 100644 --- a/providers/versions.tf +++ b/providers/versions.tf @@ -2,7 +2,7 @@ terraform { required_providers { aws = { source = "registry.terraform.io/hashicorp/aws" - version = "5.80.0" + version = "5.82.2" } external = { source = "registry.terraform.io/hashicorp/external" From fefdda390aa2d796a2f1d3aa2410639af57fa19f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:35:43 +0000 Subject: [PATCH 2/5] Bump hashicorp/terraform from 1.10.1 to 1.10.3 Bumps hashicorp/terraform from 1.10.1 to 1.10.3. --- updated-dependencies: - dependency-name: hashicorp/terraform dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Dockerfile.tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.tools b/Dockerfile.tools index c828600..e2e3351 100644 --- a/Dockerfile.tools +++ b/Dockerfile.tools @@ -5,4 +5,4 @@ FROM hashicorp/packer:1.11.2 as packer -FROM hashicorp/terraform:1.10.1 as terraform +FROM hashicorp/terraform:1.10.3 as terraform From e0d2164dcf75461a48865b46298c592596c1f824 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 23 Dec 2024 08:48:45 -0800 Subject: [PATCH 3/5] Requires build workflow for tools updated from github releases --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index 22fcfa2..91f0a0e 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,7 +10,7 @@ pull_request_rules: - name: approve dependabot pull requests without build workflow conditions: - author~=dependabot\[bot\] - - -files~=^(Dockerfile.tools|\.github/workflows/build\.yml|providers/) + - -files~=^(Dockerfile.tools|\.github/workflows/build\.yml|\.github/workflows/dependabot_hack\.yml|providers/) actions: review: type: APPROVE From f36b356bfc6bba4927aa672db2956ecc2c6eb747 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 23 Dec 2024 09:01:47 -0800 Subject: [PATCH 4/5] Adds terraform providers for linux_arm64 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 34a2117..0f960a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -95,6 +95,7 @@ jobs: run: | terraform -chdir=./providers/ providers mirror \ -platform=linux_amd64 \ + -platform=linux_arm64 \ -platform=windows_amd64 \ -platform=darwin_amd64 \ ../${{ env.REPO_PATH }}/terraform-registry/ From 3fc5f677cab9f97dd40728aa665976c4c155cb11 Mon Sep 17 00:00:00 2001 From: Loren Gordon Date: Mon, 23 Dec 2024 09:04:33 -0800 Subject: [PATCH 5/5] Installs terraform explicitly in build workflow --- .github/workflows/build.yml | 8 ++++++-- Makefile | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f960a9..40a7bd4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -91,9 +91,13 @@ jobs: mkdir -p ./${{ env.REPO_PATH }}/terraform-registry aws s3 sync --no-sign-request --exact-timestamps --endpoint-url ${{ env.MIRROR_ENDPOINT }} s3://${{ env.MIRROR_BUCKET }}/repo/terraform-registry/ ./${{ env.REPO_PATH }}/terraform-registry/ + - name: Install terraform binary + run: | + make terraform/install + - name: Create Terraform registry run: | - terraform -chdir=./providers/ providers mirror \ + "${HOME}"/bin/terraform -chdir=./providers/ providers mirror \ -platform=linux_amd64 \ -platform=linux_arm64 \ -platform=windows_amd64 \ @@ -110,7 +114,7 @@ jobs: } } EOF - terraform -chdir=./providers/ init + "${HOME}"/bin/terraform -chdir=./providers/ init - name: Push mirror to s3 bucket if: github.event_name != 'pull_request' diff --git a/Makefile b/Makefile index ff43447..86d9ca9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -include $(shell test -f .tardigrade-ci || curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci) - export MIRROR_DOCKERFILE_TOOLS ?= Dockerfile.tools export MIRROR_GITHUB_TOOLS ?= $(PWD)/.github/workflows/dependabot_hack.yml @@ -11,6 +9,8 @@ export TERRAFORM_VERSION_REPO_PATH ?= $(REPO_DIR)/terraform/$(TERRAFORM_VERSION) export TERRAGRUNT_VERSION ?= v$(call match_pattern_in_file,$(MIRROR_GITHUB_TOOLS),'gruntwork-io/terragrunt','$(SEMVER_PATTERN)') export TERRAGRUNT_VERSION_REPO_PATH ?= $(REPO_DIR)/terragrunt/$(TERRAGRUNT_VERSION) +include $(shell test -f .tardigrade-ci || curl -sSL -o .tardigrade-ci "https://raw.githubusercontent.com/plus3it/tardigrade-ci/master/bootstrap/Makefile.bootstrap"; echo .tardigrade-ci) + $(REPO_DIR)/%: @ echo "[make]: Creating directory '$@'..." mkdir -p $@