chef-cli 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb98307695292507e558f981b1fef57ac24d3bfa3f01ecf5c9359e7726cf21c
-  data.tar.gz: cffb65b17d8e5c267a8e26d48ca419c5af671a640f5735a2fc2192644506e3d3
+  metadata.gz: e8f6584f3f7241a9b2a700c32a5c2562b1d6010527a453405c42c1fba4511a16
+  data.tar.gz: 2b038f40f4f990f3bfeca2c33a4478f23e34895d7a76c8c4f8cfa7bfdc6e522f
 SHA512:
-  metadata.gz: 878b49ffa71394138f7055ddbae1376ab91276933657dacc674d646c0f1a481c92c48c8f3e2c134eabdda5e731f6b214691a38c79cfa3c72027730c378deada4
-  data.tar.gz: e587bf24ba23f52dc3ec008efbaeb2c628811e4980d74ecc23eb51e108ab700c352cdb9800189d49470644eb2abf36cfff1f00562e4a2dacc01240a7f83b5968
+  metadata.gz: '06735193dc5c884a7260fa1d2376e7428635dcffbe846602483c1489c2670a451417ea2de0b22687e82216f76eb2351e1459b246c37ca20b4cdf31bcdf2e15a3'
+  data.tar.gz: 49d095de278a34f76c6fb10943aaaf1589d8bc936e25f916b569ca2beaff20173b5657e953dda4314a8e1f9557662a9c4c375f392920fd17f0a29986ae8f3ab0

data/Gemfile

@@ -19,6 +19,8 @@ group :test do
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
     gem "ohai", "~> 16"
   end
+
+  gem "simplecov", require: false
 end
 
 group :development do

data/lib/chef-cli/builtin_commands.rb

@@ -57,7 +57,4 @@ ChefCLI.commands do |c|
 
   c.builtin "describe-cookbook", :DescribeCookbook, require_path: "chef-cli/command/describe_cookbook",
                                                     desc: "Prints cookbook checksum information used for cookbook identifier"
-
-  # deprecated command that throws a failure warning if used. This was removed 4.2019
-  c.builtin "provision", :Provision, desc: "Provision VMs and clusters via cookbook", hidden: true
 end

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,17 +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(:'build-cookbook', :BuildCookbook, "DEPRECATED: Generate a build cookbook for use with #{ChefCLI::Dist::WORKFLOW}")
+      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
@@ -82,10 +87,6 @@ module ChefCLI
       end
 
       def run(params)
-        if params[0] == "build-cookbook"
-          warn "[DEPRECATION] Chef Workflow (Delivery) is end of life (EOL) as of December 31, 2020 and this generator subcommand has been removed".freeze
-          return 1
-        end
         if ( generator_spec = generator_for(params[0]) )
           params.shift
           generator = GeneratorCommands.build(generator_spec.class_name, params)

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

@@ -65,7 +65,7 @@ module ChefCLI
         option :workflow,
           short:        "-w",
           long:         "--workflow",
-          description:  "DEPRECATED: Generate a cookbook with a full #{ChefCLI::Dist::WORKFLOW} build cookbook.",
+          description:  "REMOVED: #{ChefCLI::Dist::WORKFLOW} is EOL. This option has been removed.",
           boolean:      true,
           default:      false
 
@@ -85,8 +85,8 @@ module ChefCLI
 
         option :pipeline,
           long:         "--pipeline PIPELINE",
-          description:  "Use PIPELINE to set target branch to something other than master for the #{ChefCLI::Dist::WORKFLOW} build_cookbook",
-          default:      "master"
+          description:  "REMOVED: #{ChefCLI::Dist::WORKFLOW} is EOL. This option has been removed.",
+          default:      nil
 
         options.merge!(SharedGeneratorOptions.options)
 
@@ -119,17 +119,12 @@ module ChefCLI
 
         def emit_post_create_message
           default_recipe_file = yaml ? "default.yml" : "default.rb"
-          if have_delivery_config?
-            msg("Your cookbook is ready. To setup the pipeline, type `cd #{cookbook_name_or_path}`, then run `delivery init`")
-          else
-            msg("Your cookbook is ready. Type `cd #{cookbook_name_or_path}` to enter it.")
-            msg("\nThere are several commands you can run to get started locally developing and testing your cookbook.")
-            msg("Type `delivery local --help` to see a full list of local testing commands.")
-            msg("\nWhy not start by writing an InSpec test? Tests for the default recipe are stored at:\n")
-            msg("test/integration/default/default_test.rb")
-            msg("\nIf you'd prefer to dive right in, the default recipe can be found at:")
-            msg("\nrecipes/#{default_recipe_file}\n")
-          end
+          msg("Your cookbook is ready. Type `cd #{cookbook_name_or_path}` to enter it.")
+          msg("\nThere are several commands you can run to get started locally developing and testing your cookbook.")
+          msg("\nWhy not start by writing an InSpec test? Tests for the default recipe are stored at:\n")
+          msg("test/integration/default/default_test.rb")
+          msg("\nIf you'd prefer to dive right in, the default recipe can be found at:")
+          msg("\nrecipes/#{default_recipe_file}\n")
         end
 
         def setup_context
