chef-cli 4.0.0 → 5.3.0

data/spec/unit/fixtures/example_cookbook_both_metadata/Berksfile

@@ -0,0 +1,3 @@
+source "https://supermarket.getchef.com"
+
+metadata

data/spec/unit/fixtures/example_cookbook_both_metadata/README.md

@@ -0,0 +1,4 @@
+# bar-cookbook
+
+TODO: Enter the cookbook description here.
+

data/spec/unit/fixtures/example_cookbook_both_metadata/chefignore

@@ -0,0 +1,96 @@
+# Put files/directories that should be ignored in this file when uploading
+# or sharing to the community site.
+# Lines that start with '# ' are comments.
+
+# OS generated files #
+######################
+.DS_Store
+Icon?
+nohup.out
+ehthumbs.db
+Thumbs.db
+
+# SASS #
+########
+.sass-cache
+
+# EDITORS #
+###########
+\#*
+.#*
+*~
+*.sw[a-z]
+*.bak
+REVISION
+TAGS*
+tmtags
+*_flymake.*
+*_flymake
+*.tmproj
+.project
+.settings
+mkmf.log
+
+## COMPILED ##
+##############
+a.out
+*.o
+*.pyc
+*.so
+*.com
+*.class
+*.dll
+*.exe
+*/rdoc/
+
+# Testing #
+###########
+.watchr
+.rspec
+spec/*
+spec/fixtures/*
+test/*
+features/*
+Guardfile
+Procfile
+
+# SCM #
+#######
+.git
+*/.git
+.gitignore
+.gitmodules
+.gitconfig
+.gitattributes
+.svn
+*/.bzr/*
+*/.hg/*
+*/.svn/*
+
+# Berkshelf #
+#############
+Berksfile
+Berksfile.lock
+cookbooks/*
+tmp
+
+# Cookbooks #
+#############
+CONTRIBUTING
+CHANGELOG*
+
+# Strainer #
+############
+Colanderfile
+Strainerfile
+.colander
+.strainer
+
+# Vagrant #
+###########
+.vagrant
+Vagrantfile
+
+# Travis #
+##########
+.travis.yml

data/spec/unit/fixtures/example_cookbook_both_metadata/metadata.json

@@ -0,0 +1,5 @@
+{
+  "name": "example_cookbook",
+  "version": "0.1.0"
+}
+

data/spec/unit/fixtures/example_cookbook_both_metadata/metadata.rb

@@ -0,0 +1,9 @@
+# This is vitally important for cookbooks that ship with context-dependent
+# metadata.rb (to do things like auto incrementing semantic versioning) where
+# the metadata.json means the cookbook is 'finalized' and must be authoritative.
+# We need to never try to parse metadata.rb if the metadata.json exists.  It isn't
+# sufficient to simply not use the metadata.rb file, but we must allow the
+# metadata.rb to have an invalid parse due to LoadErrors in the environment where
+# the cookbook is being loaded.
+
+raise "we never want to read the metadata.rb if metadata.json exists"

data/spec/unit/fixtures/example_cookbook_both_metadata/recipes/default.rb

@@ -0,0 +1,8 @@
+#
+# Cookbook Name:: example_cookbook
+# Recipe:: default
+#
+# Copyright (C) 2014 
+#
+# 
+#

data/spec/unit/helpers_spec.rb

@@ -0,0 +1,111 @@
+# Copyright:: Copyright (c) 2014-2018 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 "chef-cli/helpers"
+
+describe ChefCLI::Helpers do
+  context "path_check!" do
+
+    before do
+      allow(Gem).to receive(:ruby).and_return(ruby_path)
+    end
+
+    context "when installed via omnibus" do
+      before do
+        allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return true
+      end
+
+      context "on unix" do
+
+        let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, "bin")) }
+        let(:omnibus_embedded_bin_dir) { "/opt/chef-workstation/embedded/bin" }
+        let(:omnibus_bin_dir) { "/opt/chef-workstation/bin" }
+        let(:expected_PATH) { [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ] }
+        let(:expected_GEM_ROOT) { Gem.default_dir }
+        let(:expected_GEM_HOME) { Gem.user_dir }
+        let(:expected_GEM_PATH) { Gem.path.join(File::PATH_SEPARATOR) }
+        let(:ruby_path) { "/opt/chef-workstation/embedded/bin/ruby" }
+
+        it "#omnibus_env path" do
+          allow(ChefCLI::Helpers).to receive(:omnibus_bin_dir).and_return("/opt/chef-workstation/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_embedded_bin_dir).and_return("/opt/chef-workstation/embedded/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_env).and_return(
+            "PATH" => expected_PATH.flatten.uniq.join(File::PATH_SEPARATOR),
+            "GEM_ROOT" => expected_GEM_ROOT,
+            "GEM_HOME" => expected_GEM_HOME,
+            "GEM_PATH" => expected_GEM_PATH
+          )
+        end
+      end
+
+      context "on windows" do
+        let(:ruby_path) { "c:/opscode/chef-workstation/embedded/bin/ruby.exe" }
+        let(:user_bin_dir) { File.expand_path(File.join(Gem.user_dir, "bin")) }
+        let(:omnibus_embedded_bin_dir) { "c:/opscode/chef-workstation/embedded/bin" }
+        let(:omnibus_bin_dir) { "c:/opscode/chef-workstation/bin" }
+        let(:expected_GEM_ROOT) { Gem.default_dir }
+        let(:expected_GEM_HOME) { Gem.user_dir }
+        let(:expected_GEM_PATH) { Gem.path.join(File::PATH_SEPARATOR) }
+        let(:omnibus_root) { "c:/opscode/chef-workstation" }
+        let(:expected_PATH) { [ omnibus_bin_dir, user_bin_dir, omnibus_embedded_bin_dir, ENV["PATH"].split(File::PATH_SEPARATOR) ] }
+
+        before do
+          allow(ChefCLI::Helpers).to receive(:expected_omnibus_root).and_return(ruby_path)
+          allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return(true)
+          allow(Chef::Platform).to receive(:windows?).and_return(true)
+        end
+
+        it "#omnibus_env path" do
+          allow(ChefCLI::Helpers).to receive(:omnibus_bin_dir).and_return("c:/opscode/chef-workstation/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_embedded_bin_dir).and_return("c:/opscode/chef-workstation/embedded/bin")
+          allow(ChefCLI::Helpers).to receive(:omnibus_env).and_return(
+            "PATH" => expected_PATH.flatten.uniq.join(File::PATH_SEPARATOR),
+            "GEM_ROOT" => expected_GEM_ROOT,
+            "GEM_HOME" => expected_GEM_HOME,
+            "GEM_PATH" => expected_GEM_PATH
+          )
+        end
+      end
+    end
+
+    context "when not installed via omnibus" do
+
+      before do
+        allow(ChefCLI::Helpers).to receive(:omnibus_install?).and_return false
+      end
+      let(:ruby_path) { "/Users/bog/.lots_o_rubies/2.1.2/bin/ruby" }
+      let(:expected_root_path) { "/Users/bog/.lots_o_rubies" }
+
+      before do
+        allow(File).to receive(:exist?).with(expected_root_path).and_return(false)
+
+        %i{
+          omnibus_root
+          omnibus_bin_dir
+          omnibus_embedded_bin_dir
+        }.each do |method_name|
+          allow(ChefCLI::Helpers).to receive(method_name).and_raise(ChefCLI::OmnibusInstallNotFound.new)
+        end
+      end
+
+      it "skips the sanity check without error" do
+
+      end
+
+    end
+  end
+end

data/spec/unit/policyfile_evaluation_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018, 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");
@@ -555,6 +555,72 @@ describe ChefCLI::PolicyfileCompiler do
 
     end
 
+    describe "the metadata DSL keyword used in a cookbook with metadata" do
+      let(:policyfile_rb) do
+        <<-EOH
+          run_list "foo"
+          metadata
+        EOH
+      end
+      it "reads the metadata from the current cookbook" do
+        expect(File).to receive(:exist?).with("./metadata.rb").and_return(true)
+        expect(ChefCLI::CookbookMetadata).to receive(:from_path).and_return(double(cookbook_name: "foo"))
+        expect(policyfile.errors.size).to eq(0)
+        expect(policyfile.errors.first).to eq(nil)
+      end
+    end
+
+    describe "the metadata DSL keyword used in a cookbook without metadata" do
+      let(:policyfile_rb) do
+        <<-EOH
+          run_list "foo"
+          metadata
+        EOH
+      end
+      it "throws a missing cookbook metadata error" do
+        expected = <<~EOH
+         Evaluation of policyfile 'TestPolicyfile.rb' raised an exception
+           Exception: ChefCLI::PolicyfileMissingCookbookMetadata "Policyfile specified to use cookbook metadata, but neither ./metadata.rb or ./metadata.json was found."
+
+           Relevant Code:
+             2: metadata
+
+           Backtrace:
+             TestPolicyfile.rb:2:in `eval_policyfile'
+        EOH
+        expect(File).to receive(:exist?).with("./metadata.rb").and_return(false)
+        expect(File).to receive(:exist?).with("./metadata.json").and_return(false)
+        expect(policyfile.errors.size).to eq(1)
+        expect(policyfile.errors.first).to eq(expected)
+      end
+    end
+
+    describe "the metadata DSL keyword used in a cookbook with bad metadata" do
+      let(:policyfile_rb) do
+        <<-EOH
+          run_list "foo"
+          metadata
+        EOH
+      end
+      it "throws a bad cookbook metadata error" do
+        expected = <<~EOH
+         Evaluation of policyfile 'TestPolicyfile.rb' raised an exception
+           Exception: ChefCLI::PolicyfileBadCookbookMetadata "Cookbook metadata for cookbook at . could not be parsed:
+             Original Exception: No such file or directory @ rb_sysopen - ./metadata.json"
+
+           Relevant Code:
+             2: metadata
+
+           Backtrace:
+             TestPolicyfile.rb:2:in `eval_policyfile'
+        EOH
+        expect(File).to receive(:exist?).with("./metadata.rb").and_return(true)
+        expect(File).to receive(:exist?).with("./metadata.json").and_return(true)
+        expect(policyfile.errors.size).to eq(1)
+        expect(policyfile.errors.first).to eq(expected)
+      end
+    end
+
     describe "defining attributes" do
 
       let(:policyfile_rb) do

data/spec/unit/policyfile_services/export_repo_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2018 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");
@@ -42,12 +42,15 @@ describe ChefCLI::PolicyfileServices::ExportRepo do
 
   let(:archive) { false }
 
+  let(:policy_group) { nil }
+
   subject(:export_service) do
     described_class.new(policyfile: policyfile_rb_explicit_name,
                         root_dir: working_dir,
                         export_dir: export_dir,
                         archive: archive,
-                        force: force_export)
+                        force: force_export,
+                        policy_group: policy_group)
   end
 
   it "uses Policyfile.rb as the default Policyfile name" do
@@ -306,6 +309,52 @@ describe ChefCLI::PolicyfileServices::ExportRepo do
             expect(File).to exist(readme_path)
           end
 
+          context "when the policy_group is changed" do
+            let(:policy_group) { "production" }
+            it "creates a policy_group file for a specified policy group with the revision id of the exported policy" do
+              exported_policy_group_path = File.join(export_dir, "policy_groups", "production.json")
+              exported_policy_group_data = FFI_Yajl::Parser.parse(IO.read(exported_policy_group_path))
+
+              expected_data = { "policies" => { "install-example" => { "revision_id" => revision_id } } }
+
+              expect(exported_policy_group_data).to eq(expected_data)
+            end
+
+            it "creates a working local mode configuration file with the changed policy_group" do
+              expected_config_text = <<~CONFIG
+              ### Chef Infra Client Configuration ###
+              # The settings in this file will configure chef to apply the exported policy in
+              # this directory. To use it, run:
+              #
+              # chef-client -z
+              #
+
+              policy_name 'install-example'
+              policy_group 'production'
+
+              use_policyfile true
+              policy_document_native_api true
+
+              # In order to use this repo, you need a version of Chef Infra Client and Chef Zero
+              # that supports policyfile "native mode" APIs:
+              current_version = Gem::Version.new(Chef::VERSION)
+              unless Gem::Requirement.new(">= 12.7").satisfied_by?(current_version)
+                puts("!" * 80)
+                puts(<<-MESSAGE)
+              This Chef Repo requires features introduced in Chef Infra Client 12.7, but you are using
+              Chef \#{Chef::VERSION}. Please upgrade to Chef Infra Client 12.7 or later.
+              MESSAGE
+                puts("!" * 80)
+                exit!(1)
+              end
+
+              CONFIG
+              config_path = File.join(export_dir, ".chef", "config.rb")
+              expect(File).to exist(config_path)
+              expect(IO.read(config_path)).to eq(expected_config_text)
+            end
+          end
+
         end
 
         context "when the export dir is empty" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-04 00:00:00.000000000 Z
+date: 2021-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -240,7 +240,6 @@ files:
 - lib/chef-cli/command/generator_commands.rb
 - lib/chef-cli/command/generator_commands/attribute.rb
 - lib/chef-cli/command/generator_commands/base.rb
-- lib/chef-cli/command/generator_commands/build_cookbook.rb
 - lib/chef-cli/command/generator_commands/chef_exts/generator_desc_resource.rb
 - lib/chef-cli/command/generator_commands/chef_exts/quieter_doc_formatter.rb
 - lib/chef-cli/command/generator_commands/chef_exts/recipe_dsl_ext.rb
@@ -328,13 +327,9 @@ files:
 - lib/chef-cli/service_exceptions.rb
 - lib/chef-cli/shell_out.rb
 - lib/chef-cli/skeletons/code_generator/files/default/Berksfile
-- lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/README.md
-- lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/kitchen.yml
-- lib/chef-cli/skeletons/code_generator/files/default/build_cookbook/test-fixture-recipe.rb
 - 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-config.json
 - 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
@@ -354,7 +349,6 @@ files:
 - lib/chef-cli/skeletons/code_generator/files/default/spec_helper_policyfile.rb
 - lib/chef-cli/skeletons/code_generator/metadata.rb
 - lib/chef-cli/skeletons/code_generator/recipes/attribute.rb
-- lib/chef-cli/skeletons/code_generator/recipes/build_cookbook.rb
 - 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
@@ -372,9 +366,6 @@ 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/build_cookbook/Berksfile.erb
-- lib/chef-cli/skeletons/code_generator/templates/default/build_cookbook/metadata.rb.erb
-- lib/chef-cli/skeletons/code_generator/templates/default/build_cookbook/recipe.rb.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
@@ -384,6 +375,7 @@ files:
 - lib/chef-cli/skeletons/code_generator/templates/default/kitchen_policyfile.yml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/metadata.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/recipe.rb.erb
+- lib/chef-cli/skeletons/code_generator/templates/default/recipe.yml.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/recipe_spec.rb.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/repo/gitignore.erb
 - lib/chef-cli/skeletons/code_generator/templates/default/resource.rb.erb
@@ -416,7 +408,6 @@ files:
 - spec/unit/command/generate_spec.rb
 - spec/unit/command/generator_commands/attribute_spec.rb
 - spec/unit/command/generator_commands/base_spec.rb
-- spec/unit/command/generator_commands/build_cookbook_spec.rb
 - spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb
 - spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
@@ -494,6 +485,14 @@ files:
 - spec/unit/fixtures/example_cookbook/chefignore
 - spec/unit/fixtures/example_cookbook/metadata.rb
 - spec/unit/fixtures/example_cookbook/recipes/default.rb
+- spec/unit/fixtures/example_cookbook_both_metadata/.gitignore
+- spec/unit/fixtures/example_cookbook_both_metadata/.kitchen.yml
+- spec/unit/fixtures/example_cookbook_both_metadata/Berksfile
+- spec/unit/fixtures/example_cookbook_both_metadata/README.md
+- spec/unit/fixtures/example_cookbook_both_metadata/chefignore
+- spec/unit/fixtures/example_cookbook_both_metadata/metadata.json
+- spec/unit/fixtures/example_cookbook_both_metadata/metadata.rb
+- spec/unit/fixtures/example_cookbook_both_metadata/recipes/default.rb
 - spec/unit/fixtures/example_cookbook_metadata_json_only/.gitignore
 - spec/unit/fixtures/example_cookbook_metadata_json_only/.kitchen.yml
 - spec/unit/fixtures/example_cookbook_metadata_json_only/Berksfile
@@ -529,6 +528,7 @@ files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/helpers_spec.rb
 - spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb
@@ -595,7 +595,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -631,7 +631,6 @@ test_files:
 - spec/unit/command/generate_spec.rb
 - spec/unit/command/generator_commands/attribute_spec.rb
 - spec/unit/command/generator_commands/base_spec.rb
-- spec/unit/command/generator_commands/build_cookbook_spec.rb
 - spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb
 - spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb
 - spec/unit/command/generator_commands/cookbook_file_spec.rb
@@ -709,6 +708,14 @@ test_files:
 - spec/unit/fixtures/example_cookbook/chefignore
 - spec/unit/fixtures/example_cookbook/metadata.rb
 - spec/unit/fixtures/example_cookbook/recipes/default.rb
+- spec/unit/fixtures/example_cookbook_both_metadata/.gitignore
+- spec/unit/fixtures/example_cookbook_both_metadata/.kitchen.yml
+- spec/unit/fixtures/example_cookbook_both_metadata/Berksfile
+- spec/unit/fixtures/example_cookbook_both_metadata/README.md
+- spec/unit/fixtures/example_cookbook_both_metadata/chefignore
+- spec/unit/fixtures/example_cookbook_both_metadata/metadata.json
+- spec/unit/fixtures/example_cookbook_both_metadata/metadata.rb
+- spec/unit/fixtures/example_cookbook_both_metadata/recipes/default.rb
 - spec/unit/fixtures/example_cookbook_metadata_json_only/.gitignore
 - spec/unit/fixtures/example_cookbook_metadata_json_only/.kitchen.yml
 - spec/unit/fixtures/example_cookbook_metadata_json_only/Berksfile
@@ -744,6 +751,7 @@ test_files:
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/metadata.rb
 - spec/unit/fixtures/local_path_cookbooks/noignore-f59ee7a5bca6a4e606b67f7f856b768d847c39bb/recipes/default.rb
 - spec/unit/generator_spec.rb
+- spec/unit/helpers_spec.rb
 - spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
 - spec/unit/pager_spec.rb
 - spec/unit/policyfile/artifactory_cookbook_source_spec.rb