Skip to content

Commit c1eac24

Browse files
committed
update packer sdk, and enhance compact param functionality
1 parent 89e5540 commit c1eac24

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ replace github.com/zclconf/go-cty => github.com/nywilken/go-cty v1.13.3
66

77
require (
88
github.com/hashicorp/hcl/v2 v2.24.0
9-
github.com/hashicorp/packer-plugin-sdk v0.6.2
9+
github.com/hashicorp/packer-plugin-sdk v0.6.4
1010
github.com/zclconf/go-cty v1.16.3
1111
)
1212

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO
118118
github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
119119
github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR/prTM=
120120
github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0=
121-
github.com/hashicorp/packer-plugin-sdk v0.6.2 h1:XRIJTcHa9AN13ZvVjL+RpwxEz+yYT7qJ5PA2REViJZ0=
122-
github.com/hashicorp/packer-plugin-sdk v0.6.2/go.mod h1:mOuey53XeLIIpdOQnREjEBYCndipO7piU+EJAstQq1k=
121+
github.com/hashicorp/packer-plugin-sdk v0.6.4 h1:V9U7FDgLl18CuE9nURmekb623y4qktD9duT3UsLprCA=
122+
github.com/hashicorp/packer-plugin-sdk v0.6.4/go.mod h1:y5uwHqfjmr6u04S5iSNlWUuxqvNwy219fJFatNMCPB0=
123123
github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
124124
github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
125125
github.com/hashicorp/vault/api v1.14.0 h1:Ah3CFLixD5jmjusOgm8grfN9M0d+Y8fVR2SW0K6pJLU=

provisioner/command.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func (provisioner *Provisioner) determineExecCmd(ui packer.Ui) (*exec.Cmd, *pack
162162
// assign optional populated values
163163
// compact
164164
if provisioner.config.Compact {
165-
args = append(args, "--no-header", "--no-summary", "--disable-warnings")
165+
args = append(args, "--no-header", "--no-summary", "--disable-warnings", "--force-short-summary")
166166
}
167167
// keyword
168168
keyword, err := interpolate.Render(provisioner.config.Keyword, &provisioner.config.ctx)

provisioner/command_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ func TestProvisionerDetermineExecCmd(test *testing.T) {
5858
test.Error("determineExecCmd function failed to determine execution directory for basic config")
5959
test.Errorf("actual: %s, expected: %s", execCmd.Dir, basicConfig.Chdir)
6060
}
61-
if !slices.Equal(execCmd.Args, slices.Concat([]string{provisioner.config.PytestPath, fmt.Sprintf("--hosts=ssh://%s@%s:%d", provisioner.generatedData["User"], provisioner.generatedData["Host"], provisioner.generatedData["Port"]), fmt.Sprintf("--ssh-identity-file=%s", provisioner.generatedData["SSHPrivateKeyFile"]), "--ssh-extra-args=\"-o StrictHostKeyChecking=no\"", "--no-header", "--no-summary", "--disable-warnings", "-k", fmt.Sprintf("\"%s\"", provisioner.config.Keyword), "-m", fmt.Sprintf("\"%s\"", provisioner.config.Marker), "-n", "auto", "--sudo", "-vv"}, provisioner.config.TestFiles)) {
61+
if !slices.Equal(execCmd.Args, slices.Concat([]string{provisioner.config.PytestPath, fmt.Sprintf("--hosts=ssh://%s@%s:%d", provisioner.generatedData["User"], provisioner.generatedData["Host"], provisioner.generatedData["Port"]), fmt.Sprintf("--ssh-identity-file=%s", provisioner.generatedData["SSHPrivateKeyFile"]), "--ssh-extra-args=\"-o StrictHostKeyChecking=no\"", "--no-header", "--no-summary", "--disable-warnings", "--force-short-summary", "-k", fmt.Sprintf("\"%s\"", provisioner.config.Keyword), "-m", fmt.Sprintf("\"%s\"", provisioner.config.Marker), "-n", "auto", "--sudo", "-vv"}, provisioner.config.TestFiles)) {
6262
test.Errorf("determineExecCmd function failed to properly determine remote execution command for basic config with SSH communicator: %s", execCmd.String())
6363
}
6464
if localCmd != nil {

0 commit comments

Comments
 (0)