chef-cli 2.0.0 → 3.0.9

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
+# Copyright:: Copyright (c) 2014-2020 Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -129,7 +129,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
 
     it "warns if a hyphenated cookbook name is passed" do
       expect(with_argv(%w{my-cookbook}).run).to eq(0)
-      message = "Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef.html#chef-generate-cookbook for more information."
+      message = "Hyphens are discouraged in cookbook names as they may cause problems with custom resources. See https://docs.chef.io/ctl_chef/#chef-generate-cookbook for more information."
       expect(stdout_io.string).to include(message)
     end
 
@@ -269,7 +269,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               # Cookbook:: build_cookbook
               # Recipe:: publish
               #
-              # Copyright:: 2019, The Authors, All Rights Reserved.
+              # Copyright:: #{DateTime.now.year}, The Authors, All Rights Reserved.
 
               include_recipe 'delivery-truck::publish'
             CONFIG_DOT_JSON
@@ -523,7 +523,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
             # Policyfile.rb - Describe how you want Chef Infra Client to build your system.
             #
             # For more information on the Policyfile feature, visit
-            # https://docs.chef.io/policyfile.html
+            # https://docs.chef.io/policyfile/
 
             # A name that describes what the system you're building with Chef does.
             name 'new_cookbook'
@@ -571,16 +571,16 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               name: chef_zero
 
               ## product_name and product_version specifies a specific Chef product and version to install.
-              ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
+              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
               #  product_name: chef
-              #  product_version: 15
+              #  product_version: 16
 
             verifier:
               name: inspec
 
             platforms:
-              - name: ubuntu-18.04
-              - name: centos-7
+              - name: ubuntu-20.04
+              - name: centos-8
 
             suites:
               - name: default
@@ -658,16 +658,16 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               always_update_cookbooks: true
 
               ## product_name and product_version specifies a specific Chef product and version to install.
-              ## see the Chef documentation for more details: https://docs.chef.io/config_yml_kitchen.html
+              ## see the Chef documentation for more details: https://docs.chef.io/workstation/config_yml_kitchen/
               #  product_name: chef
-              #  product_version: 15
+              #  product_version: 16
 
             verifier:
               name: inspec
 
             platforms:
-              - name: ubuntu-18.04
-              - name: centos-7
+              - name: ubuntu-20.04
+              - name: centos-8
 
             suites:
               - name: default

data/spec/unit/command/generator_commands/policyfile_spec.rb

@@ -118,7 +118,7 @@ describe ChefCLI::Command::GeneratorCommands::Policyfile do
         # Policyfile.rb - Describe how you want Chef Infra Client to build your system.
         #
         # For more information on the Policyfile feature, visit
-        # https://docs.chef.io/policyfile.html
+        # https://docs.chef.io/policyfile/
 
         # A name that describes what the system you're building with Chef does.
         name 'my-app-frontend'

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -231,7 +231,7 @@ describe ChefCLI::Command::GeneratorCommands::Repo do
             let(:argv) { ["new_repo", "--policy-only" ] }
 
             it "tells you whats up" do
-              expect(file_contents).to match(/This directory typically contains Chef cookbooks/)
+              expect(file_contents).to match(/This directory typically contains Chef Infra cookbooks/)
             end
           end
         end
@@ -331,9 +331,9 @@ describe ChefCLI::Command::GeneratorCommands::Repo do
 
                     knife role from file roles/example.json
 
-                For more information on roles, see the Chef docs site:
+                For more information on roles, see the Chef Infra docs site:
 
-                https://docs.chef.io/roles.html
+                https://docs.chef.io/roles/
               README
             end
 
@@ -355,9 +355,9 @@ describe ChefCLI::Command::GeneratorCommands::Repo do
 
                     knife environment from file environments/example.json
 
-                For more information on environments, see the Chef docs site:
+                For more information on environments, see the Chef Infra docs site:
 
-                https://docs.chef.io/environments.html
+                https://docs.chef.io/environments/
               README
             end
 

data/spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb

