chef-dk 4.1.7 → 4.2.0

data/spec/unit/policyfile/git_lock_fetcher_spec.rb

@@ -141,11 +141,11 @@ describe ChefDK::Policyfile::GitLockFetcher do
         expect(
           relative_path_fetcher.lock_data["cookbook_locks"][cookbook_name]["source_options"]
         ).to match(
-               {
-                 "git" => repo,
-                 "revision" => git_revision,
-               }
-             )
+          {
+            "git" => repo,
+            "revision" => git_revision,
+          }
+        )
         expect(
           relative_path_fetcher.lock_data["cookbook_locks"][cookbook_name]["source_options"]
         ).not_to match(source_options_rel)

data/spec/unit/policyfile/included_policies_cookbook_source_spec.rb

@@ -69,7 +69,7 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
         "cache_key" => "#{cookbook_info[:name]}-#{cookbook_info[:version]}",
         "origin" => "uri",
         "source_options" => { "version" => cookbook_info[:version] }.tap do |so|
-          so["nonce"] = nonce if !nonce.nil?
+          so["nonce"] = nonce unless nonce.nil?
         end,
       }
       acc
@@ -222,7 +222,8 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
 
       it "raises an error when check_for_conflicts! is called" do
         expect { cookbook_source.check_for_conflicts! }.to raise_error(
-          ChefDK::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookSources)
+          ChefDK::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookSources
+        )
       end
     end
 
@@ -231,7 +232,8 @@ describe ChefDK::Policyfile::IncludedPoliciesCookbookSource do
 
       it "raises an error when check_for_conflicts! is called" do
         expect { cookbook_source.check_for_conflicts! }.to raise_error(
-          ChefDK::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookVersions)
+          ChefDK::Policyfile::IncludedPoliciesCookbookSource::ConflictingCookbookVersions
+        )
       end
     end
 

data/spec/unit/policyfile/lister_spec.rb

@@ -26,9 +26,9 @@ describe ChefDK::Policyfile::Lister do
 
   let(:config) do
     double("Chef::Config",
-           chef_server_url: "https://localhost:10443",
-           client_key: "/path/to/client/key.pem",
-           node_name: "deuce")
+      chef_server_url: "https://localhost:10443",
+      client_key: "/path/to/client/key.pem",
+      node_name: "deuce")
   end
 
   let(:http_client) { instance_double(Chef::ServerAPI) }
@@ -39,8 +39,8 @@ describe ChefDK::Policyfile::Lister do
 
   it "configures an HTTP client" do
     expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
-                                                       signing_key_filename: "/path/to/client/key.pem",
-                                                       client_name: "deuce")
+      signing_key_filename: "/path/to/client/key.pem",
+      client_name: "deuce")
     info_fetcher.http_client
   end
 

data/spec/unit/policyfile/local_lock_fetcher_spec.rb

@@ -70,7 +70,7 @@ describe ChefDK::Policyfile::LocalLockFetcher do
     end
   end
 
-  [:relative, :absolute].each do |mode|
+  %i{relative absolute}.each do |mode|
     context "When path is #{mode}" do
       let(:path) { "foo/bar/baz/foo.lock.json" }
       let(:lock_file_path_abs) { "#{tempdir}/#{path}" }

data/spec/unit/policyfile/lock_applier_spec.rb

@@ -27,12 +27,12 @@ describe ChefDK::Policyfile::LockApplier do
 
   let(:included_policy_1) do
     instance_double("ChefDK::Policyfile::PolicyfileLocationSpec",
-                    name: "policy1")
+      name: "policy1")
   end
 
   let(:included_policy_2) do
     instance_double("ChefDK::Policyfile::PolicyfileLocationSpec",
-                    name: "policy2")
+      name: "policy2")
   end
 
   let(:included_policy_lock_1) do

data/spec/unit/policyfile/reports/install_spec.rb

@@ -42,18 +42,18 @@ describe ChefDK::Policyfile::Reports::Install do
 
     let(:fixed_version_cookbook_one) do
       instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: false,
-                      name: "short-name",
-                      version_constraint: ">= 0.0.0",
-                      source_type: :git)
+        installed?: false,
+        name: "short-name",
+        version_constraint: ">= 0.0.0",
+        source_type: :git)
     end
 
     let(:fixed_version_cookbook_two) do
       instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: true,
-                      name: "this-name-is-longer",
-                      version_constraint: "~> 10.0.0",
-                      source_type: :path)
+        installed?: true,
+        name: "this-name-is-longer",
+        version_constraint: "~> 10.0.0",
+        source_type: :path)
     end
 
     let(:fixed_version_cookbooks) do
