chef-dk 1.2.22 → 1.3.40

data/spec/unit/policyfile_lock_install_spec.rb

@@ -15,9 +15,9 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'shared/fixture_cookbook_checksums'
-require 'chef-dk/policyfile_lock.rb'
+require "spec_helper"
+require "shared/fixture_cookbook_checksums"
+require "chef-dk/policyfile_lock.rb"
 
 describe ChefDK::PolicyfileLock, "installing cookbooks from a lockfile" do
 
@@ -33,7 +33,7 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from a lockfile" do
 
   let(:name) { "application-server" }
 
-  let(:run_list) { [ 'recipe[erlang::default]', 'recipe[erchef::prereqs]', 'recipe[erchef::app]' ] }
+  let(:run_list) { [ "recipe[erlang::default]", "recipe[erchef::prereqs]", "recipe[erchef::app]" ] }
 
   let(:storage_config) do
     ChefDK::Policyfile::StorageConfig.new( cache_path: cache_path, relative_paths_root: local_cookbooks_root )
@@ -122,10 +122,9 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from a lockfile" do
       location_spec = local_cookbook_lock.cookbook_location_spec
       expect(location_spec).to be_an_instance_of(ChefDK::Policyfile::CookbookLocationSpecification)
 
-      expect(location_spec.relative_path).to eq('local-cookbook')
+      expect(location_spec.relative_path).to eq("local-cookbook")
     end
 
-
     it "ensures the cookbooks are installed" do
       expect(remote_cookbook_lock.cookbook_location_spec).to receive(:ensure_cached)
       expect(local_cookbook_lock.cookbook_location_spec).to receive(:ensure_cached)

data/spec/unit/policyfile_lock_serialization_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile_lock'
+require "spec_helper"
+require "chef-dk/policyfile_lock"
 
 describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
 
@@ -25,7 +25,7 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
       "name" => "example",
       "run_list" => [ "recipe[cookbook::recipe_name]" ],
       "named_run_lists" => {
-        "fast-deploy" => [ "recipe[cookbook::deployit]" ]
+        "fast-deploy" => [ "recipe[cookbook::deployit]" ],
       },
       "cookbook_locks" => {
         # TODO: add some valid locks
@@ -34,8 +34,8 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
       "override_attributes" => { "override_foo" => "override_bar" },
       "solution_dependencies" => {
         "Policyfile" => [],
-        "dependencies" => {}
-      }
+        "dependencies" => {},
+      },
     }
   end
 
@@ -62,8 +62,8 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
     end
 
     it "includes the attributes" do
-      expect(lockfile.default_attributes).to eq({"foo" => "bar"})
-      expect(lockfile.override_attributes).to eq({"override_foo" => "override_bar"})
+      expect(lockfile.default_attributes).to eq({ "foo" => "bar" })
+      expect(lockfile.override_attributes).to eq({ "override_foo" => "override_bar" })
     end
 
   end
@@ -197,7 +197,7 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
         expect { lockfile.build_from_lock_data(missing_keys_soln_deps) }.to raise_error(ChefDK::InvalidLockfile)
 
         missing_policyfile_key = valid_lock_data.dup
-        missing_policyfile_key["solution_dependencies"] = {"dependencies" => {} }
+        missing_policyfile_key["solution_dependencies"] = { "dependencies" => {} }
         expect { lockfile.build_from_lock_data(missing_policyfile_key) }.to raise_error(ChefDK::InvalidLockfile)
 
         missing_dependencies_key = valid_lock_data.dup
@@ -207,11 +207,11 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
 
       it "requires the Policyfile dependencies be an Array" do
         invalid_policyfile_deps = valid_lock_data.dup
-        invalid_policyfile_deps["solution_dependencies"] = {"Policyfile" => 42, "dependencies" => {} }
+        invalid_policyfile_deps["solution_dependencies"] = { "Policyfile" => 42, "dependencies" => {} }
         expect { lockfile.build_from_lock_data(invalid_policyfile_deps) }.to raise_error(ChefDK::InvalidLockfile)
       end
 
