chef-cli 5.6.1 → 5.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 308c1bbb1d1f4d2070055036818dc566c577d28cd3c6ab476054029302082676
-  data.tar.gz: a5cc534e4f0d0ae65347b5b438ffc968b4dc982078a37e6c89ff1a351eee4ee3
+  metadata.gz: f99463373ae13f85a16df321c3bb756e8eba19d8e1e7f15b3ae3f2eb173253f2
+  data.tar.gz: 9f7d1ebb555efa92cc22c8957f24b18f1bb823e19e140518838318584158b8c0
 SHA512:
-  metadata.gz: 6d53620886e274948207b24d28dcb1bae9f3b784d64783ae42b9698f5359c6ef1653bb1a65417d3309a0bdef10d3254663049447c9a6cdfdcfe1321739335a7d
-  data.tar.gz: abc2a02f25e66edb3bd03b9c1a4903310f1029f699107b23565e3629cacb65b8254faaacb8354f2a00b1c9b6155eaa39df1f3709542eb840f5a2477310b221e4
+  metadata.gz: c602f596eac142ce3fbf2f81dbdc987f22768e3b4c35fbb0c1d5615eb94eaba4085444ae4a7270986229c1ff90b4f81eddb36b87a1ae9db353c96f43f613d25d
+  data.tar.gz: e2956dcc853d9a61e74ad243e9fd7f8a391687f5be8e82a72ba89408b1a97025ef1a5f274867ca4ff99f807dee0432bb76ec1a75a3ea478132253d5f965acc50

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.6"
+  gem.required_ruby_version = ">= 2.7"
 
   gem.files = %w{Rakefile LICENSE} +
     Dir.glob("Gemfile*") + # Includes Gemfile and locks

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

@@ -122,7 +122,7 @@ module ChefCLI
         return "" unless (completion_template_basename = completion_template_for(shell))
 
         completion_template_path = expand_completion_template_path(completion_template_basename)
-        erb = ERB.new(File.read(completion_template_path), nil, "-")
+        erb = ERB.new(File.read(completion_template_path), trim_mode: "-")
         context_binding = shell_completion_template_context.get_binding
         erb.result(context_binding)
       end

data/lib/chef-cli/configurable.rb

@@ -18,9 +18,6 @@
 require "chef/config"
 require "chef/workstation_config_loader"
 
-require_relative "cookbook_omnifetch"
-require_relative "chef_server_api_multi"
-
 # Define a config context for ChefCLI
 class Chef::Config
 
@@ -52,8 +49,6 @@ module ChefCLI
 
       config_loader.load
       @chef_config = Chef::Config
-      CookbookOmnifetch.integration.default_chef_server_http_client = default_chef_server_http_client
-      @chef_config
     end
 
     def chefcli_config
@@ -80,14 +75,5 @@ module ChefCLI
       @chef_config = nil
       @config_loader = nil
     end
-
-    def default_chef_server_http_client
-      lambda do
-        ChefServerAPIMulti.new(@chef_config.chef_server_url,
-          signing_key_filename: @chef_config.client_key,
-          client_name: @chef_config.node_name)
-      end
-    end
-
   end
 end

data/lib/chef-cli/cookbook_omnifetch.rb

@@ -15,7 +15,10 @@
 # limitations under the License.
 #
 
+require "chef/config"
 require "cookbook-omnifetch"
+require_relative "exceptions"
+require_relative "chef_server_api_multi"
 require_relative "shell_out"
 require_relative "cookbook_metadata"
 require_relative "helpers"
@@ -29,4 +32,15 @@ CookbookOmnifetch.configure do |c|
   c.shell_out_class = ChefCLI::ShellOut
   c.cached_cookbook_class = ChefCLI::CookbookMetadata
   c.chef_server_download_concurrency = 10
+
+  c.default_chef_server_http_client = lambda do
+    if Chef::Config.node_name.nil?
+      raise ChefCLI::BUG.new("CookbookOmnifetch.default_chef_server_http_client requires Chef::Config;" \
+                             " load the config or configure a different default")
+    end
+
+    ChefCLI::ChefServerAPIMulti.new(Chef::Config.chef_server_url,
+                                    signing_key_filename: Chef::Config.client_key,
+                                    client_name: Chef::Config.node_name)
+  end
 end

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

@@ -117,9 +117,10 @@ module ChefCLI
       private
 
       def with_staging_dir
