chef-cli 2.0.10 → 3.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ebc60c7c08e91010059db01bc99774da3a071cb08320ed2cedd0f3faec80efa
-  data.tar.gz: '08b56a1c62d520a03198a1c7e5dbbff004d967571945eb0049f665a7379e5e96'
+  metadata.gz: 52fb659d9d9b8f33e6a46e06ff25c62531d7098c0917da319078ab6c280b9f86
+  data.tar.gz: d0148fd63485171a17313682edec5a4bf0f62e6c19d0cb906dd150cbc8599bc1
 SHA512:
-  metadata.gz: fff531a5e154a54d3bc751ae067abfcf2febeae073d9ba22739fc814089fb3d019259ea7a4d04c71967b44c698543cadeefe0c5d0bc9fa51a2fc1541430ba9fd
-  data.tar.gz: 3bec22ca55b7f1c04e38695b5a1f26c4e308c996c613bf008fd17a66ec0bae8576ef9716f35cd126cad65b43d4b58436fb265c2df797edc5f9ad3694d5d09b57
+  metadata.gz: 93eca71e26052ee224039df9e0814dff270b0544976e95ed65b3877b14e7538f52e9c295fb8b26cd969c904f27d7fdad404fb6b5e471bc6e67db614795aa0a52
+  data.tar.gz: a6b3181c1531d4a91bf0c9a3670c4ee922c3849d849f7a2d61a00a04ab9911a3405dca60a26aff7f2aa08969b43a5092850fa4ca730d9bdfdf8f7ea0095294f3

data/Gemfile

@@ -9,21 +9,22 @@ group :docs do
 end
 
 group :test do
-  # For ruby 2.4 testing we need to use ohai 14
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5")
-    gem "ohai", "~> 14"
-  end
   gem "rake"
   gem "rspec", "~> 3.8"
   gem "rspec-expectations", "~> 3.8"
   gem "rspec-mocks", "~> 3.8"
   gem "cookstyle"
   gem "chefstyle"
+  gem "test-kitchen", "> 2.5"
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
+    gem "chef-zero", "~> 14"
+    gem "chef", "~> 15"
+  end
 end
 
 group :development do
   gem "pry"
   gem "pry-byebug"
-  gem "pry-stack_explorer"
+  gem "pry-stack_explorer", "~> 0.4.0"
   gem "rb-readline"
 end

data/chef-cli.gemspec

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2019, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.license       = "Apache-2.0"
   gem.homepage      = "https://www.chef.io/"
 
-  gem.required_ruby_version = ">= 2.4"
+  gem.required_ruby_version = ">= 2.5"
 
   gem.files = %w{Rakefile LICENSE} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks
@@ -43,7 +43,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   gem.add_dependency "ffi-yajl", ">= 1.0", "< 3.0"
   gem.add_dependency "minitar", "~> 0.6"
-  gem.add_dependency "chef", ">= 14.0"
+  gem.add_dependency "chef", ">= 15.0"
   gem.add_dependency "solve", "< 5.0", "> 2.0"
   gem.add_dependency "addressable", ">= 2.3.5", "< 2.8"
   gem.add_dependency "cookbook-omnifetch", "~> 0.5"

data/lib/chef-cli/cli.rb

@@ -122,7 +122,13 @@ module ChefCLI
         "Test Kitchen": "kitchen",
         "Cookstyle": "cookstyle",
       }.each do |name, cli|
-        result = Bundler.with_clean_env { shell_out("#{cli} --version") }
+        # @todo when Ruby 2.5/2.6 support goes away this if statement can go away
+        if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new("2")
+          result = Bundler.with_unbundled_env { shell_out("#{cli} --version") }
+        else
+          result = Bundler.with_clean_env { shell_out("#{cli} --version") }
+        end
+
         if result.exitstatus != 0
           msg("#{name} version: ERROR")
         else

data/lib/chef-cli/command/clean_policy_cookbooks.rb

@@ -37,7 +37,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/clean_policy_revisions.rb

@@ -36,7 +36,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/delete_policy.rb

@@ -36,7 +36,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/delete_policy_group.rb

@@ -36,7 +36,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/export.rb

@@ -41,7 +41,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/generator_commands/chef_exts/generator_desc_resource.rb

@@ -28,6 +28,7 @@ module ChefCLI
     # takes to create a cookbook.
     class GeneratorDesc < Chef::Resource
       resource_name :generator_desc
+      provides :generator_desc
 
       property :message, String, name_property: true
 

data/lib/chef-cli/command/generator_commands/cookbook.rb

