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

add annotation warning to isotime func usage

This commit is contained in:
Megan Marsh 2021-03-17 16:06:19 -07:00
parent 6986fb0e81
commit 0ecc4b5e52
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
command/hcl2_upgrade.go
View File

@ -120,6 +120,7 @@ var (
amazonSecretsManagerMap = map[string]map[string]interface{}{} amazonSecretsManagerMap = map[string]map[string]interface{}{}
localsVariableMap = map[string]string{} localsVariableMap = map[string]string{}
timestamp = false timestamp = false
isotime = false
) )
type BlockParser interface { type BlockParser interface {
@ -337,9 +338,11 @@ func transposeTemplatingCalls(s []byte) []byte {
}, },
"isotime": func(a ...string) string { "isotime": func(a ...string) string {
if len(a) == 0 { if len(a) == 0 {
return "${legacy_isotime()}" // returns rfc3339 formatted string.
return "${timestamp()}"
} }
// otherwise a valid isotime func has one input. // otherwise a valid isotime func has one input.
isotime = true
return fmt.Sprintf("${legacy_isotime(\"%s\")}", a[0]) return fmt.Sprintf("${legacy_isotime(\"%s\")}", a[0])
}, },
@ -775,6 +778,9 @@ func (p *LocalsParser) Write(out *bytes.Buffer) {
} }
fmt.Fprintln(out, `locals { timestamp = regex_replace(timestamp(), "[- TZ:]", "") }`) 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.`)
}
if len(p.LocalsOut) > 0 { if len(p.LocalsOut) > 0 {
if p.WithAnnotations { if p.WithAnnotations {
out.Write([]byte(localsVarHeader)) out.Write([]byte(localsVarHeader))