chef-cli 3.1.6 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db59602ecc8f8eccfed56173f71092e36e1cc55ad6ece88e311d26896d7a1e0b
-  data.tar.gz: a584cf195ad81b8e3ddae995aa5c275545e795782439990ceb11e7dc2450eba6
+  metadata.gz: 5f07d3f568a94bf70e402ec732f96521233dafdf566b60bdc0ef9fad586e29af
+  data.tar.gz: 6b060133bceeb79fde35c38a41b7c4b6e4a71520f1f631cf37d4f0942838c0ed
 SHA512:
-  metadata.gz: d1d34379eda31b8391fd142cc60ad71c0ac8bcd9e8a0fc9734da1a25cbfebdae1b2dda323ef6937ba2a05d11a86cc429f8a6d4692067d073b240dd5da3fdc5a2
-  data.tar.gz: 27b7a7342e77162a34a7c6e3dcabfc9ba73d3081fb2b1bc6d144c5d01a8fa673bc2c60f6fc87ee2cc3841a970274f407b6cf9ab2c099d4cd6e7fdd845066c10c
+  metadata.gz: c429fdd87a900cd5c9178e44edc2eccf48a517a96aa0dd58de2adf5d1d9cdb0ddac522efeacb5676b9a12284bda262030fe8f5e65909ed40e21b5d3fb23845aa
+  data.tar.gz: db8f7b5d1a073a314489315aa35db2554575bba13e37f1ac28c99f0795eb57233d0ae0beb1989f7aa98d0970ed0826cd96849367b1161ecf144d76fc224e9167

data/Gemfile

@@ -10,11 +10,15 @@ group :test do
   gem "cookstyle", "=7.7.2" # this forces dependabot PRs to open which triggers cookstyle CI on the chef generate command
   gem "chefstyle", "=1.6.2"
   gem "test-kitchen", ">= 2.11.1"
+
   if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.6")
     gem "chef-zero", "~> 14"
     gem "chef", "~> 15"
     gem "chef-utils", "=16.6.14"
   end
+  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.7")
+    gem "ohai", "~> 16"
+  end
 end
 
 group :development do

data/chef-cli.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.license       = "Apache-2.0"
   gem.homepage      = "https://www.chef.io/"
 
-  gem.required_ruby_version = ">= 2.5"
+  gem.required_ruby_version = ">= 2.6"
 
   gem.files = %w{Rakefile LICENSE} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks

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

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -67,6 +67,11 @@ module ChefCLI
         description: "Enable stacktraces and other debug output",
         default:     false
 
+      option :policy_group,
+        long:        "--policy-group POLICY_GROUP",
+        description: "The policy_group to include in the export (default: 'local')",
+        default:     nil
+
       attr_reader :policyfile_relative_path
       attr_reader :export_dir
 
@@ -120,11 +125,14 @@ module ChefCLI
       end
 
       def export_service
-        @export_service ||= PolicyfileServices::ExportRepo.new(policyfile: policyfile_relative_path,
-                                                               export_dir: export_dir,
-                                                               root_dir: Dir.pwd,
-                                                               archive: archive?,
-                                                               force: config[:force])
+        @export_service ||= PolicyfileServices::ExportRepo.new(
+          policyfile: policyfile_relative_path,
+          export_dir: export_dir,
+          root_dir: Dir.pwd,
+          archive: archive?,
+          force: config[:force],
+          policy_group: config[:policy_group]
+        )
       end
 
       def handle_error(error)

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

@@ -29,7 +29,6 @@ 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/build_cookbook"
 require_relative "../dist"
 
 module ChefCLI
@@ -56,7 +55,7 @@ module ChefCLI
       generator(:repo, :Repo, "Generate a #{ChefCLI::Dist::INFRA_PRODUCT} code repository")
       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, "Generate a build cookbook for use with #{ChefCLI::Dist::WORKFLOW}")
+      generator(:'build-cookbook', :BuildCookbook, "DEPRECATED: Generate a build cookbook for use with #{ChefCLI::Dist::WORKFLOW}")
 
       def self.banner_headline
         <<~E
@@ -83,6 +82,10 @@ 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)
@@ -118,7 +121,6 @@ module ChefCLI
       def have_generator?(name)
         self.class.generators.map { |g| g.name.to_s }.include?(name)
       end
-
     end
   end
 end

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

@@ -55,10 +55,17 @@ module ChefCLI
           boolean:      true,
           default:      nil
 
+        option :specs,
+          short:        "-s",
+          long:         "--specs",
+          description:  "Generate a cookbook with sample ChefSpec specs",
+          boolean:      true,
+          default:      nil
+
         option :workflow,
           short:        "-w",
           long:         "--workflow",
