chef-cli 5.5.4 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfeb3741f305634bdb91164a529d57fda8ba8dd8ee1a74f942e4e38eb521e79f
-  data.tar.gz: 5f57c0483c71fc7732ad9fec53ee0954022ac35194ba0f4a5909239c10d17e2d
+  metadata.gz: 308c1bbb1d1f4d2070055036818dc566c577d28cd3c6ab476054029302082676
+  data.tar.gz: a5cc534e4f0d0ae65347b5b438ffc968b4dc982078a37e6c89ff1a351eee4ee3
 SHA512:
-  metadata.gz: f8dc515d741fe02197afead1faa446a632b6a71f918370df34585c66b33ef8c760b6ff2f7c14bad37cfdeaaa24f3e98a3884065336912fd8b5982039d43012d5
-  data.tar.gz: 168e5f6b65ef26172869372c3d2af1f2bc2e0f910ae65c12303d3856d1c4e4dd715a3d1c59ef17067feeea217f03912864f30b5a90e1f6f13e0dc13005a48388
+  metadata.gz: 6d53620886e274948207b24d28dcb1bae9f3b784d64783ae42b9698f5359c6ef1653bb1a65417d3309a0bdef10d3254663049447c9a6cdfdcfe1321739335a7d
+  data.tar.gz: abc2a02f25e66edb3bd03b9c1a4903310f1029f699107b23565e3629cacb65b8254faaacb8354f2a00b1c9b6155eaa39df1f3709542eb840f5a2477310b221e4

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

@@ -29,6 +29,9 @@ require_relative "generator_commands/template"
 require_relative "generator_commands/repo"
 require_relative "generator_commands/policyfile"
 require_relative "generator_commands/generator_generator"
+require_relative "generator_commands/input"
+require_relative "generator_commands/profile"
+require_relative "generator_commands/waiver"
 require_relative "../dist"
 
 module ChefCLI
@@ -45,16 +48,19 @@ module ChefCLI
         generators << GeneratorCommand.new(name, class_name, description)
       end
 
-      generator(:cookbook, :Cookbook, "Generate a single cookbook")
-      generator(:recipe, :Recipe, "Generate a new recipe")
       generator(:attribute, :Attribute, "Generate an attributes file")
-      generator(:template, :Template, "Generate a file template")
+      generator(:cookbook, :Cookbook, "Generate a single cookbook")
       generator(:file, :CookbookFile, "Generate a cookbook file")
+      generator(:generator, :GeneratorGenerator, "Copy #{ChefCLI::Dist::PRODUCT}'s generator cookbook so you can customize it")
       generator(:helpers, :Helpers, "Generate a cookbook helper file in libraries")
-      generator(:resource, :Resource, "Generate a custom resource")
-      generator(:repo, :Repo, "Generate a #{ChefCLI::Dist::INFRA_PRODUCT} code repository")
+      generator(:input, :Input, "Generate a Compliance Phase #{ChefCLI::Dist::INSPEC_PRODUCT} Input file")
       generator(:policyfile, :Policyfile, "Generate a Policyfile for use with the install/push commands")
-      generator(:generator, :GeneratorGenerator, "Copy #{ChefCLI::Dist::PRODUCT}'s generator cookbook so you can customize it")
+      generator(:profile, :Profile, "Generate a Compliance Phase #{ChefCLI::Dist::INSPEC_PRODUCT} profile")
+      generator(:recipe, :Recipe, "Generate a new recipe")
+      generator(:repo, :Repo, "Generate a #{ChefCLI::Dist::INFRA_PRODUCT} code repository")
+      generator(:resource, :Resource, "Generate a custom resource")
+      generator(:template, :Template, "Generate a file template")
+      generator(:waiver, :Waiver, "Generate a Compliance Phase #{ChefCLI::Dist::INSPEC_PRODUCT} Waiver file")
 
       def self.banner_headline
         <<~E

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

@@ -32,5 +32,14 @@ module ChefCLI
 
     # Called when cookbook loading starts.
     def library_load_start(file_count); end