@@ -0,0 +1,84 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Marc Paradsie <marc.paradise@gmail.com>
+#
+# Copyright (C) 2020 Chef Software Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "../../../spec_helper"
+
+require "kitchen"
+require "kitchen/provisioner/chef_zero_capture"
+
+describe Kitchen::Provisioner::ChefZeroCapture do
+  let(:logged_output)   { StringIO.new }
+  let(:logger)          { Logger.new(logged_output) }
+  let(:kitchen_root) { Dir.mktmpdir }
+
+  let(:config) do
+    { test_base_path: "/t", base_path: "/b", kitchen_root: kitchen_root, root_path: kitchen_root }
+  end
+  let(:platform)        { double("platform", os_type: nil) }
+  let(:suite)           { double("suite", name: "fried") }
+
+  let(:instance_config) do
+    double("config", name: "coolbeans", logger: logger, suite: suite, platform: platform)
+  end
+
+  subject do
+    p = Kitchen::Provisioner::ChefZeroCapture.new(config)
+    p.finalize_config!(instance_config)
+  end
+
+  after do
+    FileUtils.remove_entry(kitchen_root)
+  end
+
+  describe "#create_sandbox" do
+    let(:sandbox_mock) do
+      double("sandbox", populate: nil)
+    end
+    before do
+      allow(Kitchen::Provisioner::ChefZeroCaptureSandbox).to receive(:new).and_return sandbox_mock
+    end
+
+    it "initializes files and populates a ChefZeroCaptureSandbox" do
+      expect(subject).to receive(:prepare_validation_pem)
+      expect(subject).to receive(:prepare_config_rb)
+      expect(sandbox_mock).to receive(:populate)
+      subject.create_sandbox
+    end
+
+    after do
+      begin
+        subject.cleanup_sandbox
+      rescue # rubocop:disable Lint/HandleExceptions
+      end
+    end
+  end
+
+  describe "#default_config_rb" do
+    it "contains keys that suggest 'super' was invoked for full config_rb setup" do
+      cfg = subject.default_config_rb
+      expect(cfg[:node_path]).to eq File.join(kitchen_root, "nodes")
+    end
+
+    it "adds the expected correct config for captured nodes" do
+      cfg = subject.default_config_rb
+      expect(cfg[:policies_path]).to eq File.join(kitchen_root, "policies")
+      expect(cfg[:cookbook_artifacts_path]).to eq File.join(kitchen_root, "cookbook_artifacts")
+      expect(cfg[:policy_groups_path]).to eq File.join(kitchen_root, "policy_groups")
+    end
+  end
+end

data/spec/unit/policyfile/cookbook_location_specification_spec.rb

@@ -143,13 +143,18 @@ describe ChefCLI::Policyfile::CookbookLocationSpecification do
       allow(cookbook_location_spec).to receive(:cookbook_path).and_return(cookbook_path)
 
       default_recipe_path = install_path.join("recipes/default.rb")
+      default_yml_recipe_path = install_path.join("recipes/default.yml")
       nope_recipe_path = install_path.join("recipes/nope.rb")
+      nope_yml_recipe_path = install_path.join("recipes/nope.yml")
 
       expect(cookbook_path).to receive(:join).with("recipes/default.rb").and_return(default_recipe_path)
+      expect(cookbook_path).to receive(:join).with("recipes/default.yml").and_return(default_yml_recipe_path)
       expect(cookbook_path).to receive(:join).with("recipes/nope.rb").and_return(nope_recipe_path)
+      expect(cookbook_path).to receive(:join).with("recipes/nope.yml").and_return(nope_yml_recipe_path)
 
       expect(default_recipe_path).to receive(:exist?).and_return(true)
       expect(nope_recipe_path).to receive(:exist?).and_return(false)
+      expect(nope_yml_recipe_path).to receive(:exist?).and_return(false)
 
       expect(cookbook_location_spec.cookbook_has_recipe?("default")).to be(true)
       expect(cookbook_location_spec.cookbook_has_recipe?("nope")).to be(false)

data/spec/unit/policyfile/uploader_spec.rb

