diff --git a/cmd/genconfig.go b/cmd/genconfig.go index cb994627..a7b5af3a 100644 --- a/cmd/genconfig.go +++ b/cmd/genconfig.go @@ -55,7 +55,7 @@ var ( } } - cfFile, err := substitute.SubstituteEnvFromYaml(cf) + cfFile, err := substitute.SubstituteEnvFromByte(cf) if err != nil { log.Fatalf("failed to substitute env: %s", err) } diff --git a/pkg/patcher/patcher.go b/pkg/patcher/patcher.go index 67b6da72..91c47e60 100644 --- a/pkg/patcher/patcher.go +++ b/pkg/patcher/patcher.go @@ -53,7 +53,7 @@ func PatchesPatcher(patches []string, target []byte) ([]byte, error) { return nil, err } - p, err := substitute.SubstituteEnvFromYaml(contents) + p, err := substitute.SubstituteEnvFromByte(contents) if err != nil { return nil, err } diff --git a/pkg/substitute/envsubst.go b/pkg/substitute/envsubst.go index 024ced32..8c029e2f 100644 --- a/pkg/substitute/envsubst.go +++ b/pkg/substitute/envsubst.go @@ -20,7 +20,7 @@ func LoadEnv(file []byte) error { return nil } -func SubstituteEnvFromYaml(file []byte) ([]byte, error) { +func SubstituteEnvFromByte(file []byte) ([]byte, error) { filtered := stripYamlComment(file) data, err := envsubst.BytesRestricted(filtered, true, true) if err != nil { diff --git a/pkg/substitute/envsubst_test.go b/pkg/substitute/envsubst_test.go index 1c862c30..422a2c49 100644 --- a/pkg/substitute/envsubst_test.go +++ b/pkg/substitute/envsubst_test.go @@ -29,7 +29,7 @@ d: default value t.Fatal(err) } - result, _ := SubstituteEnvFromYaml([]byte(file)) + result, _ := SubstituteEnvFromByte([]byte(file)) if expected != string(result) { t.Errorf("got %s, want %s", string(result), expected)