Fixes auto expansion of properties #1127

mikefarah · Mar 1, 2022 · edbdb16 · edbdb16
1 parent 2e731c3
commit edbdb16
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/pkg/yqlib/decoder_properties.go b/pkg/yqlib/decoder_properties.go
@@ -95,6 +95,7 @@ func (dec *propertiesDecoder) Decode(rootYamlNode *yaml.Node) error {
 	if err != nil {
 		return err
 	}
+	properties.DisableExpansion = true
 
 	rootMap := &CandidateNode{
 		Node: &yaml.Node{

diff --git a/pkg/yqlib/doc/usage/properties.md b/pkg/yqlib/doc/usage/properties.md
@@ -144,16 +144,3 @@ person.pets.0 = dog
 person.food.0 = pizza
 ```
 
-## Empty doc
-Given a sample.properties file of:
-```properties
-
-```
-then
-```bash
-yq -p=props sample.properties
-```
-will output
-```yaml
-```
-
diff --git a/pkg/yqlib/properties_test.go b/pkg/yqlib/properties_test.go
@@ -83,6 +83,13 @@ var propertyScenarios = []formatScenario{
 		expected:     expectedDecodedYaml,
 		scenarioType: "decode",
 	},
+	{
+		description:  "does not expand automatically",
+		skipDoc:      true,
+		input:        "mike = ${dontExpand} this",
+		expected:     "mike: ${dontExpand} this\n",
+		scenarioType: "decode",
+	},
 	{
 		description:  "Roundtrip",
 		input:        expectedProperties,
@@ -176,6 +183,9 @@ func documentRoundTripPropertyScenario(w *bufio.Writer, s formatScenario) {
 
 func documentPropertyScenario(t *testing.T, w *bufio.Writer, i interface{}) {
 	s := i.(formatScenario)
+	if s.skipDoc {
+		return
+	}
 	if s.scenarioType == "decode" {
 		documentDecodePropertyScenario(w, s)
 	} else if s.scenarioType == "roundtrip" {