go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd/hcldec: Allow overriding the removal of nulls

Browse Source 
We remove properties whose values are null by default in order to produce
output that is more convenient to consume in the common case.

However, sometimes those nulls are significant, so we'll allow the user
to opt in to retaining them, at the expense of producing a result that is
more noisy if the spec contains lots of optional attributes that are not
set.
This commit is contained in:
Martin Atkins 2019-09-10 18:35:07 -07:00
parent af5f398dc0
commit c366498686
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/hcldec/main.go
View File

@ -1,6 +1,7 @@
package main package main
import ( import (
"bytes"
"encoding/json" "encoding/json"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
@ -30,6 +31,7 @@ var (
showVarRefs = flag.BoolP("var-refs", "", false, "rather than decoding input, produce a JSON description of the variables referenced by it") showVarRefs = flag.BoolP("var-refs", "", false, "rather than decoding input, produce a JSON description of the variables referenced by it")
withType = flag.BoolP("with-type", "", false, "include an additional object level at the top describing the HCL-oriented type of the result value") withType = flag.BoolP("with-type", "", false, "include an additional object level at the top describing the HCL-oriented type of the result value")
showVersion = flag.BoolP("version", "v", false, "show the version number and immediately exit") showVersion = flag.BoolP("version", "v", false, "show the version number and immediately exit")
keepNulls = flag.BoolP("keep-nulls", "", false, "retain object properties that have null as their value (they are removed by default)")
) )
var parser = hclparse.NewParser() var parser = hclparse.NewParser()
@ -207,7 +209,9 @@ func realmain(args []string) error {
// that refers to a missing item, but that'll probably be annoying for // that refers to a missing item, but that'll probably be annoying for
// a consumer of our output to deal with so we'll just strip those // a consumer of our output to deal with so we'll just strip those
// out and reduce to only the non-null values. // out and reduce to only the non-null values.
if !*keepNulls {
out = stripJSONNullProperties(out) out = stripJSONNullProperties(out)
}
target := os.Stdout target := os.Stdout
if *outputFile != "" { if *outputFile != "" {
@ -331,8 +335,11 @@ func showVarRefsJSON(vars []hcl.Traversal, ctx *hcl.EvalContext) error {
} }
func stripJSONNullProperties(src []byte) []byte { func stripJSONNullProperties(src []byte) []byte {
dec := json.NewDecoder(bytes.NewReader(src))
dec.UseNumber()
var v interface{} var v interface{}
err := json.Unmarshal(src, &v) err := dec.Decode(&v)
if err != nil { if err != nil {
// We expect valid JSON // We expect valid JSON
panic(err) panic(err)