+
+    # Called when cookbook loading starts.
+    def profiles_load_start; end
+
+    # Called when cookbook loading starts.
+    def inputs_load_start; end
+
+    # Called when cookbook loading starts.
+    def waivers_load_start; end
   end
 end

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

@@ -86,7 +86,7 @@ module ChefCLI
         option :pipeline,
           long:         "--pipeline PIPELINE",
           description:  "REMOVED: #{ChefCLI::Dist::WORKFLOW} is EOL. This option has been removed.",
-          default:      "master"
+          default:      nil
 
         options.merge!(SharedGeneratorOptions.options)
 

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

@@ -0,0 +1,37 @@
+#
+# Copyright:: Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 "cookbook_code_file"
+require_relative "../../dist"
+
+module ChefCLI
+  module Command
+    module GeneratorCommands
+      # chef generate input [path/to/cookbook_root] NAME
+      class Input < CookbookCodeFile
+
+        banner "Usage: #{ChefCLI::Dist::EXEC} generate input [path/to/cookbook] NAME [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def recipe
+          "input"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+#
+# Copyright:: Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 "cookbook_code_file"
+require_relative "../../dist"
+
+module ChefCLI
+  module Command
+    module GeneratorCommands
+      # chef generate profile [path/to/cookbook_root] NAME
+      class Profile < CookbookCodeFile
+
+        banner "Usage: #{ChefCLI::Dist::EXEC} generate profile [path/to/cookbook] NAME [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def recipe
+          "profile"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,37 @@
+#
+# Copyright:: Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 "cookbook_code_file"
+require_relative "../../dist"
+
+module ChefCLI
+  module Command
+    module GeneratorCommands
+      # chef generate waiver [path/to/cookbook_root] NAME
+      class Waiver < CookbookCodeFile
+
+        banner "Usage: #{ChefCLI::Dist::EXEC} generate waiver [path/to/cookbook] NAME [options]"
+
+        options.merge!(SharedGeneratorOptions.options)
+
+        def recipe
+          "waiver"
+        end
+      end
+    end
+  end
+end

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

@@ -44,6 +44,15 @@ module ChefCLI
 
       E
 
+      option :credential,
+        long: "--credentials string",
+        description: "The credentials file to load for user profiles (default $HOME/.chef/credentials)"
+
+      option :profile,
+        short: "-p",
+        long: "--profile PROFILE",
+        description: "The credentials profile to select."
+
       attr_reader :policyfile_relative_path
       attr_reader :policy_group
 

data/lib/chef-cli/configurable.rb

@@ -61,7 +61,11 @@ module ChefCLI
     end
 
     def config_loader
-      @config_loader ||= Chef::WorkstationConfigLoader.new(config[:config_file])
+      if !config[:profile].nil?
+        @config_loader ||= Chef::WorkstationConfigLoader.new(config[:config_file], profile: config[:profile])
+      else
+        @config_loader ||= Chef::WorkstationConfigLoader.new(config[:config_file])
+      end
     end
 
     def generator_config

data/lib/chef-cli/generator.rb

@@ -68,6 +68,21 @@ module ChefCLI
         Time.now.year
       end
 
+      def self.license_long(license = nil)
+        case license
+        when "apachev2"
+          "Apache-2.0"
+        when "mit"
+          "MIT"
+        when "gplv2"
+          "GPL-2.0"
+        when "gplv3"
+          "GPL-3.0"
+        else
+          "All Rights Reserved"
+        end
+      end
+
       # Prints the short description of the license, suitable for use in a
       # preamble to a file. Optionally specify a comment to prepend to each line.
       def license_description(comment = nil)

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

@@ -9,23 +9,10 @@ generator_desc('Ensuring correct cookbook content')
 directory cookbook_dir
 
 # metadata.rb
-spdx_license =  case context.license
-                when 'apachev2'
-                  'Apache-2.0'
-                when 'mit'
-                  'MIT'
-                when 'gplv2'
-                  'GPL-2.0'
-                when 'gplv3'
-                  'GPL-3.0'
-                else
-                  'All Rights Reserved'
-                end
-
 template "#{cookbook_dir}/metadata.rb" do
   helpers(ChefCLI::Generator::TemplateHelper)
   variables(
-    spdx_license: spdx_license
+    spdx_license: ChefCLI::Generator::TemplateHelper.license_long(context.license)
   )
   action :create_if_missing
 end