@@ -319,14 +319,14 @@ describe ChefCLI::Policyfile::Uploader do
 
       it "does not error when the 'policyfiles' data bag exists" do
         response = double("Net::HTTP response", code: "409")
-        error = Net::HTTPServerException.new("conflict", response)
+        error = Net::HTTPClientException.new("conflict", response)
         expect(http_client).to receive(:post).with("data", { "name" => "policyfiles" }).and_raise(error)
         expect { uploader.data_bag_create }.to_not raise_error
       end
 
       it "uploads the policyfile as a data bag item" do
         response = double("Net::HTTP response", code: "404")
-        error = Net::HTTPServerException.new("Not Found", response)
+        error = Net::HTTPClientException.new("Not Found", response)
         expect(http_client).to receive(:put)
           .with("data/policyfiles/example-unit-test", policyfile_as_data_bag_item)
           .and_raise(error)

data/spec/unit/policyfile_lock_build_spec.rb

@@ -22,7 +22,7 @@ require "shared/fixture_cookbook_checksums"
 require "chef-cli/policyfile/storage_config"
 require "chef-cli/policyfile_lock.rb"
 
-describe ChefCLI::PolicyfileLock, "building a lockfile" do
+describe ChefCLI::PolicyfileLock, "building a lockfile", :skip_on_windows do
 
   include_context "fixture cookbooks checksums"
 

data/spec/unit/policyfile_services/clean_policies_spec.rb

@@ -211,6 +211,8 @@ describe ChefCLI::PolicyfileServices::CleanPolicies do
           end
 
           it "deletes what it can, then raises an error" do
+            # Ruby 2.6 deprecated HTTPServerException but the errors are still initialized using it, so
+            # this will continue to print that out until they remove HTTPServerException
             expected_message = <<~ERROR
               Failed to delete some policy revisions:
               - appserver (4444444444444444444444444444444444444444444444444444444444444444): Net::HTTPServerException 403 \"Unauthorized\"

data/spec/unit/policyfile_services/update_attributes_spec.rb

@@ -176,7 +176,7 @@ describe ChefCLI::PolicyfileServices::UpdateAttributes do
           expect(ChefCLI::Policyfile::LockApplier).to receive(:new).with(
             update_attrs_service.policyfile_lock, update_attrs_service.policyfile_compiler
           ).and_return(lock_applier)
-          expect(lock_applier).not_to receive(:with_unlocked_policies)
+          expect(lock_applier).to receive(:with_unlocked_policies).with(:all).and_return(lock_applier)
           expect(lock_applier).to receive(:apply!)
 
           update_attrs_service.run

data/spec/unit/service_exception_inspectors/http_spec.rb

@@ -64,7 +64,7 @@ describe ChefCLI::ServiceExceptionInspectors::HTTP do
   end
 
   let(:exception) do
-    Net::HTTPServerException.new(message, response).tap { |e| e.chef_rest_request = request }
+    Net::HTTPClientException.new(message, response).tap { |e| e.chef_rest_request = request }
   end
 
   subject(:inspector) { described_class.new(exception) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.9
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2020-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '14.0'
+        version: '15.0'
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: 2.3.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: 2.3.5
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: cookbook-omnifetch
   requirement: !ruby/object:Gem::Requirement
@@ -170,16 +170,22 @@ dependencies:
   name: paint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +389,7 @@ files:
 - lib/chef-cli/skeletons/code_generator/templates/default/template.erb
 - lib/chef-cli/ui.rb
 - lib/chef-cli/version.rb
+- lib/kitchen/provisioner/chef_zero_capture.rb
 - lib/kitchen/provisioner/policyfile_zero.rb
 - spec/shared/a_file_generator.rb
 - spec/shared/a_generated_file.rb
@@ -521,6 +528,7 @@ files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb
 - spec/unit/policyfile/attribute_merge_checker_spec.rb
@@ -586,7 +594,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -735,6 +743,7 @@ test_files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb
 - spec/unit/policyfile/attribute_merge_checker_spec.rb