@@ -80,16 +80,16 @@ describe ChefDK::Policyfile::Reports::Install do
 
     let(:cookbook_one) do
       instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: false,
-                      name: "short-name",
-                      version_constraint: Semverse::Constraint.new("= 10.0.4"))
+        installed?: false,
+        name: "short-name",
+        version_constraint: Semverse::Constraint.new("= 10.0.4"))
     end
 
     let(:cookbook_two) do
       instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      installed?: true,
-                      name: "this-name-is-longer",
-                      version_constraint: Semverse::Constraint.new("= 1.2.3"))
+        installed?: true,
+        name: "this-name-is-longer",
+        version_constraint: Semverse::Constraint.new("= 1.2.3"))
     end
 
     let(:graph_solution_cookbooks) do

data/spec/unit/policyfile/reports/upload_spec.rb

@@ -50,9 +50,9 @@ describe ChefDK::Policyfile::Reports::Upload do
 
     def cb_with_lock(name, version, identifier)
       lock = instance_double("ChefDK::Policyfile::CookbookLock",
-                             name: name,
-                             version: version,
-                             identifier: identifier)
+        name: name,
+        version: version,
+        identifier: identifier)
 
       ChefDK::Policyfile::Uploader::LockedCookbookForUpload.new(nil, lock)
     end

data/spec/unit/policyfile/uploader_spec.rb

@@ -48,7 +48,8 @@ describe ChefDK::Policyfile::Uploader do
 
   let(:policyfile_lock) do
     instance_double("ChefDK::PolicyfileLock", name: "example",
-                                              to_lock: policyfile_lock_data) end
+                                              to_lock: policyfile_lock_data)
+  end
 
   let(:policy_group) { "unit-test" }
 
@@ -58,9 +59,9 @@ describe ChefDK::Policyfile::Uploader do
 
   let(:uploader) do
     described_class.new(policyfile_lock,
-                        policy_group,
-                        http_client: http_client,
-                        policy_document_native_api: policy_document_native_api)
+      policy_group,
+      http_client: http_client,
+      policy_document_native_api: policy_document_native_api)
   end
 
   let(:policyfile_as_data_bag_item) do
@@ -101,16 +102,16 @@ describe ChefDK::Policyfile::Uploader do
       cache_path = "/home/user/cache_path/#{name}"
 
       lock = instance_double("ChefDK::Policyfile::CookbookLock",
-                             name: name,
-                             version: "1.0.0",
-                             identifier: identifier,
-                             dotted_decimal_identifier: dotted_decimal_id,
-                             cookbook_path: cache_path)
+        name: name,
+        version: "1.0.0",
+        identifier: identifier,
+        dotted_decimal_identifier: dotted_decimal_id,
+        cookbook_path: cache_path)
 
       cookbook_version = instance_double("Chef::CookbookVersion",
-                                         name: name,
-                                         identifier: lock.identifier,
-                                         version: dotted_decimal_id)
+        name: name,
+        identifier: lock.identifier,
+        version: dotted_decimal_id)
 
       allow(cookbook_version).to receive(:identifier=).with(lock.identifier)
 

data/spec/unit/policyfile_demands_spec.rb

@@ -208,10 +208,10 @@ describe ChefDK::PolicyfileCompiler, "when expressing the Policyfile graph deman
       s << " #{remote_cb_source_opts}"
 
       instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      name: "remote-cb",
-                      version_constraint: Semverse::Constraint.new("= 1.1.1"),
-                      ensure_cached: nil,
-                      to_s: s)
+        name: "remote-cb",
+        version_constraint: Semverse::Constraint.new("= 1.1.1"),
+        ensure_cached: nil,
+        to_s: s)
     end
 
     before do

data/spec/unit/policyfile_includes_spec.rb

@@ -247,7 +247,8 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
 
       it "emits a lockfile where cookbooks pulled from the upstream are at identical versions" do
         expect(policyfile_lock.to_lock["solution_dependencies"]["dependencies"]).to(
-          have_key("cookbookC (2.0.0)"))
+          have_key("cookbookC (2.0.0)")
+        )
       end
     end
 
@@ -266,7 +267,8 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
         let(:run_list) { [] }
         it "it defaults to those provided in the included policy lock" do
           expect(policyfile_lock.to_lock["solution_dependencies"]["dependencies"]).to(
-            have_key("cookbookC (2.0.0)"))
+            have_key("cookbookC (2.0.0)")
+          )
         end
       end
 
@@ -309,7 +311,8 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
 
         it "solves the dependencies added by the top-level policyfile and emits them in the lockfile" do
           expect(policyfile_lock.to_lock["solution_dependencies"]["dependencies"]).to(
-            have_key("cookbookC (2.0.0)"))
+            have_key("cookbookC (2.0.0)")
+          )
         end
 
       end