-          description:  "Generate a cookbook with a full #{ChefCLI::Dist::WORKFLOW} build cookbook.",
+          description:  "DEPRECATED: Generate a cookbook with a full #{ChefCLI::Dist::WORKFLOW} build cookbook.",
           boolean:      true,
           default:      false
 
@@ -69,6 +76,13 @@ module ChefCLI
           boolean:      true,
           default:      false
 
+        option :yaml,
+          short:        "-y",
+          long:         "--yaml",
+          description:  "Generate a cookbook with YAML Recipe configuration file as the default.",
+          boolean:      true,
+          default:      nil
+
         option :pipeline,
           long:         "--pipeline PIPELINE",
           description:  "Use PIPELINE to set target branch to something other than master for the #{ChefCLI::Dist::WORKFLOW} build_cookbook",
@@ -81,6 +95,7 @@ module ChefCLI
           @cookbook_name = nil
           @policy_mode = true
           @verbose = false
+          @specs = false
           super
         end
 
@@ -103,6 +118,7 @@ module ChefCLI
         end
 
         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
@@ -112,7 +128,7 @@ module ChefCLI
             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.rb\n")
+            msg("\nrecipes/#{default_recipe_file}\n")
           end
         end
 
@@ -133,11 +149,13 @@ module ChefCLI
           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)
         end
 
         def kitchen
@@ -148,6 +166,10 @@ module ChefCLI
           config[:pipeline]
         end
 
+        def yaml
+          config[:yaml]
+        end
+
         def policy_name
           cookbook_name
         end
@@ -188,6 +210,10 @@ module ChefCLI
           @verbose
         end
 
+        def specs?
+          @specs
+        end
+
         #
         # Is there a .delivery/cli.toml in the current dir or any of the parent dirs
         #
@@ -223,6 +249,10 @@ module ChefCLI
             @verbose = true
           end
 
+          if config[:specs]
+            @specs = true
+          end
+
           true
         end
 

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

@@ -26,6 +26,13 @@ module ChefCLI
 
         banner "Usage: #{ChefCLI::Dist::EXEC} generate recipe [path/to/cookbook] NAME [options]"
 
+        option :yaml,
+          short:        "-y",
+          long:         "--yaml",
+          description:  "Generate recipe using YAML configuration format.",
+          boolean:      true,
+          default:      nil
+
         options.merge!(SharedGeneratorOptions.options)
 
         def recipe

data/lib/chef-cli/helpers.rb

@@ -117,11 +117,11 @@ module ChefCLI
       @omnibus_env ||=
         begin
           user_bin_dir = File.expand_path(File.join(Gem.user_dir, "bin"))