-        p = Process.pid
-        t = Time.new.utc.strftime("%Y%m%d%H%M%S")
-        Dir.mktmpdir("chefcli-export-#{p}-#{t}") do |d|
+        require "securerandom" unless defined?(SecureRandom)
+        random_string = SecureRandom.hex(2)
+        path = "chef-export-#{random_string}"
+        Dir.mktmpdir(path) do |d|
           begin
             @staging_dir = d
             yield

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

@@ -112,7 +112,7 @@ module ChefCLI
         ui.msg ""
 
         ui.msg "Lockfile written to #{policyfile_lock_expanded_path}"
-        ui.msg "Policy revision id: #{policyfile_lock.revision_id}"
+        ui.msg "Policy revision id: #{lock_data["revision_id"]}"
       rescue => error
         raise PolicyfileInstallError.new("Failed to generate Policyfile.lock", error)
       end

data/lib/chef-cli/version.rb

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

data/spec/unit/configurable_spec.rb

@@ -40,29 +40,4 @@ describe ChefCLI::Configurable do
   it "provides generator_config" do
     expect(includer.generator_config).to eq Chef::Config.chefcli.generator
   end
-
-  describe "loading Chef Config" do
-
-    let(:url) { "https://chef.example/organizations/myorg" }
-
-    let(:key_path) { "/path/to/my/key.pem" }
-
-    let(:username) { "my-username" }
-
-    before do
-      Chef::Config.chef_server_url(url)
-      Chef::Config.client_key(key_path)
-      Chef::Config.node_name(username)
-      includer.chef_config
-    end
-
-    it "creates a default chef server HTTP client for Omnifetch" do
-      client = CookbookOmnifetch.default_chef_server_http_client
-      expect(client).to be_a_kind_of(ChefCLI::ChefServerAPIMulti)
-      expect(client.url).to eq(url)
-      expect(client.opts[:signing_key_filename]).to eq(key_path)
-      expect(client.opts[:client_name]).to eq(username)
-    end
-
-  end
 end

data/spec/unit/cookbook_omnifetch.rb

@@ -0,0 +1,50 @@
+
+# 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 "chef-cli/cookbook_omnifetch"
+
+describe "CookbookOmnifetch dependency" do
+  describe "lambda for default_chef_server_http_client" do
+    context "after chef config is loaded" do
+      let(:url) { "https://chef.example/organizations/myorg" }
+      let(:key_path) { "/path/to/my/key.pem" }
+      let(:username) { "my-username" }
+
+      before do
+        Chef::Config.chef_server_url(url)
+        Chef::Config.client_key(key_path)
+        Chef::Config.node_name(username)
+      end
+
+      it "creates a default chef server HTTP client for Omnifetch" do
+        client = CookbookOmnifetch.default_chef_server_http_client
+        expect(client).to be_a_kind_of(ChefCLI::ChefServerAPIMulti)
+        expect(client.url).to eq(url)
+        expect(client.opts[:signing_key_filename]).to eq(key_path)
+        expect(client.opts[:client_name]).to eq(username)
+      end
+    end
+
+    context "before chef config is loaded" do
+      it "raises an exception" do
+        expect { CookbookOmnifetch.default_chef_server_http_client }
+          .to raise_exception(ChefCLI::BUG)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-cli
 version: !ruby/object:Gem::Version
-  version: 5.6.1
+  version: 5.6.11
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2023-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
@@ -440,6 +440,7 @@ files:
 - spec/unit/commands_map_spec.rb
 - spec/unit/configurable_spec.rb
 - spec/unit/cookbook_metadata_spec.rb
+- spec/unit/cookbook_omnifetch.rb
 - spec/unit/cookbook_profiler/git_spec.rb
 - spec/unit/cookbook_profiler/identifiers_spec.rb
 - spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_one.rb
@@ -606,7 +607,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -666,6 +667,7 @@ test_files:
 - spec/unit/commands_map_spec.rb
 - spec/unit/configurable_spec.rb
 - spec/unit/cookbook_metadata_spec.rb
+- spec/unit/cookbook_omnifetch.rb
 - spec/unit/cookbook_profiler/git_spec.rb
 - spec/unit/cookbook_profiler/identifiers_spec.rb
 - spec/unit/fixtures/chef-runner-cookbooks/test_cookbook/recipes/recipe_one.rb