@@ -216,7 +216,7 @@ module ChefCLI
           if !@cookbook_name_or_path
             @params_valid = false
           elsif /-/ =~ File.basename(@cookbook_name_or_path)
-            msg("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.")
+            msg("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.")
           end
 
           if config[:berks] && config[:policy]

data/lib/chef-cli/command/install.rb

@@ -40,7 +40,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/push.rb

@@ -38,7 +38,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/push_archive.rb

@@ -38,7 +38,7 @@ module ChefCLI
 
         For more information about Policyfiles, see our detailed README:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
       E

data/lib/chef-cli/command/show_policy.rb

@@ -40,7 +40,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/undelete.rb

@@ -47,7 +47,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/command/update.rb

@@ -43,7 +43,7 @@ module ChefCLI
 
         See our detailed README for more information:
 
-        https://docs.chef.io/policyfile.html
+        https://docs.chef.io/policyfile/
 
         Options:
 

data/lib/chef-cli/generator.rb

@@ -150,7 +150,7 @@ module ChefCLI
             along with this program.  If not, see <http://www.gnu.org/licenses/>.
           EOH
         else
-          raise ArgumentError, "Invalid generator.license setting: #{license}.  See available licenses at https://docs.chef.io/ctl_chef.html#chef-generate-cookbook"
+          raise ArgumentError, "Invalid generator.license setting: #{license}. See available licenses at https://docs.chef.io/ctl_chef/#chef-generate-cookbook"
         end
         if comment
           # Ensure there's no trailing whitespace

data/lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/kitchen.yml

@@ -11,7 +11,7 @@ provisioner:
   product_name: chefdk
 
 platforms:
-  - name: ubuntu-18.04
+  - name: ubuntu-20.04
   - name: centos-8
 
 suites:

data/lib/chef-cli/skeletons/code_generator/files/default/chefignore

@@ -10,10 +10,6 @@ Icon?
 nohup.out
 Thumbs.db
 
-# SASS #
-########
-.sass-cache
-
 # EDITORS #
 ###########
 .#*
@@ -26,11 +22,11 @@ Thumbs.db
 *.tmproj
 *~
 \#*
-mkmf.log
 REVISION
 TAGS*
 tmtags
 .vscode
+.editorconfig
 
 ## COMPILED ##
 ##############
@@ -43,6 +39,7 @@ tmtags
 *.so
 */rdoc/
 a.out
+mkmf.log
 
 # Testing #
 ###########
