Ensure attributes are maintained in deserialization

Author: danielsdeleo

lib/chef-dk/policyfile_lock.rb

@@ -256,6 +256,7 @@ def build_from_lock_data(lock_data)
       set_name_from_lock_data(lock_data)
       set_run_list_from_lock_data(lock_data)
       set_cookbook_locks_from_lock_data(lock_data)
+      set_attributes_from_lock_data(lock_data)
       set_solution_dependencies_from_lock_data(lock_data)
       self
     end
@@ -422,6 +423,31 @@ def set_cookbook_locks_from_lock_data(lock_data)
       end
     end
 
+    def set_attributes_from_lock_data(lock_data)
+      default_attr_data = lock_data["default_attributes"]
+
+      if default_attr_data.nil?
+        raise InvalidLockfile, "lockfile does not have a `default_attributes` attribute"
+      end
+
+      unless default_attr_data.kind_of?(Hash)
+        raise InvalidLockfile, "lockfile's `default_attributes` attribute must be a Hash (JSON object). (got: #{default_attr_data.inspect})"
+      end
+
+      override_attr_data = lock_data["override_attributes"]
+
+      if override_attr_data.nil?
+        raise InvalidLockfile, "lockfile does not have a `override_attributes` attribute"
+      end
+
+      unless override_attr_data.kind_of?(Hash)
+        raise InvalidLockfile, "lockfile's `override_attributes` attribute must be a Hash (JSON object). (got: #{override_attr_data.inspect})"
+      end
+
+      @default_attributes   = default_attr_data
+      @override_attributes  = override_attr_data
+    end
+
     def set_solution_dependencies_from_lock_data(lock_data)
       soln_deps = lock_data["solution_dependencies"]
 

spec/unit/policyfile_lock_serialization_spec.rb

@@ -27,6 +27,8 @@
       "cookbook_locks" => {
         # TODO: add some valid locks
       },
+      "default_attributes" => { "foo" => "bar" },
+      "override_attributes" => { "override_foo" => "override_bar" },
       "solution_dependencies" => {
         "Policyfile" => [],
         "dependencies" => {}
@@ -38,6 +40,27 @@
 
   let(:lockfile) { ChefDK::PolicyfileLock.new(storage_config) }
 
+  describe "populating the deserialized lock" do
+
+    before do
+      lockfile.build_from_lock_data(valid_lock_data)
+    end
+
+    it "includes the run list" do
+      expect(lockfile.run_list).to eq(["recipe[cookbook::recipe_name]"])
+    end
+
+    it "includes the cookbook locks" do
+      expect(lockfile.cookbook_locks).to eq({})
+    end
+
+    it "includes the attributes" do
+      expect(lockfile.default_attributes).to eq({"foo" => "bar"})
+      expect(lockfile.override_attributes).to eq({"override_foo" => "override_bar"})
+    end
+
+  end
+
   describe "validating required fields" do
 
     it "does not raise an error when all fields are valid" do
@@ -88,6 +111,30 @@
       expect { lockfile.build_from_lock_data(invalid_locks) }.to raise_error(ChefDK::InvalidLockfile)
     end
 
+    it "requires the `default_attributes` section be present and its value is a Hash" do
+      missing_attrs = valid_lock_data.dup
+      missing_attrs.delete("default_attributes")
+
+      expect { lockfile.build_from_lock_data(missing_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+
+      invalid_attrs = valid_lock_data.dup
+      invalid_attrs["default_attributes"] = []
+
+      expect { lockfile.build_from_lock_data(invalid_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+    end
+
+    it "requires the `override_attributes` section be present and its value is a Hash" do
+      missing_attrs = valid_lock_data.dup
+      missing_attrs.delete("override_attributes")
+
+      expect { lockfile.build_from_lock_data(missing_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+
+      invalid_attrs = valid_lock_data.dup
+      invalid_attrs["override_attributes"] = []
+
+      expect { lockfile.build_from_lock_data(invalid_attrs) }.to raise_error(ChefDK::InvalidLockfile)
+    end
+
     describe "validating solution_dependencies" do
 
       it "requires the `solution_dependencies' section be present" do

spec/unit/policyfile_services/export_repo_spec.rb

@@ -123,6 +123,8 @@
       }
     }
   },
+  "default_attributes": {},
+  "override_attributes": {},
   "solution_dependencies": {
     "Policyfile": [
       [

spec/unit/policyfile_services/push_spec.rb

@@ -145,6 +145,8 @@
       }
     }
   },
+  "default_attributes": {},
+  "override_attributes": {},
   "solution_dependencies": {
     "Policyfile": [
       [