-      it %q(requires the Policyfile dependencies be formatted like [ "COOKBOOK_NAME", "CONSTRAINT" ]) do
+      it %q{requires the Policyfile dependencies be formatted like [ "COOKBOOK_NAME", "CONSTRAINT" ]} do
         invalid_policyfile_deps_content = valid_lock_data.dup
         invalid_policyfile_deps_content["solution_dependencies"] = { "Policyfile" => [ "bad" ], "dependencies" => {} }
         expect { lockfile.build_from_lock_data(invalid_policyfile_deps_content) }.to raise_error(ChefDK::InvalidLockfile)
@@ -221,7 +221,7 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
         expect { lockfile.build_from_lock_data(invalid_policyfile_deps_content2) }.to raise_error(ChefDK::InvalidLockfile)
 
         invalid_policyfile_deps_content3 = valid_lock_data.dup
-        invalid_policyfile_deps_content3["solution_dependencies"] = { "Policyfile" => [ ["cookbook_name", "bad"] ], "dependencies" => {} }
+        invalid_policyfile_deps_content3["solution_dependencies"] = { "Policyfile" => [ %w{cookbook_name bad} ], "dependencies" => {} }
         expect { lockfile.build_from_lock_data(invalid_policyfile_deps_content3) }.to raise_error(ChefDK::InvalidLockfile)
       end
 
@@ -263,7 +263,7 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
           "identifier" => "68c13b136a49b4e66cfe9d8aa2b5a85167b5bf9b",
           "dotted_decimal_identifier" => "111.222.333",
           "cache_key" => "foo-1.0.0",
-          "source_options" => {}
+          "source_options" => {},
         }
       end
 
@@ -386,8 +386,8 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
         "dotted_decimal_identifier" => "111.222.333",
         "cache_key" => nil,
         "source" => "path/to/foo",
-        "source_options" => { path: "path/to/foo"},
-        "scm_info" => nil
+        "source_options" => { path: "path/to/foo" },
+        "scm_info" => nil,
       }
     end
 
@@ -419,7 +419,6 @@ describe ChefDK::PolicyfileLock, "when reading a Policyfile.lock" do
       expect(locks["foo"].to_lock).to eq(valid_cookbook_lock)
     end
 
-
   end
 
 end

data/spec/unit/policyfile_lock_validation_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile_lock.rb'
+require "spec_helper"
+require "chef-dk/policyfile_lock.rb"
 
 describe ChefDK::PolicyfileLock, "validating locked cookbooks" do
 
@@ -42,7 +42,7 @@ describe ChefDK::PolicyfileLock, "validating locked cookbooks" do
 
   let(:name) { "application-server" }
 
-  let(:run_list) { [ 'recipe[erlang::default]', 'recipe[erchef::prereqs]', 'recipe[erchef::app]' ] }
+  let(:run_list) { [ "recipe[erlang::default]", "recipe[erchef::prereqs]", "recipe[erchef::app]" ] }
 
   let(:storage_config) do
     ChefDK::Policyfile::StorageConfig.new( cache_path: cache_path, relative_paths_root: local_cookbooks_root )
@@ -53,8 +53,8 @@ describe ChefDK::PolicyfileLock, "validating locked cookbooks" do
       "Policyfile" => [],
       "dependencies" => {
         "foo (1.0.0)" => [],
-        "local-cookbook (2.3.4)" => []
-      }
+        "local-cookbook (2.3.4)" => [],
+      },
     }
   end
 
@@ -114,7 +114,7 @@ describe ChefDK::PolicyfileLock, "validating locked cookbooks" do
     # Validate the metadata is correct, so we know the test setup code
     # hasn't done something wrong.
     def ensure_metadata_as_expected!