-          path = [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"] ]
+          path = [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ]
           path << git_bin_dir if Dir.exist?(git_bin_dir)
           path << git_windows_bin_dir if Dir.exist?(git_windows_bin_dir)
           {
-            "PATH" => path.join(File::PATH_SEPARATOR),
+            "PATH" => path.flatten.uniq.join(File::PATH_SEPARATOR),
             "GEM_ROOT" => Gem.default_dir,
             "GEM_HOME" => Gem.user_dir,
             "GEM_PATH" => Gem.path.join(File::PATH_SEPARATOR),
@@ -129,8 +129,6 @@ module ChefCLI
         end
     end
 
-    private
-
     def omnibus_expand_path(*paths)
       dir = File.expand_path(File.join(paths))
       raise OmnibusInstallNotFound.new unless dir && File.directory?(dir)
@@ -138,6 +136,8 @@ module ChefCLI
       dir
     end
 
+    private
+
     def expected_omnibus_root
       File.expand_path(File.join(Gem.ruby, "..", "..", ".."))
     end

data/lib/chef-cli/policyfile_services/export_repo.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2019 Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,20 +33,15 @@ module ChefCLI
 
     class ExportRepo
 
-      # Policy groups provide namespaces for policies so that a Chef Infra Server can
-      # have multiple active iterations of a policy at once, but we don't need
-      # this when serving a single exported policy via Chef Zero, so hardcode
-      # it to a "well known" value:
-      POLICY_GROUP = "local".freeze
-
       include Policyfile::StorageConfigDelegation
 
       attr_reader :storage_config
       attr_reader :root_dir
       attr_reader :export_dir
       attr_reader :ui
+      attr_reader :policy_group
 
-      def initialize(policyfile: nil, export_dir: nil, root_dir: nil, archive: false, force: false)
+      def initialize(policyfile: nil, export_dir: nil, root_dir: nil, archive: false, force: false, policy_group: nil)
         @root_dir = root_dir
         @export_dir = File.expand_path(export_dir)
         @archive = archive
@@ -55,6 +50,8 @@ module ChefCLI
 
         @policy_data = nil
         @policyfile_lock = nil
+        @policy_group = policy_group
+        @policy_group ||= "local".freeze
 
         policyfile_rel_path = policyfile || "Policyfile.rb"
         policyfile_full_path = File.expand_path(policyfile_rel_path, root_dir)
@@ -243,7 +240,7 @@ module ChefCLI
             #
 
             policy_name '#{policy_name}'
-            policy_group 'local'
+            policy_group '#{policy_group}'
 
             use_policyfile true
             policy_document_native_api true
@@ -301,9 +298,8 @@ module ChefCLI
             ### policy_groups/
 
             Policy groups are used by Chef Infra Server to manage multiple revisions of the same
-            policy. However, exported policies contain only a single policy revision, so
-            this policy group name is hardcoded to "local" and should not be changed.
-
+            policy. The default "local" policy is recommended for export use since there can be
+            no different revisions when not utilizing a server.
           README
         end
       end
@@ -389,7 +385,7 @@ module ChefCLI
       end
 
       def policy_group_repo_item_path
-        File.join(staging_dir, "policy_groups", "local.json")
+        File.join(staging_dir, "policy_groups", "#{policy_group}.json")
       end
 
       def dot_chef_staging_dir

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

@@ -92,43 +92,56 @@ template "#{cookbook_dir}/test/integration/default/default_test.rb" do
 end
 
 # ChefSpec
-directory "#{cookbook_dir}/spec/unit/recipes" do
-  recursive true
-end
-
-cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
-  if context.use_policyfile
-    source 'spec_helper_policyfile.rb'
-  else
-    source 'spec_helper.rb'
+if context.specs
+  directory "#{cookbook_dir}/spec/unit/recipes" do
+    recursive true
   end
 
-  action :create_if_missing
-end
+  cookbook_file "#{cookbook_dir}/spec/spec_helper.rb" do
+    if context.use_policyfile
+      source 'spec_helper_policyfile.rb'
+    else
+      source 'spec_helper.rb'
+    end
 
-template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
-  source 'recipe_spec.rb.erb'
-  helpers(ChefCLI::Generator::TemplateHelper)
-  action :create_if_missing
+    action :create_if_missing
+  end
+
+  template "#{cookbook_dir}/spec/unit/recipes/default_spec.rb" do
+    source 'recipe_spec.rb.erb'
+    helpers(ChefCLI::Generator::TemplateHelper)
+    action :create_if_missing
+  end
 end
 
 # Recipes
 directory "#{cookbook_dir}/recipes"
 
-template "#{cookbook_dir}/recipes/default.rb" do
-  source 'recipe.rb.erb'
-  helpers(ChefCLI::Generator::TemplateHelper)
-  action :create_if_missing
+if context.yaml
+  template "#{cookbook_dir}/recipes/default.yml" do
+    source 'recipe.yml.erb'
+    helpers(ChefCLI::Generator::TemplateHelper)
+    action :create_if_missing
+  end
+else
+  template "#{cookbook_dir}/recipes/default.rb" do
+    source 'recipe.rb.erb'
+    helpers(ChefCLI::Generator::TemplateHelper)
+    action :create_if_missing
+  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"
 
-  # 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") }
+  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
 
@@ -177,4 +190,17 @@ if context.vscode_dir
   end
 end
 
-include_recipe '::build_cookbook' if context.enable_workflow
+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/recipe.rb

@@ -1,6 +1,7 @@
 context = ChefCLI::Generator.context
 cookbook_dir = File.join(context.cookbook_root, context.cookbook_name)
 recipe_path = File.join(cookbook_dir, 'recipes', "#{context.new_file_basename}.rb")
+recipe_path_yml = File.join(cookbook_dir, 'recipes', "#{context.new_file_basename}.yml")
 spec_helper_path = File.join(cookbook_dir, 'spec', 'spec_helper.rb')
 spec_dir = File.join(cookbook_dir, 'spec', 'unit', 'recipes')
 spec_path = File.join(spec_dir, "#{context.new_file_basename}_spec.rb")
@@ -44,7 +45,14 @@ template inspec_path do
 end
 
 # Recipe
-template recipe_path do
-  source 'recipe.rb.erb'
-  helpers(ChefCLI::Generator::TemplateHelper)
+if context.yaml
+  template recipe_path_yml do
+    source 'recipe.yml.erb'
+    helpers(ChefCLI::Generator::TemplateHelper)
+  end
+else
+  template recipe_path do
+    source 'recipe.rb.erb'
+    helpers(ChefCLI::Generator::TemplateHelper)
+  end
 end