Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions command/build_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ func TestBuild(t *testing.T) {
},

{
name: "hcl - valid cmd ( invalid varfile bypased )",
name: "hcl - valid cmd ( invalid varfile bypassed )",
args: []string{
"-var-file", filepath.Join(testFixture("hcl", "validation", "map", "invalid_value.pkrvars.hcl")),
"-var", `image_metadata={key = "new_value", something = { foo = "bar" }}`,
Expand All @@ -392,7 +392,7 @@ func TestBuild(t *testing.T) {
},

{
name: "hcl - invalid cmd ( valid varfile bypased )",
name: "hcl - invalid cmd ( valid varfile bypassed )",
args: []string{
"-var-file", filepath.Join(testFixture("hcl", "validation", "map", "valid_value.pkrvars.hcl")),
"-var", `image_metadata={key = "?", something = { foo = "wrong" }}`,
Expand Down
4 changes: 2 additions & 2 deletions command/hcl2_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -1056,10 +1056,10 @@ func (p *LocalsParser) Write(out *bytes.Buffer) {
fmt.Fprintln(out, `locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") }`)
}
if isotime {
fmt.Fprintln(out, `# The "legacy_isotime" function has been provided for backwards compatability, but we recommend switching to the timestamp and formatdate functions.`)
fmt.Fprintln(out, `# The "legacy_isotime" function has been provided for backwards compatibility, but we recommend switching to the timestamp and formatdate functions.`)
}
if strftime {
fmt.Fprintln(out, `# The "legacy_strftime" function has been provided for backwards compatability, but we recommend switching to the timestamp and formatdate functions.`)
fmt.Fprintln(out, `# The "legacy_strftime" function has been provided for backwards compatibility, but we recommend switching to the timestamp and formatdate functions.`)
}
if len(p.LocalsOut) > 0 {
if p.WithAnnotations {
Expand Down
2 changes: 1 addition & 1 deletion command/inspect_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ and therefore only show in their raw form here.
}
actual := string(bs)
if diff := cmp.Diff(tc.expected, actual); diff != "" {
t.Fatalf("unexpected ouput %s", diff)
t.Fatalf("unexpected output %s", diff)
}
})
}
Expand Down
2 changes: 1 addition & 1 deletion hcl2template/formatter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ func TestHCL2Formatter_FormatNegativeCases(t *testing.T) {
}

if diags[0].Detail != "file testdata/format/test.json is not a HCL file" {
t.Fatalf("Expected error messge did not received")
t.Fatalf("Expected error message did not received")
}
}
}
4 changes: 2 additions & 2 deletions hcl2template/types.packer_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ func (c *PackerConfig) recursivelyEvaluateLocalVariable(local *LocalBlock, depth
return hcl.Diagnostics{&hcl.Diagnostic{
Severity: hcl.DiagError,
Summary: "Max local recursion depth exceeded.",
Detail: "An error occured while recursively evaluating locals." +
Detail: "An error occurred while recursively evaluating locals." +
"Your local variables likely have a cyclic dependency. " +
"Please simplify your config to continue. ",
}}
Expand Down Expand Up @@ -429,7 +429,7 @@ func (cfg *PackerConfig) recursivelyEvaluateDatasources(ref DatasourceRef, depen
diags = append(diags, &hcl.Diagnostic{
Severity: hcl.DiagError,
Summary: "Max datasource recursion depth exceeded.",
Detail: "An error occured while recursively evaluating data " +
Detail: "An error occurred while recursively evaluating data " +
"sources. Either your data source depends on more than ten " +
"other data sources, or your data sources have a cyclic " +
"dependency. Please simplify your config to continue. ",
Expand Down
2 changes: 1 addition & 1 deletion internal/hcp/env/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func HasHCPAuth() (bool, error) {
return false, err
}
if hasClientCredentials && hasCertificate {
fmt.Printf("HCP Client Credentials (HCP_CLIENT_ID/HCP_CLIENT_SECRET environment variables) and certificate (HCP_CRED_FILE environment variable, or certificate located at default path (%s) are both supplied, only one is required. The HCP SDK will determine which authentication mechanism to configure here, it is reccomended to only configure one authentication method", HCPDefaultCredFilePathFull)
fmt.Printf("HCP Client Credentials (HCP_CLIENT_ID/HCP_CLIENT_SECRET environment variables) and certificate (HCP_CRED_FILE environment variable, or certificate located at default path (%s) are both supplied, only one is required. The HCP SDK will determine which authentication mechanism to configure here, it is recommended to only configure one authentication method", HCPDefaultCredFilePathFull)
}
return (hasClientCredentials || hasCertificate), nil
}
Expand Down