-      expected_metadata_rb=<<-E
+      expected_metadata_rb = <<-E
 name             'local-cookbook'
 maintainer       ''
 maintainer_email ''
@@ -157,7 +157,6 @@ version          '2.3.4'
 E
       end
 
-
       before do
         ensure_metadata_as_expected!
         with_file(metadata_path) { |f| f.print(new_metadata) }
@@ -216,8 +215,8 @@ E
         {
           "Policyfile" => [],
           "dependencies" => {
-            "foo (1.0.0)" => [ [ "local-cookbook", "~> 2.0" ] ]
-          }
+            "foo (1.0.0)" => [ [ "local-cookbook", "~> 2.0" ] ],
+          },
         }
       end
 
@@ -319,7 +318,7 @@ E
         actual = policyfile_lock.solution_dependencies.to_lock["dependencies"]
         expected = {
           "local-cookbook (2.3.4)" => [ ["foo", "= 1.0.0"] ],
-          "foo (1.0.0)" => []
+          "foo (1.0.0)" => [],
         }
         expect(actual).to eq(expected)
       end
@@ -363,8 +362,8 @@ E
           "Policyfile" => [],
           "dependencies" => {
             "foo (1.0.0)" => [],
-            "local-cookbook (2.3.4)" => [ ["foo", ">= 0.0.0"] ]
-          }
+            "local-cookbook (2.3.4)" => [ ["foo", ">= 0.0.0"] ],
+          },
         }
       end
 
@@ -393,7 +392,7 @@ E
         actual = policyfile_lock.solution_dependencies.to_lock["dependencies"]
         expected = {
           "local-cookbook (2.3.4)" => [ ["foo", ">= 1.0.0"] ],
-          "foo (1.0.0)" => []
+          "foo (1.0.0)" => [],
         }
         expect(actual).to eq(expected)
       end
@@ -428,7 +427,6 @@ E
         expect { policyfile_lock.validate_cookbooks! }.to raise_error(ChefDK::DependencyConflict, error_message)
       end
 
-
     end
 
     context "when a :path source cookbook has updated it's version and another path source cookbook has updated its constraint" do
@@ -471,8 +469,8 @@ E
           "dependencies" => {
             "foo (1.0.0)" => [],
             "local-cookbook (2.3.4)" => [ ],
-            "another-local-cookbook (0.1.0)" => [ ["local-cookbook", "= 2.3.4"] ]
-          }
+            "another-local-cookbook (0.1.0)" => [ ["local-cookbook", "= 2.3.4"] ],
+          },
         }
       end
 
@@ -505,7 +503,7 @@ E
       end
 
       let(:metadata_path_another_local_cookbook) do
-        File.join(local_cookbooks_root, 'another-local-cookbook', 'metadata.rb')
+        File.join(local_cookbooks_root, "another-local-cookbook", "metadata.rb")
       end
 
       before do
@@ -522,7 +520,7 @@ E
           expected = {
             "local-cookbook (3.0.0)" => [ ],
             "another-local-cookbook (0.1.0)" => [ [ "local-cookbook", "= 3.0.0" ] ],
-            "foo (1.0.0)" => []
+            "foo (1.0.0)" => [],
           }
           expect(actual).to eq(expected)
         end
@@ -543,7 +541,7 @@ E
     # Validate the metadata is correct, so we know the test setup code
     # hasn't done something wrong.
     def ensure_metadata_as_expected!
-      expected_metadata_rb=<<-E
+      expected_metadata_rb = <<-E
 name             'foo'
 maintainer       ''
 maintainer_email ''
@@ -608,4 +606,3 @@ E
     end
   end
 end
-

data/spec/unit/policyfile_services/clean_policies_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile_services/clean_policies'
+require "spec_helper"
+require "chef-dk/policyfile_services/clean_policies"
 
 describe ChefDK::PolicyfileServices::CleanPolicies do
 
