Merge remote-tracking branch 'batinicaz/bug/packer-version-check-1379…

…' into deps-update
gruntwork-io · May 22, 2024 · 076e7b7 · 076e7b7
2 parents 9c1259b + d3af93b
commit 076e7b7
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ env: &env
     MODULE_GCP_CI_VERSION: v0.1.1
     MODULE_CI_CIRCLECI_HELPER_VERSION: v0.56.0
     TERRAFORM_VERSION: 1.5.7
-    PACKER_VERSION: 1.7.4
+    PACKER_VERSION: 1.10.0
     TERRAGRUNT_VERSION: v0.52.0
     OPA_VERSION: v0.33.1
     GO_VERSION: 1.21.1

diff --git a/examples/packer-docker-example/build.pkr.hcl b/examples/packer-docker-example/build.pkr.hcl
@@ -4,6 +4,10 @@ packer {
       version = ">=v1.0.0"
       source  = "github.com/hashicorp/amazon"
     }
+    docker = {
+      version = ">=v1.0.1"
+      source  = "github.com/hashicorp/docker"
+    }
   }
 }
 

diff --git a/modules/packer/packer.go b/modules/packer/packer.go
@@ -7,6 +7,7 @@ import (
 	"os"
 	"path/filepath"
 	"regexp"
+	"strings"
 	"sync"
 	"time"
 
@@ -186,10 +187,11 @@ func hasPackerInit(t testing.TestingT, options *Options) (bool, error) {
 		Env:        options.Env,
 		WorkingDir: options.WorkingDir,
 	}
-	localVersion, err := shell.RunCommandAndGetOutputE(t, cmd)
+	versionCmdOutput, err := shell.RunCommandAndGetOutputE(t, cmd)
 	if err != nil {
 		return false, err
 	}
+	localVersion := trimPackerVersion(versionCmdOutput)
 	thisVersion, err := version.NewVersion(localVersion)
 	if err != nil {
 		return false, err
@@ -262,3 +264,8 @@ func formatPackerArgs(options *Options) []string {
 
 	return append(args, options.Template)
 }
+
+// From packer 1.10 the -version command output is prefixed with Packer v
+func trimPackerVersion(versionCmdOutput string) string {
+	return strings.Replace(versionCmdOutput, "Packer v", "", -1)
+}
diff --git a/modules/packer/packer_test.go b/modules/packer/packer_test.go
@@ -174,3 +174,28 @@ func TestFormatPackerArgs(t *testing.T) {
 		assert.Equal(t, strings.Join(args, " "), test.expected)
 	}
 }
+
+func TestTrimPackerVersion(t *testing.T) {
+	t.Parallel()
+
+	tests := []struct {
+		versionOutput string
+		expected      string
+	}{
+		{
+			// Pre 1.10 output
+			versionOutput: "1.7.0",
+			expected:      "1.7.0",
+		},
+		{
+			// From 1.10 matches the output of packer version
+			versionOutput: "Packer v1.10.0",
+			expected:      "1.10.0",
+		},
+	}
+
+	for _, test := range tests {
+		out := trimPackerVersion(test.versionOutput)
+		assert.Equal(t, test.expected, out)
+	}
+}