iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean linting issues for packages template and interpolate (#9120)

This commit is contained in:
Juan Manuel Mesa 2020-04-27 10:35:47 +02:00 committed by GitHub
parent bcc2598840
commit 75efe3fcd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
template/interpolate/funcs.go
View File

@ -298,14 +298,14 @@ func funcGenVault(ctx *Context) interface{} {
vaultConfig := vaultapi.DefaultConfig() vaultConfig := vaultapi.DefaultConfig()
cli, err := vaultapi.NewClient(vaultConfig) cli, err := vaultapi.NewClient(vaultConfig)
if err != nil { if err != nil {
return "", errors.New(fmt.Sprintf("Error getting Vault client: %s", err)) return "", fmt.Errorf("Error getting Vault client: %s", err)
} }
secret, err := cli.Logical().Read(path) secret, err := cli.Logical().Read(path)
if err != nil { if err != nil {
return "", errors.New(fmt.Sprintf("Error reading vault secret: %s", err)) return "", fmt.Errorf("Error reading vault secret: %s", err)
} }
if secret == nil { if secret == nil {
return "", errors.New(fmt.Sprintf("Vault Secret does not exist at the given path.")) return "", errors.New("Vault Secret does not exist at the given path")
} }
data, ok := secret.Data["data"] data, ok := secret.Data["data"]
@ -317,8 +317,8 @@ func funcGenVault(ctx *Context) interface{} {
} }
// neither v1 nor v2 proudced a valid value // neither v1 nor v2 proudced a valid value
return "", errors.New(fmt.Sprintf("Vault data was empty at the "+ return "", fmt.Errorf("Vault data was empty at the "+
"given path. Warnings: %s", strings.Join(secret.Warnings, "; "))) "given path. Warnings: %s", strings.Join(secret.Warnings, "; "))
} }
value := data.(map[string]interface{})[key].(string) value := data.(map[string]interface{})[key].(string)

12
template/parse.go
View File

@ -476,8 +476,12 @@ func ParseFile(path string) (*Template, error) {
} }
defer os.Remove(f.Name()) defer os.Remove(f.Name())
defer f.Close() defer f.Close()
io.Copy(f, os.Stdin) if _, err = io.Copy(f, os.Stdin); err != nil {
f.Seek(0, io.SeekStart) return nil, err
}
if _, err = f.Seek(0, io.SeekStart); err != nil {
return nil, err
}
} else { } else {
f, err = os.Open(path) f, err = os.Open(path)
if err != nil { if err != nil {
@ -492,7 +496,9 @@ func ParseFile(path string) (*Template, error) {
return nil, err return nil, err
} }
// Rewind the file and get a better error // Rewind the file and get a better error
f.Seek(0, io.SeekStart) if _, err := f.Seek(0, io.SeekStart); err != nil {
return nil, err
}
// Grab the error location, and return a string to point to offending syntax error // Grab the error location, and return a string to point to offending syntax error
line, col, highlight := highlightPosition(f, syntaxErr.Offset) line, col, highlight := highlightPosition(f, syntaxErr.Offset)
err = fmt.Errorf("Error parsing JSON: %s\nAt line %d, column %d (offset %d):\n%s", err, line, col, syntaxErr.Offset, highlight) err = fmt.Errorf("Error parsing JSON: %s\nAt line %d, column %d (offset %d):\n%s", err, line, col, syntaxErr.Offset, highlight)