chef-cli 5.6.23 → 6.1.27

data/spec/unit/command/diff_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/env_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@
 require "spec_helper"
 autoload :YAML, "yaml"
 require "chef-cli/command/env"
-
 describe ChefCLI::Command::Env do
   let(:ui) { TestHelpers::TestUI.new }
   let(:command_instance) { ChefCLI::Command::Env.new }
@@ -35,9 +34,11 @@ describe ChefCLI::Command::Env do
 
   describe "when running from within an omnibus install" do
     before do
+      allow(command_instance).to receive(:habitat_install?).and_return false
       allow(command_instance).to receive(:omnibus_install?).and_return true
       allow(command_instance).to receive(:omnibus_embedded_bin_dir).and_return(omnibus_embedded_bin_dir)
       allow(command_instance).to receive(:omnibus_bin_dir).and_return(omnibus_bin_dir)
+      allow(command_instance).to receive(:get_product_info).and_return(ChefCLI::Dist::PRODUCT)
       command_instance.ui = ui
     end
 
@@ -57,6 +58,7 @@ describe ChefCLI::Command::Env do
   end
   describe "when running locally" do
     before do
+      allow(command_instance).to receive(:habitat_install?).and_return false
       allow(command_instance).to receive(:omnibus_install?).and_return false
       command_instance.ui = ui
     end
@@ -79,6 +81,134 @@ describe ChefCLI::Command::Env do
       end
     end
   end
+
+  describe "when running in a Chef-cli Habitat Standalone package" do
+    let(:standalone_pkg_base) { "/hab/pkgs/chef/chef-cli" }
+    let(:standalone_pkg_version) { "1.0.0" }
+    let(:standalone_pkg_build) { "20240210120000" }
+    let(:standalone_pkg_path) { "#{standalone_pkg_base}/#{standalone_pkg_version}/#{standalone_pkg_build}" }
+
+    let(:ruby_version) { "3.1.0" }
+    let(:ruby_base) { "/hab/pkgs/core/ruby/#{ruby_version}/20240101000000/lib/ruby/gems" }
+    let(:cli_gem_home) { "/hab/pkgs/chef/chef-cli/#{standalone_pkg_version}/20240210121000/vendor/bundle/ruby/#{ruby_version}" }
+
+    before do
+      allow(command_instance).to receive(:habitat_install?).and_return(true)
+      allow(command_instance).to receive(:habitat_standalone?).and_return(true)
+      allow(command_instance).to receive(:habitat_chef_dke?).and_return(false)
+      allow(command_instance).to receive(:omnibus_install?).and_return(false)
+      allow(command_instance).to receive(:get_product_info).and_return(ChefCLI::Dist::CHEF_CLI_PACKAGE)
+  
+      allow(command_instance).to receive(:get_pkg_install_path).and_return(standalone_pkg_path)
+
+      allow(command_instance).to receive(:habitat_env).and_return({
+        "GEM_ROOT" => ruby_base,
+        "GEM_HOME" => cli_gem_home,
+        "GEM_PATH" => cli_gem_home,
+        "PATH" => "#{standalone_pkg_path}/bin:/usr/local/bin:/usr/bin"
+      })
+
+      command_instance.ui = ui
+    end
+  
+    describe "and the env command is run" do
+      let(:yaml) { YAML.load(ui.output) }
+      
+      before :each do
+        run_command
+      end
+  
+      it "should include correct chef-cli hab pkg name" do
+        expect(yaml).to have_key(ChefCLI::Dist::CHEF_CLI_PACKAGE)
+      end
+  
+      it "should include correct chef-cli hab pkg version info" do
+        expect(yaml[ChefCLI::Dist::CHEF_CLI_PACKAGE]["Version"]).to eql ChefCLI::VERSION
+      end
+  
+      it "should include correct Habitat installation path" do
+        expect(yaml[ChefCLI::Dist::CHEF_CLI_PACKAGE]["Install Directory"]).to eql standalone_pkg_path
+      end
+
+      it "should include correct GEM_ROOT path" do
+        expect(yaml["Ruby"]["RubyGems"]["Gem Environment"]["GEM ROOT"]).to eql ruby_base
+      end
+  
+      it "should include correct GEM_HOME path" do
+        expect(yaml["Ruby"]["RubyGems"]["Gem Environment"]["GEM HOME"]).to eql cli_gem_home
+      end
+  
+      it "should include correct GEM_PATH paths" do
+        expect(yaml["Ruby"]["RubyGems"]["Gem Environment"]["GEM PATHS"]).to eql [cli_gem_home]
+      end
+    end
+  end
+
+  describe "when running chef-cli coming with chef-workstation Habitat package" do
+    let(:hab_pkg_base) { "/hab/pkgs/chef/chef-workstation" }
+    let(:hab_pkg_version) { "1.0.0" }
+    let(:hab_pkg_build) { "20240210120000" }
+    let(:hab_pkg_path) { "#{hab_pkg_base}/#{hab_pkg_version}/#{hab_pkg_build}" }
+
+    let(:ruby_version) { "3.1.0" }
+    let(:ruby_base) { "/hab/pkgs/core/ruby/#{ruby_version}/20240101000000/lib/ruby/gems" }
+    let(:cli_gem_home) { "/hab/pkgs/chef/chef-cli/#{hab_pkg_version}/20240210121000/vendor/bundle/ruby/#{ruby_version}" }
+
+    before do
+      # Mock all Habitat-related methods
+      allow(command_instance).to receive(:habitat_install?).and_return true
+      allow(command_instance).to receive(:habitat_chef_dke?).and_return true
+      allow(command_instance).to receive(:habitat_standalone?).and_return false
+      allow(command_instance).to receive(:omnibus_install?).and_return false
+      allow(command_instance).to receive(:get_product_info).and_return(ChefCLI::Dist::CHEF_DK_CLI_PACKAGE)
+
+      # Mock Habitat package paths
+      allow(command_instance).to receive(:get_pkg_install_path).and_return(hab_pkg_path)
+
+      # Mock habitat_env to reflect correct GEM paths
+      allow(command_instance).to receive(:habitat_env).and_return({
+        "GEM_ROOT" => ruby_base,
+        "GEM_HOME" => cli_gem_home,
+        "GEM_PATH" => cli_gem_home,
+        "PATH" => "#{hab_pkg_path}/bin:/usr/local/bin:/usr/bin"
+      })
+
+      command_instance.ui = ui
+    end
+
+    describe "and the env command is run" do
+      let(:yaml) { YAML.load(ui.output) }
+  
+      before :each do
+        run_command
+      end
+
+      it "should include correct product name for chef-workstation Habitat package" do
+        expect(yaml).to have_key(ChefCLI::Dist::CHEF_DK_CLI_PACKAGE)
+      end
+
+      it "should include correct version" do
+        expect(yaml[ChefCLI::Dist::CHEF_DK_CLI_PACKAGE]["Version"]).to eql ChefCLI::VERSION
+      end
+
+      it "should include correct Habitat installation path" do
+        expect(yaml[ChefCLI::Dist::CHEF_DK_CLI_PACKAGE]["Install Directory"]).to eql hab_pkg_path
+      end
+
+      it "should include correct GEM_ROOT path" do
+        expect(yaml["Ruby"]["RubyGems"]["Gem Environment"]["GEM ROOT"]).to eql ruby_base
+      end
+  
+      it "should include correct GEM_HOME path" do
+        expect(yaml["Ruby"]["RubyGems"]["Gem Environment"]["GEM HOME"]).to eql cli_gem_home
+      end
+  
+      it "should include correct GEM_PATH paths" do
+        expect(yaml["Ruby"]["RubyGems"]["Gem Environment"]["GEM PATHS"]).to eql [cli_gem_home]
+      end
+    end
+  end
+
   def run_command
     command_instance.run_with_default_options(false, command_options)
   end