@@ -97,12 +97,12 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
           {
             "appserver" => {
               "1111111111111111111111111111111111111111111111111111111111111111" => {},
-              "2222222222222222222222222222222222222222222222222222222222222222" => {}
+              "2222222222222222222222222222222222222222222222222222222222222222" => {},
             },
             "load-balancer" => {
               "5555555555555555555555555555555555555555555555555555555555555555" => {},
-              "6666666666666666666666666666666666666666666666666666666666666666" => {}
-            }
+              "6666666666666666666666666666666666666666666666666666666666666666" => {},
+            },
           }
         end
 
@@ -110,16 +110,16 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
           {
             "dev" => {
               "appserver" => "1111111111111111111111111111111111111111111111111111111111111111",
-              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555"
+              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555",
             },
             "staging" => {
               "appserver" => "2222222222222222222222222222222222222222222222222222222222222222",
-              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555"
+              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555",
             },
             "prod" => {
               "appserver" => "2222222222222222222222222222222222222222222222222222222222222222",
-              "load-balancer" => "6666666666666666666666666666666666666666666666666666666666666666"
-            }
+              "load-balancer" => "6666666666666666666666666666666666666666666666666666666666666666",
+            },
           }
         end
 
@@ -141,13 +141,13 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
             "appserver" => {
               "1111111111111111111111111111111111111111111111111111111111111111" => {},
               "2222222222222222222222222222222222222222222222222222222222222222" => {},
-              "4444444444444444444444444444444444444444444444444444444444444444" => {}
+              "4444444444444444444444444444444444444444444444444444444444444444" => {},
             },
             "load-balancer" => {
               "5555555555555555555555555555555555555555555555555555555555555555" => {},
               "6666666666666666666666666666666666666666666666666666666666666666" => {},
-              "7777777777777777777777777777777777777777777777777777777777777777" => {}
-            }
+              "7777777777777777777777777777777777777777777777777777777777777777" => {},
+            },
           }
         end
 
@@ -155,16 +155,16 @@ describe ChefDK::PolicyfileServices::CleanPolicies do
           {
             "dev" => {
               "appserver" => "1111111111111111111111111111111111111111111111111111111111111111",
-              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555"
+              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555",
             },
             "staging" => {
               "appserver" => "2222222222222222222222222222222222222222222222222222222222222222",
-              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555"
+              "load-balancer" => "5555555555555555555555555555555555555555555555555555555555555555",
             },
             "prod" => {
               "appserver" => "2222222222222222222222222222222222222222222222222222222222222222",
-              "load-balancer" => "6666666666666666666666666666666666666666666666666666666666666666"
-            }
+              "load-balancer" => "6666666666666666666666666666666666666666666666666666666666666666",
+            },
           }
         end
 

data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb

@@ -15,8 +15,8 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
-require 'chef-dk/policyfile_services/clean_policy_cookbooks'
+require "spec_helper"
+require "chef-dk/policyfile_services/clean_policy_cookbooks"
 
 describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
 
@@ -25,27 +25,27 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
       "mysql" => {
         "versions" => [
           {
-            "identifier" => "6b506252cae939c874bd59b560c339b01c31326b"
-          }
-        ]
+            "identifier" => "6b506252cae939c874bd59b560c339b01c31326b",
+          },
+        ],
       },
       "build-essential" => {
         "versions" => [
           {
-            "identifier" => "2db3df121028894f45497f847de91b91fbf76824"
+            "identifier" => "2db3df121028894f45497f847de91b91fbf76824",
           },
           {
-            "identifier" => "d8ce58401d154378599b0fead81d2c390615602b"
-          }
-        ]
-      }
+            "identifier" => "d8ce58401d154378599b0fead81d2c390615602b",
+          },
+        ],
+      },
     }
   end
 
   let(:cookbook_ids_by_name) do
     {
       "mysql" => [ "6b506252cae939c874bd59b560c339b01c31326b" ],
-      "build-essential" => [ "2db3df121028894f45497f847de91b91fbf76824", "d8ce58401d154378599b0fead81d2c390615602b" ]
+      "build-essential" => %w{2db3df121028894f45497f847de91b91fbf76824 d8ce58401d154378599b0fead81d2c390615602b},
     }
   end
 