@@ -143,16 +138,10 @@ module ChefCLI
           Generator.add_attr_to_context(:policy_run_list, policy_run_list)
           Generator.add_attr_to_context(:policy_local_cookbook, ".")
 
-          Generator.add_attr_to_context(:enable_workflow, enable_workflow?)
-          Generator.add_attr_to_context(:workflow_project_dir, cookbook_full_path)
-          Generator.add_attr_to_context(:build_cookbook_parent_is_cookbook, true)
-          Generator.add_attr_to_context(:workflow_project_git_initialized, have_git? && !cookbook_path_in_git_repo?)
-
           Generator.add_attr_to_context(:verbose, verbose?)
           Generator.add_attr_to_context(:specs, specs?)
 
           Generator.add_attr_to_context(:use_policyfile, policy_mode?)
-          Generator.add_attr_to_context(:pipeline, pipeline)
           Generator.add_attr_to_context(:kitchen, kitchen)
           Generator.add_attr_to_context(:vscode_dir, create_vscode_dir?)
           Generator.add_attr_to_context(:yaml, yaml)
@@ -162,10 +151,6 @@ module ChefCLI
           config[:kitchen]
         end
 
-        def pipeline
-          config[:pipeline]
-        end
-
         def yaml
           config[:yaml]
         end
@@ -202,10 +187,6 @@ module ChefCLI
           @policy_mode
         end
 
-        def enable_workflow?
-          config[:workflow]
-        end
-
         def verbose?
           @verbose
         end
@@ -214,22 +195,10 @@ module ChefCLI
           @specs
         end
 
-        #
-        # Is there a .delivery/cli.toml in the current dir or any of the parent dirs
-        #
-        # @return [Boolean]
-        #
-        def have_delivery_config?
-          # delivery-cli's logic is to look recursively upward for
-          # .delivery/cli.toml starting from pwd:
-          # https://github.com/chef/delivery-cli/blob/22cbef3987ebd0aee98405b7e161a100edc87e49/src/delivery/config/mod.rs#L225-L247
-
-          Pathname.pwd.ascend.any? { |path| path.join(".delivery/cli.toml").exist? }
-        end
-
         def read_and_validate_params
           arguments = parse_options(params)
           @cookbook_name_or_path = arguments[0]
+
           if !@cookbook_name_or_path
             @params_valid = false
           elsif File.basename(@cookbook_name_or_path).include?("-")
@@ -241,6 +210,11 @@ module ChefCLI
             @params_valid = false
           end
 
+          if config[:workflow] || config[:pipeline]
+            err("[DEPRECATION] Chef Workflow (Delivery) is end of life (EOL) as of December 31, 2020 and the --workflow and --pipeline flags have been removed")
+            @params_valid = false
+          end
+
           if config[:berks]
             @policy_mode = false
           end

data/lib/chef-cli/command/{provision.rb → generator_commands/input.rb}

@@ -15,22 +15,23 @@
 # limitations under the License.
 #
 
-require_relative "base"
-require_relative "../chef_runner"
-require_relative "../dist"
+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
 
-    class Provision < Base
+        banner "Usage: #{ChefCLI::Dist::EXEC} generate input [path/to/cookbook] NAME [options]"
 
-      banner("DEPRECATED: Chef provisioning has been removed from #{ChefCLI::Dist::PRODUCT}. If you require Chef Provisioning you will need to install an earlier version of these products!")
+        options.merge!(SharedGeneratorOptions.options)
 
-      def run(params = [])
-        raise "Chef provisioning has been removed from #{ChefCLI::Dist::PRODUCT}. If you require Chef Provisioning you will need to install an earlier version of these products!"
+        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/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,20 +118,18 @@ else
   end
 end
 
-# the same will be done below if workflow was enabled so avoid double work and skip this
-unless context.enable_workflow
-  directory "#{cookbook_dir}/.delivery"
-
-  template "#{cookbook_dir}/.delivery/project.toml" do
-    variables(
-      specs: context.specs
-    )
-    source 'delivery-project.toml.erb'
-    helpers(ChefCLI::Generator::TemplateHelper)
-    action :create_if_missing
+# 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
@@ -189,18 +174,3 @@ if context.vscode_dir
     CONTENT
   end
 end
