Merge pull request #510 from Shopify/load-yaml-aliases

Allow for yaml aliases to be loaded using YAML.safe_load
Shopify · Jul 9, 2019 · 356ad94 · 356ad94
2 parents cee469d + 053c8ea
commit 356ad94
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## next
 
+*Bug Fixes*
+- Re-enable support for YAML aliases when using YAML.safe_load [#510](https://github.com/Shopify/kubernetes-deploy/pull/510)
+
 ## 0.26.5
 
 *Bug Fixes*

diff --git a/lib/kubernetes-deploy/bindings_parser.rb b/lib/kubernetes-deploy/bindings_parser.rb
@@ -41,7 +41,7 @@ def parse_file(string)
         when '.json'
           bindings = parse_json(File.read(file_path))
         when '.yaml', '.yml'
-          bindings = YAML.safe_load(File.read(file_path))
+          bindings = YAML.safe_load(File.read(file_path), [], [], true, file_path)
         else
           raise ArgumentError, "Supplied file does not appear to be JSON or YAML"
         end

diff --git a/test/fixtures/for_unit_tests/bindings-with-aliases.yaml b/test/fixtures/for_unit_tests/bindings-with-aliases.yaml
@@ -0,0 +1,6 @@
+---
+alias: &alias
+  baz: bang
+foo: a,b,c
+bar:
+  <<: *alias
diff --git a/test/unit/kubernetes-deploy/bindings_parser_test.rb b/test/unit/kubernetes-deploy/bindings_parser_test.rb
@@ -81,6 +81,13 @@ def test_parse_nested_values
     assert_equal(expected, bindings.parse)
   end
 
+  def test_parses_yaml_file_with_aliases
+    expected = { "foo" => "a,b,c", "bar" => { "baz" => "bang" }, "alias" => { "baz" => "bang" } }
+    bindings = KubernetesDeploy::BindingsParser.new
+    bindings.add('@test/fixtures/for_unit_tests/bindings-with-aliases.yaml')
+    assert_equal(expected, bindings.parse)
+  end
+
   private
 
   def parse(string)