diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-22 15:05:51 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-02-22 15:05:51 -0800 |
| commit | 1accff62210095264f331f088a1f6c89e502f6d0 (patch) | |
| tree | 9bb34cf7e0430f4ac55a92471b885d573e1da7c0 | |
| parent | 709fc41d811e1336afc85faae5c30c8c43a35396 (diff) | |
| download | chef-1accff62210095264f331f088a1f6c89e502f6d0.tar.gz | |
Revert "fix node assignment of ImmutableArrays to VividMashes/AttrArrays"
This reverts commit 1446e9f8202f87cf646053760ce41fc0aa938e21.
| -rw-r--r-- | lib/chef/node/attribute_collections.rb | 2 | ||||
| -rw-r--r-- | lib/chef/node/mixin/state_tracking.rb | 2 | ||||
| -rw-r--r-- | spec/unit/node/attribute_spec.rb | 15 |
3 files changed, 1 insertions, 18 deletions
diff --git a/lib/chef/node/attribute_collections.rb b/lib/chef/node/attribute_collections.rb index 9e4a56b37d..bb32ae3b54 100644 --- a/lib/chef/node/attribute_collections.rb +++ b/lib/chef/node/attribute_collections.rb @@ -92,7 +92,6 @@ class Chef private def convert_value(value) - value.ensure_generated_cache! if value.respond_to?(:ensure_generated_cache!) case value when VividMash value @@ -190,7 +189,6 @@ class Chef # AttrArray for consistency and to ensure that the added parts of the # attribute tree will have the correct cache invalidation behavior. def convert_value(value) - value.ensure_generated_cache! if value.respond_to?(:ensure_generated_cache!) case value when VividMash value diff --git a/lib/chef/node/mixin/state_tracking.rb b/lib/chef/node/mixin/state_tracking.rb index 0c3d4c33a4..690d261df6 100644 --- a/lib/chef/node/mixin/state_tracking.rb +++ b/lib/chef/node/mixin/state_tracking.rb @@ -1,5 +1,5 @@ #-- -# Copyright:: Copyright 2016-2018, Chef Software Inc. +# Copyright:: Copyright 2016-2017, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/spec/unit/node/attribute_spec.rb b/spec/unit/node/attribute_spec.rb index a9dab144ab..90b3f1fe51 100644 --- a/spec/unit/node/attribute_spec.rb +++ b/spec/unit/node/attribute_spec.rb @@ -1304,19 +1304,4 @@ describe Chef::Node::Attribute do expect { @attributes["foo"]["bar"][0] << "buzz" }.to raise_error(RuntimeError, "can't modify frozen String") end end - - describe "assigning lazy ungenerated caches to other attributes" do - it "works with arrays" do - @attributes.default["foo"]["baz"] = %w{one two} - @attributes.default["bar"]["baz"] = @attributes["foo"]["baz"] - expect(@attributes.default["bar"]["baz"]).to eql(%w{one two}) - end - - it "works with hashes" do - @attributes.default["foo"]["baz"] = { "one" => "two" } - @attributes.default["bar"]["baz"] = @attributes["foo"]["baz"] - expect(@attributes.default["bar"]["baz"]).to eql({ "one" => "two" }) - end - end - end |