@@ -131,6 +118,18 @@ else
   end
 end
 
+# compliance phase
+%w(inputs profiles waivers).each do |dir|
+  directory "#{cookbook_dir}/compliance/#{dir}" do
+    recursive true
+  end
+end
+
+template "#{cookbook_dir}/compliance/README.md" do
+  source 'compliance_dir_README.md.erb'
+  action :create_if_missing
+end
+
 # git
 if context.have_git
   unless context.skip_git_init

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

@@ -0,0 +1,13 @@
+context = ChefCLI::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+input_dir = File.join(cookbook_dir, 'compliance', 'inputs')
+input_path = File.join(input_dir, "#{context.new_file_basename}.yml")
+
+directory input_dir do
+  recursive true
+end
+
+template input_path do
+  source 'input.yml.erb'
+  helpers(ChefCLI::Generator::TemplateHelper)
+end

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

@@ -0,0 +1,22 @@
+context = ChefCLI::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+profile_dir = File.join(cookbook_dir, 'compliance', 'profiles', "#{context.new_file_basename}")
+control_dir = File.join(profile_dir, 'controls')
+
+directory control_dir do
+  recursive true
+end
+
+template "#{profile_dir}/inspec.yml" do
+  source 'compliance_profile_inspec.yml.erb'
+  helpers(ChefCLI::Generator::TemplateHelper)
+  variables(
+    spdx_license: ChefCLI::Generator::TemplateHelper.license_long(context.license),
+    profile_name: context.new_file_basename
+  )
+end
+
+template "#{control_dir}/example.rb" do
+  source 'compliance_profile_control.rb.erb'
+  helpers(ChefCLI::Generator::TemplateHelper)
+end

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

@@ -0,0 +1,13 @@
+context = ChefCLI::Generator.context
+cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
+waiver_dir = File.join(cookbook_dir, 'compliance', 'waivers')
+waiver_path = File.join(waiver_dir, "#{context.new_file_basename}.yml")
+
+directory waiver_dir do
+  recursive true
+end
+
+template waiver_path do
+  source 'waiver.yml.erb'
+  helpers(ChefCLI::Generator::TemplateHelper)
+end

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