@@ -375,7 +378,8 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing all attribute conflicts" do
           expect { policyfile_lock.to_lock }.to raise_error(
             ChefDK::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]")
+            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]"
+          )
         end
       end
     end
@@ -425,7 +429,8 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing all attribute conflicts" do
           expect { policyfile_lock.to_lock }.to raise_error(
             ChefDK::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]")
+            "Attribute '[shared][foo]' provided conflicting values by the following sources [\"user-specified\", \"included\"]"
+          )
         end
       end
     end
@@ -652,7 +657,8 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing the conflict" do
           expect { policyfile_lock }.to raise_error(
             ChefDK::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]")
+            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]"
+          )
         end
       end
     end
@@ -711,7 +717,8 @@ describe ChefDK::PolicyfileCompiler, "including upstream policy locks" do
         it "raises an error describing the conflict" do
           expect { policyfile_lock }.to raise_error(
             ChefDK::Policyfile::AttributeMergeChecker::ConflictError,
-            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]")
+            "Attribute '[conflict][foo]' provided conflicting values by the following sources [\"included\", \"included2\"]"
+          )
         end
       end
     end

data/spec/unit/policyfile_install_with_includes_spec.rb

@@ -162,10 +162,10 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from included policies" d
 
     allow(ChefDK::Policyfile::CookbookLocationSpecification).to receive(:new) do |cookbook_name, version_constraint, source_opts, storage_config|
       double = instance_double("ChefDK::Policyfile::CookbookLocationSpecification",
-                      name: cookbook_name,
-                      version_constraint: Semverse::Constraint.new(version_constraint),
-                      ensure_cached: nil,
-                      to_s: "#{cookbook_name} #{version_constraint}")
+        name: cookbook_name,
+        version_constraint: Semverse::Constraint.new(version_constraint),
+        ensure_cached: nil,
+        to_s: "#{cookbook_name} #{version_constraint}")
       allow(double).to receive(:cookbook_has_recipe?).and_return(true)
       allow(double).to receive(:installed?).and_return(true)
       allow(double).to receive(:mirrors_canonical_upstream?).and_return(true)
@@ -207,8 +207,8 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from included policies" d
         allow(mock).to receive(:validate!)
         allow(mock).to receive(:cookbook_version) do
           instance_double("Chef::CookbookVersion",
-                          version: mock.source_options[:version],
-                          manifest_records_by_path: [])
+            version: mock.source_options[:version],
+            manifest_records_by_path: [])
         end
         mock
       end
@@ -226,7 +226,8 @@ describe ChefDK::PolicyfileLock, "installing cookbooks from included policies" d
             "revision_id" => "myrevisionid",
             "source_options" => lock_source_options,
           },
-        ])
+        ]
+      )
     end
   end
 end

data/spec/unit/policyfile_lock_build_spec.rb

@@ -30,7 +30,7 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
   def expect_hash_equal(actual, expected)
     expected.each do |key, expected_value|
       expect(actual).to have_key(key)
-      if expected_value.kind_of?(Hash)
+      if expected_value.is_a?(Hash)
         expect_hash_equal(actual[key], expected_value)
       else
         expect(actual[key]).to eq(expected_value)
@@ -876,18 +876,18 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
 
     let(:cached_location_spec) do
       double( "ChefDK::Policyfile::CookbookLocationSpecification",
-              mirrors_canonical_upstream?: true,
-              cache_key: "foo-1.0.0",
-              uri: cached_cookbook_uri,
-              source_options_for_lock: { "artifactserver" => cached_cookbook_uri, "version" => "1.0.0" })
+        mirrors_canonical_upstream?: true,
+        cache_key: "foo-1.0.0",
+        uri: cached_cookbook_uri,
+        source_options_for_lock: { "artifactserver" => cached_cookbook_uri, "version" => "1.0.0" })
     end
 
     let(:local_location_spec) do
       double( "ChefDK::Policyfile::CookbookLocationSpecification",
-              mirrors_canonical_upstream?: false,
-              relative_paths_root: relative_paths_root,
-              relative_path: "bar",
-              source_options_for_lock: { "path" => "bar" })
+        mirrors_canonical_upstream?: false,
+        relative_paths_root: relative_paths_root,
+        relative_path: "bar",
+        source_options_for_lock: { "path" => "bar" })
     end
 
     let(:policyfile_solution_dependencies) do
