From 8ff22fa72e6064c27c64e756286a58b86c82f716 Mon Sep 17 00:00:00 2001 From: Jocelyn Giroux Date: Sat, 5 Oct 2024 10:14:05 -0400 Subject: [PATCH] Fix last non-working test :D --- cli/cli_app.go | 2 +- configstack/stack_test.go | 10 +++++----- test/integration_test.go | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cli/cli_app.go b/cli/cli_app.go index b2ddb8e3a0..a6f6d6df05 100644 --- a/cli/cli_app.go +++ b/cli/cli_app.go @@ -149,7 +149,7 @@ AUTHOR(S): ` // This uses the constraint syntax from https://github.com/hashicorp/go-version -const defaultTerraformVersionConstraint = ">= v1.9.0" +const defaultTerraformVersionConstraint = ">= v1.7.0" var terragruntVersion string var terragruntRunID string diff --git a/configstack/stack_test.go b/configstack/stack_test.go index 6dbeb17c8f..101f5da00a 100644 --- a/configstack/stack_test.go +++ b/configstack/stack_test.go @@ -16,11 +16,11 @@ func TestFindStackInSubfolders(t *testing.T) { t.Parallel() filePaths := []string{ - "stage/data-stores/redis/" + config.DefaultConfigName, - "stage/data-stores/postgres/" + config.DefaultConfigName, - "stage/ecs-cluster/" + config.DefaultConfigName, - "stage/kms-master-key/" + config.DefaultConfigName, - "stage/vpc/" + config.DefaultConfigName, + "/stage/data-stores/redis/" + config.DefaultConfigName, + "/stage/data-stores/postgres/" + config.DefaultConfigName, + "/stage/ecs-cluster/" + config.DefaultConfigName, + "/stage/kms-master-key/" + config.DefaultConfigName, + "/stage/vpc/" + config.DefaultConfigName, } tempFolder := createTempFolder() diff --git a/test/integration_test.go b/test/integration_test.go index 2ec5665a89..c9385d11da 100644 --- a/test/integration_test.go +++ b/test/integration_test.go @@ -196,16 +196,16 @@ func TestTerragruntCustomConfig(t *testing.T) { - path: fixture-custom-config/sub-project-1 - path: fixture-custom-config/sub-project-2/sub-project-2-1 dependencies: - - fixture-custom-config/sub-project-1 + - fixture-custom-config/sub-project-1 - path: fixture-custom-config/sub-project-2/sub-project-2-2 dependencies: - - fixture-custom-config/sub-project-2/sub-project-2-1 - - fixture-custom-config/sub-project-1 + - fixture-custom-config/sub-project-2/sub-project-2-1 + - fixture-custom-config/sub-project-1 - path: fixture-custom-config/sub-project-3 dependencies: - - fixture-custom-config/sub-project-2/sub-project-2-1 - - fixture-custom-config/sub-project-2/sub-project-2-2 - - fixture-custom-config/sub-project-1 + - fixture-custom-config/sub-project-2/sub-project-2-1 + - fixture-custom-config/sub-project-2/sub-project-2-2 + - fixture-custom-config/sub-project-1 `)+"\n", out.String()) assert.Equal(t, "", err.String()) } @@ -301,11 +301,11 @@ func TestDownloads(t *testing.T) { }, { path: "fixture-download/remote", - expectedOutput: `^test = <