From bc4ba691b89ffbfcf3e16e5f66312488210330a2 Mon Sep 17 00:00:00 2001 From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com> Date: Wed, 26 Jun 2024 08:16:37 +0000 Subject: [PATCH 1/3] terragrunt/0.59.5-r0: fix GHSA-v6v8-xj6m-xwqh/GHSA-xfhp-jf8p-mh5w/ --- terragrunt.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/terragrunt.yaml b/terragrunt.yaml index 26267afc406..469fd5945bd 100644 --- a/terragrunt.yaml +++ b/terragrunt.yaml @@ -1,7 +1,7 @@ package: name: terragrunt version: 0.59.5 - epoch: 0 + epoch: 1 description: Thin wrapper for Terraform providing extra tools copyright: - license: MIT @@ -24,6 +24,10 @@ pipeline: repository: https://github.com/gruntwork-io/terragrunt tag: v${{package.version}} + - uses: go/bump + with: + deps: github.com/hashicorp/go-getter@v1.7.5 github.com/hashicorp/go-retryablehttp@v0.7.7 + - runs: | go build -v -o bin/terragrunt -ldflags "-s -w -X github.com/gruntwork-io/go-commons/version.Version=v${{package.version}}" install -Dm755 bin/terragrunt "${{targets.contextdir}}"/usr/bin/terragrunt From 062e11b6363a53ca8c0a65501b97f638d6a653b9 Mon Sep 17 00:00:00 2001 From: debasishbsws Date: Thu, 27 Jun 2024 14:57:49 +0530 Subject: [PATCH 2/3] Fix build and verify test fail Signed-off-by: debasishbsws --- terragrunt.yaml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/terragrunt.yaml b/terragrunt.yaml index 469fd5945bd..cdc578d018a 100644 --- a/terragrunt.yaml +++ b/terragrunt.yaml @@ -16,6 +16,7 @@ environment: - busybox - ca-certificates-bundle - go + - mockery pipeline: - uses: git-checkout @@ -24,21 +25,26 @@ pipeline: repository: https://github.com/gruntwork-io/terragrunt tag: v${{package.version}} + - runs: go generate ./... + - uses: go/bump with: deps: github.com/hashicorp/go-getter@v1.7.5 github.com/hashicorp/go-retryablehttp@v0.7.7 - - runs: | - go build -v -o bin/terragrunt -ldflags "-s -w -X github.com/gruntwork-io/go-commons/version.Version=v${{package.version}}" - install -Dm755 bin/terragrunt "${{targets.contextdir}}"/usr/bin/terragrunt + - uses: go/build + with: + output: terragrunt + packages: . + ldflags: "-X github.com/gruntwork-io/go-commons/version.Version=v${{package.version}}" - uses: strip test: pipeline: - - name: Verify terragrunt + - name: Verify terragrunt version runs: | - terragrunt --version + set -o pipefail + terragrunt --version | grep "${{package.version}}" update: enabled: true From e10412df3ac00a2865b4b14caef746db21716dc4 Mon Sep 17 00:00:00 2001 From: Debasish Biswas Date: Thu, 27 Jun 2024 15:02:05 +0530 Subject: [PATCH 3/3] Update terragrunt.yaml Signed-off-by: Debasish Biswas --- terragrunt.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terragrunt.yaml b/terragrunt.yaml index cdc578d018a..464ca0d30ba 100644 --- a/terragrunt.yaml +++ b/terragrunt.yaml @@ -41,7 +41,7 @@ pipeline: test: pipeline: - - name: Verify terragrunt version + - name: Verify terragrunt runs: | set -o pipefail terragrunt --version | grep "${{package.version}}"