chef-cli 1.0.14 → 3.0.4

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

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

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

@@ -30,6 +30,7 @@ mkmf.log
 REVISION
 TAGS*
 tmtags
+.vscode
 
 ## COMPILED ##
 ##############
@@ -61,8 +62,6 @@ kitchen.yml*
 Procfile
 Rakefile
 spec/*
-spec/*
-spec/fixtures/*
 test/*
 
 # SCM #
@@ -97,7 +96,7 @@ Gemfile.lock
 Policyfile.rb
 Policyfile.lock.json
 
-# Cookbooks #
+# Documentation #
 #############
 CHANGELOG*
 CONTRIBUTING*

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

@@ -1,4 +1,4 @@
-This directory typically contains Chef cookbooks. This repository was
+This directory typically contains Chef Infra cookbooks. This repository was
 generated with the '--policy-only' option, which means you have chosen
 to use a workflow where each cookbook is treated as an independent
 software project. As a result, any cookbooks present in this directory

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

@@ -1,4 +1,4 @@
-This directory contains the cookbooks used to configure systems in your infrastructure with Chef - an example basic cookbook called `example` has been automatically created for you.
+This directory contains the cookbooks used to configure systems in your infrastructure with Chef Infra - an example basic cookbook called `example` has been automatically created for you.
 
 Knife needs to be configured to know where the cookbooks are located with the `cookbook_path` setting. If this is not set, then several cookbook operations will fail to work properly.
 
@@ -23,7 +23,7 @@ cookbook_email     "cookbooks@example.com"
 cookbook_license   "apachev2"
 ```
 
-Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the the comments in those files.
+Supported values for `cookbook_license` are "apachev2", "mit","gplv2","gplv3", or "none". These settings are used to prefill comments in the default recipe, and the corresponding values in the metadata.rb. You are free to change the comments in those files.
 
 Create new cookbooks in this directory with Chef.
 

data/lib/chef-cli/skeletons/code_generator/files/default/delivery-project.toml

@@ -11,11 +11,9 @@
 [local_phases]
 unit = "chef exec rspec spec/"
 lint = "chef exec cookstyle"
-# Foodcritic includes rules only appropriate for community cookbooks
-# uploaded to Supermarket. We turn off any rules tagged "supermarket"
-# by default. If you plan to share this cookbook you should remove
-# '-t ~supermarket' below to enable supermarket rules.
-syntax = "chef exec foodcritic . -t ~supermarket"
+# foodcritic has been deprecated in favor of cookstyle so we skip the syntax
+# phase now.
+syntax = "echo skipping syntax phase. Use lint phase instead."
 provision = "chef exec kitchen create"
 deploy = "chef exec kitchen converge"
 smoke = "chef exec kitchen verify"

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/README.md

@@ -4,11 +4,11 @@ An example cookbook
 
 ## Requirements
 
-### Platforms:
+### Platforms
 
 _No platforms defined_
 
-### Cookbooks:
+### Cookbooks
 
 _No dependencies defined_
 

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

@@ -1,8 +1,7 @@
-# ~FC067 ~FC065 ~FC064
 name             'code_generator'
 maintainer       'Chef Software, Inc.'
 maintainer_email 'dev@chef.io'
 license          'Apache-2.0'
-description      'Generates Chef code for Chef DK'
+description      'Generates Chef code for Chef CLI'
 version          '0.1.0'
-chef_version     '>= 13.0'
+chef_version     '>= 14.0'

data/lib/chef-cli/skeletons/code_generator/recipes/build_cookbook.rb

@@ -11,13 +11,13 @@ directory dot_delivery_dir
 
 cookbook_file config_json do
   source 'delivery-config.json'
-  not_if { File.exist?(config_json) }
+  not_if { ::File.exist?(config_json) }
 end
 
 # Adding the delivery local-mode config
 cookbook_file project_toml do
   source 'delivery-project.toml'
-  not_if { File.exist?(project_toml) }
+  not_if { ::File.exist?(project_toml) }
 end
 
 generator_desc('Ensuring correct Workflow (Delivery) build cookbook content')

data/lib/chef-cli/skeletons/code_generator/recipes/cookbook.rb

@@ -129,7 +129,7 @@ unless context.enable_workflow
   # Adding the delivery local-mode config
   cookbook_file "#{cookbook_dir}/.delivery/project.toml" do
     source 'delivery-project.toml'
-    not_if { File.exist?("#{cookbook_dir}/.delivery/project.toml") }
+    not_if { ::File.exist?("#{cookbook_dir}/.delivery/project.toml") }
   end
 end
 

data/lib/chef-cli/skeletons/code_generator/recipes/repo.rb

@@ -60,7 +60,7 @@ if context.have_git
     execute('initialize-git') do
       command('git init .')
       cwd repo_dir
-      not_if { File.exist?("#{repo_dir}/.gitignore") }
+      not_if { ::File.exist?("#{repo_dir}/.gitignore") }
     end
   end
   template "#{repo_dir}/.gitignore" do

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/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,16 +17,16 @@ 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: centos-7
+  - name: ubuntu-20.04
+  - name: centos-8
 
 suites:
   - name: default

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

@@ -14,16 +14,16 @@ 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
 
-  - name: centos-7
+  - name: centos-8
     driver:
-      image: dokken/centos-7
+      image: dokken/centos-8
       pid_one_command: /usr/lib/systemd/systemd
 
 suites:

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

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

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

@@ -3,7 +3,6 @@ maintainer '<%= copyright_holder %>'
 maintainer_email '<%= email %>'
 license '<%= @spdx_license %>'
 description 'Installs/Configures <%= cookbook_name %>'
-long_description 'Installs/Configures <%= cookbook_name %>'
 version '0.1.0'
 chef_version '>= 14.0'
 

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 = "1.0.14".freeze
+  VERSION = "3.0.4".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/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
 
@@ -197,11 +197,9 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
               [local_phases]
               unit = "chef exec rspec spec/"
               lint = "chef exec cookstyle"
-              # Foodcritic includes rules only appropriate for community cookbooks
-              # uploaded to Supermarket. We turn off any rules tagged "supermarket"
-              # by default. If you plan to share this cookbook you should remove
-              # '-t ~supermarket' below to enable supermarket rules.
-              syntax = "chef exec foodcritic . -t ~supermarket"
+              # foodcritic has been deprecated in favor of cookstyle so we skip the syntax
+              # phase now.
+              syntax = "echo skipping syntax phase. Use lint phase instead."
               provision = "chef exec kitchen create"
               deploy = "chef exec kitchen converge"
               smoke = "chef exec kitchen verify"
@@ -271,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
@@ -525,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'
@@ -573,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
@@ -660,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