@@ -0,0 +1,25 @@
+# compliance
+
+This directory contains <%= ChefCLI::Dist::INSPEC_PRODUCT %> profile, waiver and input objects which are used with the <%= ChefCLI::Dist::INFRA_PRODUCT %> Compliance Phase.
+
+Detailed information on the <%= ChefCLI::Dist::INFRA_PRODUCT %> Compliance Phase can be found in the [Chef Documentation](https://docs.chef.io/chef_compliance_phase/).
+
+```plain
+./compliance
+├── inputs
+├── profiles
+└── waivers
+```
+
+Use the `<%= ChefCLI::Dist::EXEC %> generate` command from <%= ChefCLI::Dist::PRODUCT %> to create content for these directories:
+
+```sh
+# Generate a <%= ChefCLI::Dist::INSPEC_PRODUCT %> profile
+<%= ChefCLI::Dist::EXEC %> generate profile PROFILE_NAME
+
+# Generate a <%= ChefCLI::Dist::INSPEC_PRODUCT %> waiver file
+<%= ChefCLI::Dist::EXEC %> generate waiver WAIVER_NAME
+
+# Generate a <%= ChefCLI::Dist::INSPEC_PRODUCT %> input file
+<%= ChefCLI::Dist::EXEC %> generate input INPUT_NAME
+```

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

@@ -0,0 +1,14 @@
+# Cookbook:: <%= cookbook_name %>
+
+# The <%= ChefCLI::Dist::INSPEC_PRODUCT %> reference, with examples and extensive documentation, can be
+# found at https://docs.chef.io/inspec/resources/
+
+control 'example_control' do
+  impact 0.7
+  title 'Example Control'
+  desc 'This is an example control.  Replace with real test content.'
+
+  describe user('root'), :skip do
+    it { should exist }
+  end
+end

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

@@ -0,0 +1,16 @@
+---
+# Cookbook:: <%= cookbook_name %>
+
+# The <%= ChefCLI::Dist::INSPEC_PRODUCT %> reference, with examples and extensive documentation, can be
+# found at https://docs.chef.io/inspec/profiles/
+
+name: <%= @profile_name %>
+title: <%= @profile_name %>
+maintainer: <%= copyright_holder %>
+copyright: <%= copyright_holder %>
+copyright_email: <%= email %>
+license: <%= @spdx_license %>
+summary: A <%= ChefCLI::Dist::INSPEC_PRODUCT %> Compliance Profile
+version: 0.1.0
+supports:
+  platform: os

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

@@ -0,0 +1,8 @@
+---
+# Cookbook:: <%= cookbook_name %>
+
+# Additional information can be found on the <%= ChefCLI::Dist::INSPEC_PRODUCT %> Documentation site https://docs.chef.io/inspec/inputs/
+
+# Example Syntax:
+input_a_name: input_a_value
+input_b_name: input_b_value

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

@@ -0,0 +1,10 @@
+---
+# Cookbook:: <%= cookbook_name %>
+
+# Additional information can be found on the <%= ChefCLI::Dist::INSPEC_PRODUCT %> Documentation site https://docs.chef.io/inspec/waivers/
+
+# Example Syntax:
+control_id_to_waive:
+  expiration_date: 2050-12-31
+  run: false
+  justification: "This is the text that will be included with the InSpec report supplying the reason this control is waived."

data/lib/chef-cli/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "5.5.4".freeze
+  VERSION = "5.6.1".freeze
 end

data/spec/shared/custom_generator_cookbook.rb

@@ -66,6 +66,23 @@ shared_examples_for "custom generator cookbook" do
       end
     end
 
+    context "with an invalid generator-cookbook path" do
+
+      it "fails with an informative error" do
+        Dir.chdir(tempdir) do
+          allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+          allow(code_generator).to receive(:stderr).and_return(stderr_io)
+          expect(code_generator.run).to eq(1)
+        end
+
+        cookbook_path = File.dirname(generator_cookbook_path)
+        expected_msg = %Q{ERROR: Could not find cookbook(s) to satisfy run list ["recipe[a_generator_cookbook::#{generator_name}]"] in #{cookbook_path}}
+
+        expect(stderr_io.string).to include(expected_msg)
+      end
+
+    end
+
     context "with a generator-cookbook path to a specific cookbook" do
 
       let(:metadata_file) { File.join(generator_cookbook_path, "metadata.rb") }
@@ -88,5 +105,32 @@ shared_examples_for "custom generator cookbook" do
       end
 
     end
+
+    context "with a generator-cookbook path to a directory containing a 'code_generator' cookbook" do
+
+      before do
+        FileUtils.mkdir_p(generator_cookbook_path)
+        FileUtils.cp_r(default_generator_cookbook_path, generator_cookbook_path)
+
+        allow(code_generator).to receive(:stderr).and_return(stderr_io)
+      end
+
+      it "creates the new_files (and warns about deprecated usage)" do
+        allow(code_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+
+        Dir.chdir(tempdir) do
+          code_generator.run
+        end
+        generated_files = Dir.glob("#{tempdir}/#{generator_arg}/**/*", File::FNM_DOTMATCH)
+        expected_cookbook_files.each do |expected_file|
+          expect(generated_files).to include(expected_file)
+        end
+
+        code_generator_path = File.join(generator_cookbook_path, "code_generator")
+        warning_message = "WARN: Please configure the generator cookbook by giving the full path to the desired cookbook (like '#{code_generator_path}')"
+
+        expect(stderr_io.string).to include(warning_message)
+      end
+    end
   end
 end

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

@@ -44,6 +44,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       CHANGELOG.md
       recipes
       recipes/default.rb
+      compliance/README.md
     }
   end
 
@@ -67,6 +68,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       spec/unit
       spec/unit/recipes
       spec/unit/recipes/default_spec.rb
+      compliance/README.md
     }
   end
 
@@ -151,7 +153,7 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
     end
 
     it "warns if a hyphenated cookbook name is passed" do
-      expect(with_argv(%w{my-cookbook}).run).to eq(1)
+      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/workstation/ctl_chef/#chef-generate-cookbook for more information."
       expect(stdout_io.string).to include(message)
     end
@@ -176,6 +178,18 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       expect(generator_context.specs).to be(false)
     end
 
+    it "creates a new cookbook" do
+
+      Dir.chdir(tempdir) do
+        allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+        expect(cookbook_generator.run).to eq(0)
+      end
+      generated_files = Dir.glob("#{tempdir}/new_cookbook/**/*", File::FNM_DOTMATCH)
+      expected_cookbook_files.each do |expected_file|
+        expect(generated_files).to include(expected_file)
+      end
+    end
+
     context "when given the specs flag" do
 
       let(:argv) { %w{ new_cookbook --specs } }
@@ -185,6 +199,17 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
         cookbook_generator.setup_context
         expect(generator_context.specs).to be(true)
       end
+
+      it "creates a new cookbook" do
+        Dir.chdir(tempdir) do
+          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+          expect(cookbook_generator.run).to eq(0)
+        end
+        generated_files = Dir.glob("#{tempdir}/new_cookbook/**/*", File::FNM_DOTMATCH)
+        expected_cookbook_files_specs.each do |expected_file|
+          expect(generated_files).to include(expected_file)
+        end
+      end
     end
 
     context "when given the verbose flag" do
@@ -196,19 +221,34 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
         cookbook_generator.setup_context
         expect(generator_context.verbose).to be(true)
       end
+
+      it "emits verbose output" do
+        Dir.chdir(tempdir) do
+          allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+          expect(cookbook_generator.run).to eq(0)
+        end
+
+        # The normal chef formatter puts a heading for each recipe like this.
+        # Full output is large and subject to change with minor changes in the
+        # generator cookbook, so we just look for this line
+        expected_line = "Recipe: code_generator::cookbook"
+
+        actual = stdout_io.string
+
+        expect(actual).to include(expected_line)
+      end
     end
 
     shared_examples_for "a generated file" do |context_var|
       before do
         Dir.chdir(tempdir) do
           allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
-          expect(cookbook_generator.run).to eq(1)
+          expect(cookbook_generator.run).to eq(0)
         end
       end
 
-      it "should not generate a file" do
-        expect(File.directory?(file)).to be false
-        expect(File).not_to exist(file)
+      it "should contain #{context_var} from the generator context" do
+        expect(File.read(file)).to match line
       end
     end
 
@@ -228,6 +268,297 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       end
     end
 
+    # This shared example group requires a let binding for
+    # `expected_kitchen_yml_content`
+    shared_examples_for "kitchen_yml_and_integration_tests" do
+
+      describe "Generating Test Kitchen and integration testing files" do
+
+        describe "generating kitchen config" do
+
+          before do
+            Dir.chdir(tempdir) do
+              allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+              expect(cookbook_generator.run).to eq(0)
+            end
+          end
+
+          let(:file) { File.join(tempdir, "new_cookbook", "kitchen.yml") }
+
+          it "creates a kitchen.yml with the expected content" do
+            expect(IO.read(file)).to eq(expected_kitchen_yml_content)
+          end
+
+        end
+
+        describe "test/integration/default/default_test.rb" do
+          let(:file) { File.join(tempdir, "new_cookbook", "test", "integration", "default", "default_test.rb") }
+
+          include_examples "a generated file", :cookbook_name do
+            let(:line) { "describe port" }
+          end
+        end
+      end
+    end
+
+    # This shared example group requires you to define a let binding for
+    # `expected_chefspec_spec_helper_content`
+    shared_examples_for "chefspec_spec_helper_file" do
+
+      describe "Generating ChefSpec files" do
+
+        before do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            expect(cookbook_generator.run).to eq(0)
+          end
+        end
+
+        let(:file) { File.join(tempdir, "new_cookbook", "spec", "spec_helper.rb") }
+
+        it "creates a spec/spec_helper.rb for ChefSpec with the expected content" do
+          expect(IO.read(file)).to eq(expected_chefspec_spec_helper_content)
+        end
+
+      end
+
+    end
+
+    context "when configured for Policyfiles" do
+
+      let(:argv) { %w{new_cookbook --policy} }
+
+      describe "Policyfile.rb" do
+
+        let(:file) { File.join(tempdir, "new_cookbook", "Policyfile.rb") }
+
+        let(:expected_content) do
+          <<~POLICYFILE_RB
+            # 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/
+
+            # A name that describes what the system you're building with Chef does.
+            name 'new_cookbook'
+
+            # Where to find external cookbooks:
+            default_source :supermarket
+
+            # run_list: chef-client will run these recipes in the order specified.
+            run_list 'new_cookbook::default'
+
+            # Specify a custom source for a single cookbook:
+            cookbook 'new_cookbook', path: '.'
+          POLICYFILE_RB
+        end
+
+        before do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            expect(cookbook_generator.run).to eq(0)
+          end
+        end
+
+        it "has a run_list and cookbook path that will work out of the box" do
+          expect(IO.read(file)).to eq(expected_content)
+        end
+
+      end
+
+      include_examples "kitchen_yml_and_integration_tests" do
+
+        let(:expected_kitchen_yml_content) do
+          <<~KITCHEN_YML
+            ---
+            driver:
+              name: vagrant
+
+            ## The forwarded_port port feature lets you connect to ports on the VM guest
+            ## via localhost on the host.
+            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
+
+            #  network:
+            #    - ["forwarded_port", {guest: 80, host: 8080}]
+
+            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/workstation/config_yml_kitchen/
+              #  product_name: chef
+              #  product_version: 17
+
+            verifier:
+              name: inspec
+
+            platforms:
+              - name: ubuntu-20.04
+              - name: centos-8
+
+            suites:
+              - name: default
+                verifier:
+                  inspec_tests:
+                    - test/integration/default
+          KITCHEN_YML
+        end
+
+      end
+
+      include_examples "chefspec_spec_helper_file" do
+        let(:argv) { %w{ new_cookbook --policy --specs } }
+
+        let(:expected_chefspec_spec_helper_content) do
+          <<~SPEC_HELPER
+            require 'chefspec'
+            require 'chefspec/policyfile'
+          SPEC_HELPER
+        end
+
+      end
+
+    end
+
+    context "when YAML recipe flag is passed" do
+
+      let(:argv) { %w{new_cookbook --yaml} }
+
+      describe "recipes/default.yml" do
+        let(:file) { File.join(tempdir, "new_cookbook", "recipes", "default.yml") }
+
+        let(:expected_content_header) do
+          <<~DEFAULT_YML_HEADER
+          #
+          # Cookbook:: new_cookbook
+          # Recipe:: default
+          #
+          DEFAULT_YML_HEADER
+        end
+
+        let(:expected_content) do
+          <<~DEFAULT_YML_CONTENT
+          ---
+          resources:
+          # Example Syntax
+          # Additional snippets are available using the Chef Infra Extension for Visual Studio Code
+          # - type: file
+          #   name: '/path/to/file'
+          #   content: 'content'
+          #   owner: 'root'
+          #   group: 'root'
+          #   mode: '0755'
+          #   action:
+          #     - create
+          DEFAULT_YML_CONTENT
+        end
+
+        before do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            expect(cookbook_generator.run).to eq(0)
+          end
+        end
+
+        it "has a default.yml file with template contents" do
+          expect(IO.read(file)).to match(expected_content_header)
+          expect(IO.read(file)).to match(expected_content)
+        end
+
+      end
+
+    end
+
+    context "when configured for Berkshelf" do
+
+      let(:argv) { %w{new_cookbook --berks} }
+
+      describe "Berksfile" do
+
+        let(:file) { File.join(tempdir, "new_cookbook", "Berksfile") }
+
+        let(:expected_content) do
+          <<~POLICYFILE_RB
+            source 'https://supermarket.chef.io'
+
+            metadata
+          POLICYFILE_RB
+        end
+
+        before do
+          Dir.chdir(tempdir) do
+            allow(cookbook_generator.chef_runner).to receive(:stdout).and_return(stdout_io)
+            expect(cookbook_generator.run).to eq(0)
+          end
+        end
+
+        it "pulls deps from metadata" do
+          expect(IO.read(file)).to eq(expected_content)
+        end
+
+      end
+
+      include_examples "kitchen_yml_and_integration_tests" do
+
+        let(:expected_kitchen_yml_content) do
+          <<~KITCHEN_YML
+            ---
+            driver:
+              name: vagrant
+
+            ## The forwarded_port port feature lets you connect to ports on the VM guest via
+            ## localhost on the host.
+            ## see also: https://www.vagrantup.com/docs/networking/forwarded_ports
+
+            #  network:
+            #    - ["forwarded_port", {guest: 80, host: 8080}]
+
+            provisioner:
+              name: chef_zero
+              # You may wish to disable always updating cookbooks in CI or other testing environments.
+              # For example:
+              #   always_update_cookbooks: <%= !ENV['CI'] %>
+              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/workstation/config_yml_kitchen/
+              #  product_name: chef
+              #  product_version: 17
+
+            verifier:
+              name: inspec
+
+            platforms:
+              - name: ubuntu-20.04
+              - name: centos-8
+
+            suites:
+              - name: default
+                run_list:
+                  - recipe[new_cookbook::default]
+                verifier:
+                  inspec_tests:
+                    - test/integration/default
+                attributes:
+          KITCHEN_YML
+        end
+
+      end
+
+      include_examples "chefspec_spec_helper_file" do
+        let(:argv) { %w{ new_cookbook --berks --specs } }
+
+        let(:expected_chefspec_spec_helper_content) do
+          <<~SPEC_HELPER
+            require 'chefspec'
+            require 'chefspec/berkshelf'
+          SPEC_HELPER
+        end
+
+      end
+
+    end
+
     describe "metadata.rb" do
       let(:file) { File.join(tempdir, "new_cookbook", "metadata.rb") }
 

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

@@ -0,0 +1,31 @@
+#
+# Copyright:: Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 "spec_helper"
+require "shared/a_file_generator"
+require "chef-cli/command/generator_commands/input"
+
+describe ChefCLI::Command::GeneratorCommands::Input do
+
+  include_examples "a file generator" do
+
+    let(:generator_name) { "input" }
+    let(:generated_files) { [ "compliance/inputs/new_input.yml" ] }
+    let(:new_file_name) { "new_input" }
+
+  end
+end

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

@@ -0,0 +1,34 @@
+#
+# Copyright:: Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 "spec_helper"
+require "shared/a_file_generator"
+require "chef-cli/command/generator_commands/profile"
+
+describe ChefCLI::Command::GeneratorCommands::Profile do
+
+  include_examples "a file generator" do
+
+    let(:generator_name) { "profile" }
+    let(:generated_files) {
+      [ "compliance/profiles/new_profile/inspec.yml",
+                              "compliance/profiles/new_profile/controls/example.rb" ]
+    }
+    let(:new_file_name) { "new_profile" }
+
+  end
+end

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

@@ -0,0 +1,31 @@
+#
+# Copyright:: Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# 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 "spec_helper"
+require "shared/a_file_generator"
+require "chef-cli/command/generator_commands/waiver"
+
+describe ChefCLI::Command::GeneratorCommands::Waiver do
+
+  include_examples "a file generator" do
+
+    let(:generator_name) { "waiver" }
+    let(:generated_files) { [ "compliance/waivers/new_waiver.yml" ] }
+    let(:new_file_name) { "new_waiver" }
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 5.5.4
+  version: 5.6.1
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -248,11 +248,14 @@ files:
 - lib/chef-cli/command/generator_commands/cookbook_file.rb
 - lib/chef-cli/command/generator_commands/generator_generator.rb
 - lib/chef-cli/command/generator_commands/helpers.rb
+- lib/chef-cli/command/generator_commands/input.rb
 - lib/chef-cli/command/generator_commands/policyfile.rb
+- lib/chef-cli/command/generator_commands/profile.rb
 - lib/chef-cli/command/generator_commands/recipe.rb
 - lib/chef-cli/command/generator_commands/repo.rb
 - lib/chef-cli/command/generator_commands/resource.rb
 - lib/chef-cli/command/generator_commands/template.rb
+- lib/chef-cli/command/generator_commands/waiver.rb
 - lib/chef-cli/command/install.rb
 - lib/chef-cli/command/push.rb
 - lib/chef-cli/command/push_archive.rb
@@ -350,11 +353,14 @@ files:
 - lib/chef-cli/skeletons/code_generator/recipes/cookbook.rb
 - lib/chef-cli/skeletons/code_generator/recipes/cookbook_file.rb
 - lib/chef-cli/skeletons/code_generator/recipes/helpers.rb
+- lib/chef-cli/skeletons/code_generator/recipes/input.rb
 - lib/chef-cli/skeletons/code_generator/recipes/policyfile.rb
+- lib/chef-cli/skeletons/code_generator/recipes/profile.rb
 - lib/chef-cli/skeletons/code_generator/recipes/recipe.rb
 - lib/chef-cli/skeletons/code_generator/recipes/repo.rb
 - lib/chef-cli/skeletons/code_generator/recipes/resource.rb
 - lib/chef-cli/skeletons/code_generator/recipes/template.rb
+- lib/chef-cli/skeletons/code_generator/recipes/waiver.rb
 - lib/chef-cli/skeletons/code_generator/templates/default/CHANGELOG.md.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/LICENSE.all_rights.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/LICENSE.apachev2.erb
@@ -364,8 +370,12 @@ files:
 - lib/chef-cli/skeletons/code_generator/templates/default/Policyfile.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/README.md.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/attribute.rb.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/compliance_dir_README.md.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/compliance_profile_control.rb.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/compliance_profile_inspec.yml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/cookbook_file.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/helpers.rb.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/input.yml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/inspec_default_test.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/kitchen.yml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/kitchen_dokken.yml.erb
@@ -377,6 +387,7 @@ files:
 - lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/resource.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/template.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/waiver.yml.erb
 - lib/chef-cli/ui.rb
 - lib/chef-cli/version.rb
 - lib/kitchen/provisioner/chef_zero_capture.rb
@@ -411,11 +422,14 @@ files:
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/generator_generator_spec.rb
 - spec/unit/command/generator_commands/helpers_spec.rb
+- spec/unit/command/generator_commands/input_spec.rb
 - spec/unit/command/generator_commands/policyfile_spec.rb
+- spec/unit/command/generator_commands/profile_spec.rb
 - spec/unit/command/generator_commands/recipe_spec.rb
 - spec/unit/command/generator_commands/repo_spec.rb
 - spec/unit/command/generator_commands/resource_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
+- spec/unit/command/generator_commands/waiver_spec.rb
 - spec/unit/command/install_spec.rb
 - spec/unit/command/push_archive_spec.rb
 - spec/unit/command/push_spec.rb
@@ -634,11 +648,14 @@ test_files:
 - spec/unit/command/generator_commands/cookbook_spec.rb
 - spec/unit/command/generator_commands/generator_generator_spec.rb
 - spec/unit/command/generator_commands/helpers_spec.rb
+- spec/unit/command/generator_commands/input_spec.rb
 - spec/unit/command/generator_commands/policyfile_spec.rb
+- spec/unit/command/generator_commands/profile_spec.rb
 - spec/unit/command/generator_commands/recipe_spec.rb
 - spec/unit/command/generator_commands/repo_spec.rb
 - spec/unit/command/generator_commands/resource_spec.rb
 - spec/unit/command/generator_commands/template_spec.rb
+- spec/unit/command/generator_commands/waiver_spec.rb
 - spec/unit/command/install_spec.rb
 - spec/unit/command/push_archive_spec.rb
 - spec/unit/command/push_spec.rb