From cb278f7d8869c169a7d4c1ec25964c9b890ea06e Mon Sep 17 00:00:00 2001 From: koralowiec <36413794+koralowiec@users.noreply.github.com> Date: Sun, 4 Jan 2026 08:40:21 +0000 Subject: [PATCH] fix(terragrunt): filter out additional assets --- src/terragrunt/devcontainer-feature.json | 2 +- src/terragrunt/install.sh | 5 ++--- test/terragrunt/scenarios.json | 16 ++++++++++++++++ test/terragrunt/test_specific_version.sh | 10 ++++++++++ ...test_specific_version_before_assets_change.sh | 10 ++++++++++ 5 files changed, 39 insertions(+), 4 deletions(-) create mode 100755 test/terragrunt/test_specific_version.sh create mode 100755 test/terragrunt/test_specific_version_before_assets_change.sh diff --git a/src/terragrunt/devcontainer-feature.json b/src/terragrunt/devcontainer-feature.json index 2d0440993..40598fac1 100644 --- a/src/terragrunt/devcontainer-feature.json +++ b/src/terragrunt/devcontainer-feature.json @@ -1,6 +1,6 @@ { "id": "terragrunt", - "version": "1.0.15", + "version": "1.0.16", "name": "Terragrunt (via Github Releases)", "documentationURL": "http://github.com/devcontainers-extra/features/tree/main/src/terragrunt", "description": "Terragrunt is a thin wrapper that provides extra tools for keeping your configurations DRY, working with multiple Terraform modules, and managing remote state.", diff --git a/src/terragrunt/install.sh b/src/terragrunt/install.sh index 115b5969e..838ce1afb 100755 --- a/src/terragrunt/install.sh +++ b/src/terragrunt/install.sh @@ -15,9 +15,8 @@ $nanolayer_location \ install \ devcontainer-feature \ "ghcr.io/devcontainers-extra/features/gh-release:1.0.25" \ - --option repo='gruntwork-io/terragrunt' --option binaryNames='terragrunt' --option version="$VERSION" - - + --option repo='gruntwork-io/terragrunt' --option binaryNames='terragrunt' --option version="$VERSION" \ + --option assetRegex='^(?!.*(\.zip|\.tar\.gz)$).*$' echo 'Done!' diff --git a/test/terragrunt/scenarios.json b/test/terragrunt/scenarios.json index 1d1e6cecd..0abc6a801 100644 --- a/test/terragrunt/scenarios.json +++ b/test/terragrunt/scenarios.json @@ -4,5 +4,21 @@ "features": { "terragrunt": {} } + }, + "test_specific_version_before_assets_change": { + "image": "mcr.microsoft.com/devcontainers/base:debian", + "features": { + "terragrunt": { + "version": "0.93.5" + } + } + }, + "test_specific_version": { + "image": "mcr.microsoft.com/devcontainers/base:debian", + "features": { + "terragrunt": { + "version": "0.96.0" + } + } } } \ No newline at end of file diff --git a/test/terragrunt/test_specific_version.sh b/test/terragrunt/test_specific_version.sh new file mode 100755 index 000000000..5580e8094 --- /dev/null +++ b/test/terragrunt/test_specific_version.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e + +source dev-container-features-test-lib + +check "terragrunt --version" terragrunt --version +check "terragrunt version is equal to 0.96.0" sh -c "terragrunt --version | grep '0.96.0'" + +reportResults diff --git a/test/terragrunt/test_specific_version_before_assets_change.sh b/test/terragrunt/test_specific_version_before_assets_change.sh new file mode 100755 index 000000000..8f7a10be4 --- /dev/null +++ b/test/terragrunt/test_specific_version_before_assets_change.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +set -e + +source dev-container-features-test-lib + +check "terragrunt --version" terragrunt --version +check "terragrunt version is equal to 0.93.5" sh -c "terragrunt --version | grep '0.93.5'" + +reportResults