@@ -62,8 +59,6 @@ kitchen.yml*
 Procfile
 Rakefile
 spec/*
-spec/*
-spec/fixtures/*
 test/*
 
 # SCM #

data/lib/chef-cli/skeletons/code_generator/files/default/repo/README.md

@@ -13,7 +13,7 @@ This repository contains several directories, and each directory contains a READ
 
 # Configuration
 
-The config file, `.chef/config.rb` is a repository-specific configuration file for the knife command line tool. If you're using the Hosted Chef platform, you can download one for your organization from the management console. You can also generate a new config.rb by running `knife configure`. For more information about configuring Knife, see the Knife documentation at https://docs.chef.io/knife.html
+The config file, `.chef/config.rb` is a repository-specific configuration file for the knife command line tool. If you're using the Hosted Chef platform, you can download one for your organization from the management console. You can also generate a new config.rb by running `knife configure`. For more information about configuring Knife, see the Knife documentation at https://docs.chef.io/workstation/knife/
 
 # Next Steps
 

data/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/attributes/default.rb

@@ -4,4 +4,4 @@
 # Set a default name
 default['example']['name'] = 'Sam Doe'
 
-# For further information, see the Chef documentation (https://docs.chef.io/attributes.html).
+# For further information, see the Chef Infra documentation (https://docs.chef.io/attributes/).

data/lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/recipes/default.rb

@@ -5,4 +5,4 @@ log "Welcome to Chef Infra Client, #{node['example']['name']}!" do
   level :info
 end
 
-# For more information, see the documentation: https://docs.chef.io/recipes.html
+# For more information, see the documentation: https://docs.chef.io/recipes

data/lib/chef-cli/skeletons/code_generator/files/default/repo/data_bags/README.md

@@ -12,9 +12,9 @@ Then we can upload the items in the data bag's directory to the Chef Infra Serve
 
     knife data bag from file example example_item.json
 
-For more information on data bags, see the Chef docs site:
+For more information on data bags, see the Chef Infra docs site:
 
-https://docs.chef.io/data_bags.html
+https://docs.chef.io/data_bags/
 
 # Encrypted Data Bags
 
@@ -51,6 +51,6 @@ Use the secret_key to view the contents.
     password:  abc123
 
 
-For more information on encrypted data bags, see the Chef docs site:
+For more information on encrypted data bags, see the Chef Infra docs site:
 
-https://docs.chef.io/data_bags.html
+https://docs.chef.io/data_bags/

data/lib/chef-cli/skeletons/code_generator/files/default/repo/environments/README.md

@@ -4,6 +4,6 @@ For example, in this directory, you'll find an example environment file called `
 
     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/

data/lib/chef-cli/skeletons/code_generator/files/default/repo/roles/README.md

@@ -4,6 +4,6 @@ For example, in this directory, you'll find an example role file called `example
 
     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/

data/lib/chef-cli/skeletons/code_generator/metadata.rb

@@ -4,4 +4,4 @@ maintainer_email 'dev@chef.io'
 license          'Apache-2.0'
 description      'Generates Chef code for Chef CLI'
 version          '0.1.0'
-chef_version     '>= 14.0'
+chef_version     '>= 15.0'

data/lib/chef-cli/skeletons/code_generator/templates/default/CHANGELOG.md.erb

@@ -2,10 +2,9 @@
 
 This file is used to list changes made in each version of the <%= cookbook_name %> cookbook.
 
-# 0.1.0
+## 0.1.0
 
 Initial release.
 
 - change 0
 - change 1
-

data/lib/chef-cli/skeletons/code_generator/templates/default/Policyfile.rb.erb

@@ -1,7 +1,7 @@
 # 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 '<%= policy_name %>'

data/lib/chef-cli/skeletons/code_generator/templates/default/build_cookbook/metadata.rb.erb

@@ -3,7 +3,7 @@ maintainer '<%= copyright_holder %>'
 maintainer_email '<%= email %>'
 license '<%= license %>'
 version '0.1.0'
-chef_version '>= 14.0'
+chef_version '>= 15.0'
 <% if build_cookbook_parent_is_cookbook -%>
 
 depends 'delivery-truck'

data/lib/chef-cli/skeletons/code_generator/templates/default/helpers.rb.erb

@@ -1,6 +1,6 @@
 #
-# Chef Documentation
-# https://docs.chef.io/libraries.html
+# Chef Infra Documentation
+# https://docs.chef.io/libraries/
 #
 
 #

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb

@@ -17,15 +17,15 @@ provisioner:
   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: ubuntu-20.04
   - name: centos-8
 
 suites:

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb

@@ -14,9 +14,9 @@ verifier:
 platforms:
   # @see https://github.com/chef-cookbooks/testing_examples/blob/master/kitchen.dokken.yml
   # @see https://hub.docker.com/u/dokken
-  - name: ubuntu-18.04
+  - name: ubuntu-20.04
     driver:
-      image: dokken/ubuntu-18.04
+      image: dokken/ubuntu-20.04
       pid_one_command: /bin/systemd
       intermediate_instructions:
         - RUN /usr/bin/apt-get update

data/lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb

@@ -13,15 +13,15 @@ provisioner:
   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: ubuntu-20.04
   - name: centos-8
 
 suites:

data/lib/chef-cli/skeletons/code_generator/templates/default/metadata.rb.erb

@@ -4,7 +4,7 @@ maintainer_email '<%= email %>'
 license '<%= @spdx_license %>'
 description 'Installs/Configures <%= cookbook_name %>'
 version '0.1.0'
-chef_version '>= 14.0'
+chef_version '>= 15.0'
 
 # The `issues_url` points to the location where issues for this cookbook are
 # tracked.  A `View Issues` link will be displayed on this cookbook's page when

data/lib/chef-cli/skeletons/code_generator/templates/default/recipe_spec.rb.erb

@@ -7,20 +7,20 @@
 require 'spec_helper'
 
 describe '<%= cookbook_name %>::<%= recipe_name %>' do
-  context 'When all attributes are default, on Ubuntu 18.04' do
+  context 'When all attributes are default, on Ubuntu 20.04' do
     # for a complete list of available platforms and versions see:
     # https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md
-    platform 'ubuntu', '18.04'
+    platform 'ubuntu', '20.04'
 
     it 'converges successfully' do
       expect { chef_run }.to_not raise_error
     end
   end
 
-  context 'When all attributes are default, on CentOS 7' do
+  context 'When all attributes are default, on CentOS 8' do
     # for a complete list of available platforms and versions see:
     # https://github.com/chefspec/fauxhai/blob/master/PLATFORMS.md
-    platform 'centos', '7'
+    platform 'centos', '8'
 
     it 'converges successfully' do
       expect { chef_run }.to_not raise_error

data/lib/chef-cli/skeletons/code_generator/templates/default/resource.rb.erb

@@ -1 +1 @@
-# To learn more about Custom Resources, see https://docs.chef.io/custom_resources.html
+# To learn more about Custom Resources, see https://docs.chef.io/custom_resources/

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "2.0.10".freeze
+  VERSION = "3.0.10".freeze
 end

data/lib/kitchen/provisioner/chef_zero_capture.rb

@@ -0,0 +1,90 @@
+# -*- encoding: utf-8 -*-
+#
+# Author:: Marc Paradise <marc@chef.io>
+#
+# 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 "json"
+require "kitchen"
+require "kitchen/provisioner/base"
+require "kitchen/provisioner/chef_zero"
+
+module Kitchen
+  module Provisioner
+    # For use in a provisioner that does not do any run list evaluation or
+    # policy/berks file expansion.
+    class ChefZeroCaptureSandbox < Chef::CommonSandbox
+      def populate
+        super
+        prepare(:policies)
+        prepare(:policy_groups)
+        prepare(:cookbook_artifacts)
+      end
+
+      # Override #prepare_cookbooks because we don't want any cookbook resolving to occur
+      # via kitchen through berks, policy
+      def prepare_cookbooks
+        cp_cookbooks
+        filter_only_cookbook_files
+      end
+    end
+
+    # chef-zero provisioner intended for use with `chef capture`.
+    #
+    # This provisioner does not do any cookbook dependency
+    # resolution and will not pull in external cookbooks.  All cookbooks
+    # or cookbook artificats  + policy data as captured from the live node and are
+    # expected to be available for chef-zero to provide to the client.
+    class ChefZeroCapture < ChefZero
+      # Declaring these ensure that they're available to the sandbox - it's initialized
+      # the provider's configoptions.
+      default_config :policies_path, "policies"
+      default_config :policy_groups_path, "policy_groups"
+      default_config :cookbook_artifacts_path, "cookbook_artifacts"
+
+      # This will load policyfile/berkshelf.  We don't want either - the client resolves all
+      # dependencies from chef-zero, exactly as preppped in the captured repository.
+      def load_needed_dependencies!; end
+
+      def create_sandbox
+        # We have to invoke the the true Base create_sandbox because it does setup that
+        # we want. However, we do not want to invoke the create_sandbox inherited from
+        # ChefZero/ChefBase - those will create and populate a ChefCommonSandbox instead
+        # of a ChefZeroCaptureSandbox.
+        m = Base.instance_method(:create_sandbox).bind(self)
+        m.call
+
+        # These behaviors from super we _do_ want, so we need to copy them here.
+        prepare_validation_pem
+        prepare_config_rb
+        ChefZeroCaptureSandbox.new(config, sandbox_path, instance).populate
+      end
+
+      # Overriding the private ProviderChefZero#default_config_rb
+      # so that we can add additional configuratoin required for  chef-zeor
+      # to be able to locate our policies/, policy groups, and cookbook artifacts
+      # at run-time.
+      def default_config_rb
+        cfg = super
+        # Need to tell chef-zero about our additional config.
+        root = config[:root_path].gsub("$env:TEMP", "\#{ENV['TEMP']\}")
+        cfg[:policies_path] = remote_path_join(root, config[:policies_path])
+        cfg[:policy_groups_path] = remote_path_join(root, config[:policy_groups_path])
+        cfg[:cookbook_artifacts_path] = remote_path_join(root, config[:cookbook_artifacts_path])
+        cfg
+      end
+    end
+  end
+end

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

@@ -198,7 +198,7 @@ describe ChefCLI::Command::GeneratorCommands::BuildCookbook do
               maintainer_email 'you@example.com'
               license 'all_rights'
               version '0.1.0'
-              chef_version '>= 14.0'
+              chef_version '>= 15.0'
 
               depends 'delivery-truck'
             METADATA

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

@@ -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
 
@@ -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,15 +571,15 @@ 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: ubuntu-20.04
               - name: centos-8
 
             suites:
@@ -658,15 +658,15 @@ 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: ubuntu-20.04
               - name: centos-8
 
             suites:

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

@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 3.0.10
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-06-18 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
@@ -389,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
@@ -527,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
@@ -592,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:
   - - ">="
@@ -741,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