-
-if context.enable_workflow
-  warn "\n---------WARNING---------\nThe --workflow flag is deprecated as #{ChefCLI::Dist::WORKFLOW} is EOL as of December 2020.\n\nThis flag will be ignored and will be removed in a future release.\n-------------------------\n\n"
-  directory "#{cookbook_dir}/.delivery"
-
-  template "#{cookbook_dir}/.delivery/project.toml" do
-    variables(
-      specs: context.specs
-    )
-    source 'delivery-project.toml.erb'
-    helpers(ChefCLI::Generator::TemplateHelper)
-    action :create_if_missing
-  end
-
-end

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.0".freeze
+  VERSION = "5.6.0".freeze
 end

data/spec/spec_helper.rb

@@ -24,6 +24,8 @@ require "chef/workstation_config_loader"
 require "chef/config"
 
 require "chef-cli/cli"
+require "simplecov"
+SimpleCov.start
 
 RSpec.configure do |c|
   running_on_windows = (RUBY_PLATFORM =~ /mswin|mingw|windows/)

data/spec/unit/command/generate_spec.rb

@@ -137,13 +137,5 @@ describe ChefCLI::Command::Generate do
       end
 
     end
-
-    describe "When build-cookbookis given as subcommand" do
-      it "shows deprecation warning when" do
-        result = generate.run(%w{build-cookbook example})
-        expect(result).to eq(1)
-      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
 
@@ -87,7 +89,6 @@ describe ChefCLI::Command::GeneratorCommands::Cookbook do
       Your cookbook is ready. Type `cd new_cookbook` to enter it.
 
       There are several commands you can run to get started locally developing and testing your cookbook.
-      Type `delivery local --help` to see a full list of local testing commands.
 
       Why not start by writing an InSpec test? Tests for the default recipe are stored at:
 

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.0
+  version: 5.6.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -248,13 +248,15 @@ 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/provision.rb
 - lib/chef-cli/command/push.rb
 - lib/chef-cli/command/push_archive.rb
 - lib/chef-cli/command/shell_init.rb
@@ -330,7 +332,6 @@ files:
 - lib/chef-cli/skeletons/code_generator/files/default/chefignore
 - lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README-policy.md
 - lib/chef-cli/skeletons/code_generator/files/default/cookbook_readmes/README.md
-- lib/chef-cli/skeletons/code_generator/files/default/delivery-project.toml
 - lib/chef-cli/skeletons/code_generator/files/default/gitignore
 - lib/chef-cli/skeletons/code_generator/files/default/repo/README.md
 - lib/chef-cli/skeletons/code_generator/files/default/repo/cookbooks/example/README.md
@@ -352,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
@@ -366,9 +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/delivery-project.toml.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
@@ -380,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
@@ -414,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
@@ -637,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

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

@@ -1,32 +0,0 @@
-# Delivery for Local Phases Execution
-#
-# This file allows you to execute test phases locally on a workstation or
-# in a CI pipeline. The delivery-cli will read this file and execute the
-# command(s) that are configured for each phase. You can customize them
-# by just modifying the phase key on this file.
-#
-# By default these phases are configured for Cookbook Workflow only
-#
-
-[local_phases]
-unit = "chef exec rspec spec/"
-lint = "chef exec cookstyle"
-# 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"
-# The functional phase is optional, you can define it by uncommenting
-# the line below and running the command: `delivery local functional`
-# functional = ""
-cleanup = "chef exec kitchen destroy"
-
-# Remote project.toml file
-#
-# Instead of the local phases above, you may specify a remote URI location for
-# the `project.toml` file. This is useful for teams that wish to centrally
-# manage the behavior of the `delivery local` command across many different
-# projects.
-#
-# remote_file = "https://url/project.toml"

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

@@ -1,36 +0,0 @@
-# Delivery for Local Phases Execution
-#
-# This file allows you to execute test phases locally on a workstation or
-# in a CI pipeline. The delivery-cli will read this file and execute the
-# command(s) that are configured for each phase. You can customize them
-# by just modifying the phase key on this file.
-#
-# By default these phases are configured for Cookbook Workflow only
-#
-
-[local_phases]
-<% if @specs %>
-unit = "chef exec rspec spec/"
-<% else %>
-unit = "echo skipping unit phase."
-<% end %>
-lint = "chef exec cookstyle"
-# 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"
-# The functional phase is optional, you can define it by uncommenting
-# the line below and running the command: `delivery local functional`
-# functional = ""
-cleanup = "chef exec kitchen destroy"
-
-# Remote project.toml file
-#
-# Instead of the local phases above, you may specify a remote URI location for
-# the `project.toml` file. This is useful for teams that wish to centrally
-# manage the behavior of the `delivery local` command across many different
-# projects.
-#
-# remote_file = "https://url/project.toml"