@@ -933,15 +933,14 @@ describe ChefDK::PolicyfileLock, "building a lockfile" do
 
     let(:policyfile_compiler) do
       double( "ChefDK::PolicyfileCompiler",
-              name: "my-policyfile",
-              normalized_run_list: %w{recipe[foo::default] recipe[bar::default]},
-              normalized_named_run_lists: { "rl2" => %w{recipe[bar::default]} },
-              all_cookbook_location_specs: { "foo" => cached_location_spec, "bar" => local_location_spec },
-              solution_dependencies: policyfile_solution_dependencies,
-              default_attributes: policyfile_default_attrs,
-              override_attributes: policyfile_override_attrs,
-              included_policies: []
-            )
+        name: "my-policyfile",
+        normalized_run_list: %w{recipe[foo::default] recipe[bar::default]},
+        normalized_named_run_lists: { "rl2" => %w{recipe[bar::default]} },
+        all_cookbook_location_specs: { "foo" => cached_location_spec, "bar" => local_location_spec },
+        solution_dependencies: policyfile_solution_dependencies,
+        default_attributes: policyfile_default_attrs,
+        override_attributes: policyfile_override_attrs,
+        included_policies: [])
     end
 
     let(:policyfile_lock) do

data/spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb

@@ -78,9 +78,9 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
 
   let(:chef_config) do
     double("Chef::Config",
-           chef_server_url: "https://localhost:10443",
-           client_key: "/path/to/client/key.pem",
-           node_name: "deuce")
+      chef_server_url: "https://localhost:10443",
+      client_key: "/path/to/client/key.pem",
+      node_name: "deuce")
   end
 
   subject(:clean_policy_cookbooks_service) do
@@ -89,8 +89,8 @@ describe ChefDK::PolicyfileServices::CleanPolicyCookbooks do
 
   it "configures an HTTP client with the user's credentials" do
     expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
-                                                       signing_key_filename: "/path/to/client/key.pem",
-                                                       client_name: "deuce")
+      signing_key_filename: "/path/to/client/key.pem",
+      client_name: "deuce")
     clean_policy_cookbooks_service.http_client
   end
 

data/spec/unit/policyfile_services/push_archive_spec.rb

@@ -98,10 +98,10 @@ describe ChefDK::PolicyfileServices::PushArchive do
 
   let(:config) do
     double("Chef::Config",
-           chef_server_url: "https://localhost:10443",
-           client_key: "/path/to/client/key.pem",
-           node_name: "deuce",
-           policy_document_native_api: true)
+      chef_server_url: "https://localhost:10443",
+      client_key: "/path/to/client/key.pem",
+      node_name: "deuce",
+      policy_document_native_api: true)
   end
 
   let(:ui) { TestHelpers::TestUI.new }
@@ -121,8 +121,8 @@ describe ChefDK::PolicyfileServices::PushArchive do
 
   it "configures an HTTP client" do
     expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
-                                                       signing_key_filename: "/path/to/client/key.pem",
-                                                       client_name: "deuce")
+      signing_key_filename: "/path/to/client/key.pem",
+      client_name: "deuce")
     push_archive_service.http_client
   end
 

data/spec/unit/policyfile_services/push_spec.rb

@@ -48,10 +48,10 @@ describe ChefDK::PolicyfileServices::Push do
 
   let(:config) do
     double("Chef::Config",
-           chef_server_url: "https://localhost:10443",
-           client_key: "/path/to/client/key.pem",
-           node_name: "deuce",
-           policy_document_native_api: policy_document_native_api)
+      chef_server_url: "https://localhost:10443",
+      client_key: "/path/to/client/key.pem",
+      node_name: "deuce",
+      policy_document_native_api: policy_document_native_api)
   end
 
   let(:ui) { TestHelpers::TestUI.new }
@@ -60,8 +60,8 @@ describe ChefDK::PolicyfileServices::Push do
 
   it "configures an HTTP client" do
     expect(Chef::ServerAPI).to receive(:new).with("https://localhost:10443",
-                                                       signing_key_filename: "/path/to/client/key.pem",
-                                                       client_name: "deuce")
+      signing_key_filename: "/path/to/client/key.pem",
+      client_name: "deuce")
     push_service.http_client
   end
 
@@ -190,8 +190,8 @@ describe ChefDK::PolicyfileServices::Push do
         expect(push_service).to receive(:http_client).and_return(http_client)
 
         expect(ChefDK::Policyfile::Uploader).to receive(:new)
-               .with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui, policy_document_native_api: policy_document_native_api)
-               .and_return(uploader)
+          .with(push_service.policyfile_lock, policy_group, http_client: http_client, ui: ui, policy_document_native_api: policy_document_native_api)
+          .and_return(uploader)
       end
 
       context "when the policy document native API is disabled" do