chef-cli 5.6.0 → 5.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8f6584f3f7241a9b2a700c32a5c2562b1d6010527a453405c42c1fba4511a16
-  data.tar.gz: 2b038f40f4f990f3bfeca2c33a4478f23e34895d7a76c8c4f8cfa7bfdc6e522f
+  metadata.gz: 8c80bb20b027a5c4311dd72bce5ab3bbc569b5700c79513b4f7f455ce7ea9319
+  data.tar.gz: 0b6764b2f73d29b39ce9aa106f8b2621a7a37725c3dd4543061b648910eb5be9
 SHA512:
-  metadata.gz: '06735193dc5c884a7260fa1d2376e7428635dcffbe846602483c1489c2670a451417ea2de0b22687e82216f76eb2351e1459b246c37ca20b4cdf31bcdf2e15a3'
-  data.tar.gz: 49d095de278a34f76c6fb10943aaaf1589d8bc936e25f916b569ca2beaff20173b5657e953dda4314a8e1f9557662a9c4c375f392920fd17f0a29986ae8f3ab0
+  metadata.gz: a2a07a53fa8f92ed504d59710c0f9ee4ae2792b9717d42e97ce2cfb45ced507e32b009a0ee5e96c9ed7bf7061ffb5cb987ca5cebd1cda3f5fa2f41816898062d
+  data.tar.gz: 278351d4ec69ff485b6b7f3d598e251fa0cc8d0419fa6a86d5ecba1bc00c4aa16f65fb400e277c36cd17ec412298db33d55d61e422d715e0fbee1f2c5b52c956

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/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

@@ -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
@@ -61,7 +56,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
@@ -76,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/version.rb

@@ -16,5 +16,5 @@
 #
 
 module ChefCLI
-  VERSION = "5.6.0".freeze
+  VERSION = "5.6.8".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.0
+  version: 5.6.8
 platform: ruby
 authors:
 - Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-02 00:00:00.000000000 Z
+date: 2022-10-14 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