Merge remote-tracking branch 'origin/fix-m1-on-old-tg-version'

elia-bracci-hs · Dec 20, 2022 · f6136cc · f6136cc
2 parents 5f8a1ad + 44bf724
commit f6136cc
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 4 deletions.
diff --git a/test-data/test_terragrunt-version_m1/.terragrunt-version b/test-data/test_terragrunt-version_m1/.terragrunt-version
@@ -0,0 +1 @@
+0.26.7
diff --git a/test-data/test_terragrunt_hcl_m1/terragrunt.hcl b/test-data/test_terragrunt_hcl_m1/terragrunt.hcl
@@ -0,0 +1,16 @@
+include {
+  path = "${find_in_parent_folders()}"
+}
+
+terraform {
+  source = "..."
+
+  extra_arguments "variables" {
+    commands = get_terraform_commands_that_need_vars()
+  }
+}
+  inputs = merge(
+    jsondecode(file("${find_in_parent_folders("general.tfvars")}"))
+)
+
+terragrunt_version_constraint=">= 0.28, < 0.28.1"
diff --git a/test-data/test_tgswitchrc_m1/.tgswitchrc b/test-data/test_tgswitchrc_m1/.tgswitchrc
@@ -0,0 +1 @@
+0.28.0
diff --git a/test-data/test_tgswitchtoml_m1/.tgswitch.toml b/test-data/test_tgswitchtoml_m1/.tgswitch.toml
@@ -0,0 +1,2 @@
+bin = "/usr/local/bin/terragrunt"
+version = "0.26.7"
diff --git a/test-tgswitch.sh b/test-tgswitch.sh
@@ -83,7 +83,12 @@ runtestdir ".toml" "test_tgswitchtoml" "v0.34.0"
 runtestenv "env variable" "0.37.1" "v0.37.1"
 #runtestenv "env variable" "0.26.7" "v0.26.7"
 runtestarg "passing argument" "0.36.1" "v0.36.1"
-# M1 darwin arm64 test
-runtestarg "passing argument" "0.28.0" "v0.28.0"
-# M1 darwin arm64 test
-runtestarg "passing argument" "0.26.7" "v0.26.7"
+# M1 darwin arm64 test versions < 0.28.12
+runtestdir "terragrunt version" "test_terragrunt-version_m1" "v0.26.7"
+runtestdir "terragrunt hcl" "test_terragrunt_hcl_m1" "v0.28.0"
+runtestdir "tgswitchrc" "test_tgswitchrc_m1" "v0.28.0"
+runtestdir ".toml" "test_tgswitchtoml_m1" "v0.26.7"
+runtestenv "env variable" "0.26.7" "v0.26.7"
+runtestarg "passing argument" "0.26.7" "v0.26.7"
+# Edge case
+runtestarg "passing argument" "0.28.12" "v0.28.12"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bin = "/usr/local/bin/terragrunt"
		version = "0.26.7"