data/spec/unit/command/exec_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -57,6 +57,7 @@ describe ChefCLI::Command::Exec do
     let(:ruby_path) { File.join(fixtures_path, "eg_omnibus_dir/valid/embedded/bin/ruby") }
 
     before do
+      allow(command_instance).to receive(:habitat_install?).and_return(false)
       allow(Gem).to receive(:ruby).and_return(ruby_path)
 
       # Using a fake path separator to keep to prevent people from accidentally

data/spec/unit/command/export_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generate_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/attribute_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/base_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/chef_exts/generator_desc_resource_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/chef_exts/recipe_dsl_ext_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/cookbook_file_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/cookbook_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2014-2020 Chef Software Inc.
+# Copyright:: Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/generator_generator_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/helpers_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/input_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/policyfile_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/profile_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/recipe_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/repo_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/resource_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/template_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/generator_commands/waiver_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/install_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/license_spec.rb

@@ -0,0 +1,162 @@
+#
+# Copyright:: Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
+# 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/command/license"
+require "shared/command_with_ui_object"
+require "chef-cli/licensing/base"
+
+describe ChefCLI::Command::License do
+  it_behaves_like "a command with a UI object"
+
+  let(:params) { [] }
+  let(:ui) { TestHelpers::TestUI.new }
+
+  before do
+    # Disable the access of local licenses
+    allow_any_instance_of(ChefLicensing::LicenseKeyFetcher).to receive(:fetch_license_key_from_arg).and_return([])
+    allow_any_instance_of(ChefLicensing::LicenseKeyFetcher).to receive(:fetch_license_key_from_env).and_return([])
+    allow_any_instance_of(ChefLicensing::LicensingService::Local).to receive(:detected?).and_return(false)
+  end
+
+  let(:command) do
+    c = described_class.new
+    c.validate_params!(params)
+    c.ui = ui
+    c
+  end
+
+  it "disables debug by default" do
+    expect(command.debug?).to be(false)
+  end
+
+  context "invalid parameters passed" do
+    let(:multiple_params) { %w{add list} }
+    let(:invalid_command) { %w{not_a_subcommand} }
+
+    it "should fail with errors when multiple subcommands passed" do
+      expect(command.run(multiple_params)).to eq(1)
+    end
+
+    it "should fail for invalid argument" do
+      expect(command.run(invalid_command)).to eq(1)
+    end
+  end
+
+  context "license command" do
+    context "when pre-accepted license exists" do
+      let(:license_keys) { %w{tsmc-abcd} }
+
+      before(:each) do
+        allow(ChefLicensing).to receive(:fetch_and_persist).and_return(license_keys)
+      end
+
+      it "should be successful" do
+        expect { command.run(params) }.not_to raise_exception
+      end
+
+      it "should return the correct license key" do
+        expect(command.run(params)).to eq(license_keys)
+      end
+    end
+
+    context "when no licenses are accepted previously" do
+      let(:new_key) { ["tsmc-123456789"] }
+      before(:each) do
+        ChefLicensing.configure do |config|
+          config.license_server_url = "https://license.test"
+          config.chef_product_name = "chef"
+          config.chef_entitlement_id = "chef-entitled-id"
+          config.chef_executable_name = "chef"
+        end
+
+        # Disable the active license check
+        allow_any_instance_of(ChefLicensing::LicenseKeyFetcher).to receive(:licenses_active?).and_return(false)
+        # Disable the UI engine
+        allow_any_instance_of(ChefLicensing::LicenseKeyFetcher).to receive(:append_extra_info_to_tui_engine)
+        # Disable the API call to fetch the license type
+        allow_any_instance_of(ChefLicensing::LicenseKeyFetcher).to receive(:get_license_type).and_return("free")
+        # Disable the overwriting to the license.yml file
+        allow_any_instance_of(ChefLicensing::LicenseKeyFetcher::File).to receive(:persist)
+
+        # Mocks the user prompt to enter the license
+        allow_any_instance_of(ChefLicensing::LicenseKeyFetcher::Prompt).to receive(:fetch).and_return(new_key)
+        allow(ChefLicensing).to receive(:fetch_and_persist).and_return(new_key)
+      end
+
+      it "should create and stores the new license" do
+        expect { command.run(params) }.not_to raise_exception
+      end
+
+      it "should be same as the user entered license" do
+        expect(command.run(params)).to include(new_key.first)
+      end
+    end
+  end
+
+  context "chef license list command" do
+    let(:params) { %w{list} }
+    let(:license_key) { "tsmn-123123" }
+
+    before do
+      command.ui = ui
+    end
+
+    context "when no licenses are accepted" do
+      before do
+        allow_any_instance_of(ChefLicensing::ListLicenseKeys).to receive(:fetch_license_keys).and_return([])
+        allow_any_instance_of(ChefLicensing::ListLicenseKeys).to receive(:fetch_licenses_metadata).and_return([])
+      end
+
+      it "should return the correct error message" do
+        expect(command.run(params)).to eq([])
+      end
+    end
+
+    context "when there is a valid license" do
+      before do
+        allow(ChefLicensing).to receive(:list_license_keys_info).and_return(license_key)
+      end
+
+      it "should print the license details" do
+        expect(command.run(params)).to eq(license_key)
+      end
+    end
+  end
+
+  context "chef license add command" do
+    let(:params) { %w{add} }
+    let(:license_key) { ["tsmn-123123"] }
+
+    before do
+      # Disable the API call to fetch the license type
+      allow_any_instance_of(ChefLicensing::LicenseKeyFetcher).to receive(:get_license_type).and_return("free")
+      # Disable the overwriting to the license.yml file
+      allow_any_instance_of(ChefLicensing::LicenseKeyFetcher::File).to receive(:persist)
+      # Mocks the user prompt to enter the license
+      allow_any_instance_of(ChefLicensing::LicenseKeyFetcher::Prompt).to receive(:fetch).and_return(license_key)
+    end
+
+    it "should not raise any errors" do
+      expect { command.run(params) }.not_to raise_exception
+    end
+
+    it "should create and store the new license" do
+      expect(command.run(params)).to include(license_key.first)
+    end
+  end
+end

data/spec/unit/command/push_archive_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/unit/command/push_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Chef Software Inc.
+#  Copyright (c) 2019-2025 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");