@@ -60,15 +60,15 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
     {
       "aar" => {
         "revisions" => {
-          "37f9b658cdd1d9319bac8920581723efcc2014304b5f3827ee0779e10ffbdcc9" => { }
-        }
+          "37f9b658cdd1d9319bac8920581723efcc2014304b5f3827ee0779e10ffbdcc9" => {},
+        },
       },
       "jenkins" => {
         "revisions" => {
-          "613f803bdd035d574df7fa6da525b38df45a74ca82b38b79655efed8a189e073" => { },
-          "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb" => { }
-        }
-      }
+          "613f803bdd035d574df7fa6da525b38df45a74ca82b38b79655efed8a189e073" => {},
+          "6fe753184c8946052d3231bb4212116df28d89a3a5f7ae52832ad408419dd5eb" => {},
+        },
+      },
     }
   end
 
@@ -87,7 +87,6 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
     described_class.new(ui: ui, config: chef_config)
   end
 
-
   it "configures an HTTP client with the user's credentials" do
     expect(ChefDK::AuthenticatedHTTP).to receive(:new).with("https://localhost:10443",
                                                        signing_key_filename: "/path/to/client/key.pem",
@@ -160,8 +159,8 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
       let(:policy_aar_37f9b65) do
         {
           "cookbook_locks" => {
-            "mysql" => { "identifier" => "6b506252cae939c874bd59b560c339b01c31326b" }
-          }
+            "mysql" => { "identifier" => "6b506252cae939c874bd59b560c339b01c31326b" },
+          },
         }
       end
 
@@ -169,8 +168,8 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
         {
           "cookbook_locks" => {
             "mysql" => { "identifier" => "6b506252cae939c874bd59b560c339b01c31326b" },
-            "build-essential" => { "identifier" => "2db3df121028894f45497f847de91b91fbf76824" }
-          }
+            "build-essential" => { "identifier" => "2db3df121028894f45497f847de91b91fbf76824" },
+          },
         }
       end
 
@@ -178,8 +177,8 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
         {
           "cookbook_locks" => {
             "mysql" => { "identifier" => "6b506252cae939c874bd59b560c339b01c31326b" },
-            "build-essential" => { "identifier" => "d8ce58401d154378599b0fead81d2c390615602b" }
-          }
+            "build-essential" => { "identifier" => "d8ce58401d154378599b0fead81d2c390615602b" },
+          },
         }
       end
 
@@ -195,7 +194,6 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
           and_return(policy_jenkins_6fe7531)
       end
 
-
       context "and all cookbooks are active" do
 
         it "lists all the cookbooks" do
@@ -223,15 +221,15 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
             "cookbook_locks" => {
               "mysql" => { "identifier" => "6b506252cae939c874bd59b560c339b01c31326b" },
               # this is changed to reference the same cookbook as policy_jenkins_613f803
-              "build-essential" => { "identifier" => "2db3df121028894f45497f847de91b91fbf76824" }
-            }
+              "build-essential" => { "identifier" => "2db3df121028894f45497f847de91b91fbf76824" },
+            },
           }
         end
 
         let(:expected_active_cookbooks) do
           {
             "mysql" => Set.new([ "6b506252cae939c874bd59b560c339b01c31326b" ]),
-            "build-essential" => Set.new([ "2db3df121028894f45497f847de91b91fbf76824" ])
+            "build-essential" => Set.new([ "2db3df121028894f45497f847de91b91fbf76824" ]),
           }
         end
 
@@ -272,4 +270,3 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
   end
 
 end
-