chef-cli 5.6.23 → 6.1.27

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

@@ -0,0 +1,111 @@
+# frozen_string_literal: true
+
+# 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_relative "base"
+require "chef-cli/licensing/base"
+require_relative "../configurable"
+
+module ChefCLI
+  module Command
+
+    # This class will manage the license command in the chef-cli
+    class License < Base
+
+      include Configurable
+
+      MAIN_COMMAND_HELP = <<~HELP.freeze
+        Usage: #{ChefCLI::Dist::EXEC} license [SUBCOMMAND]
+
+        `#{ChefCLI::Dist::EXEC} license` command will validate the existing license
+        or will help you interactively generate new free/trial license and activate the
+        commercial license the chef team has sent you through email.
+      HELP
+
+      SUB_COMMANDS = [
+        { name: "list", description: "List details of the license(s) installed on the system." },
+        { name: "add", description: "Create & install a Free/ Trial license or install a Commercial license on the system." },
+      ].freeze
+
+      option :chef_license_key,
+        long: "--chef-license-key LICENSE",
+        description: "New license key to accept and store in the system"
+
+      attr_accessor :ui
+
+      def self.banner
+        <<~BANNER
+          #{MAIN_COMMAND_HELP}
+          Subcommands:
+          #{SUB_COMMANDS.map do |c|
+            "  #{c[:name].ljust(7)}#{c[:description]}"
+          end.join("\n") }
+
+          Options:
+        BANNER
+      end
+
+      def initialize
+        super
+
+        @ui = UI.new
+      end
+
+      def run(params)
+        config_license_debug if debug?
+        remaining_args = parse_options(params)
+        return 1 unless validate_params!(remaining_args)
+
+        if remaining_args.empty?
+          ChefCLI::Licensing::Base.validate
+        else
+          ChefCLI::Licensing::Base.send(remaining_args[0])
+        end
+      rescue ChefLicensing::LicenseKeyFetcher::LicenseKeyNotFetchedError
+        ui.msg("License key not fetched. Please try again.")
+      end
+
+      def debug?
+        !!config[:debug]
+      end
+
+      def validate_params!(args)
+        if args.length > 1
+          ui.err("Too many arguments")
+          return false
+        end
+
+        valid_subcommands = SUB_COMMANDS.collect { |c| c[:name] }
+        args.each do |arg|
+          next if valid_subcommands.include?(arg)
+
+          ui.err("Invalid option: #{arg}")
+          return false
+        end
+
+        true
+      end
+
+      private
+
+      def config_license_debug
+        ChefLicensing.output = ui
+      end
+    end
+  end
+end

data/lib/chef-cli/command/push.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");
@@ -84,10 +84,10 @@ module ChefCLI
 
       def push
         @push ||= PolicyfileServices::Push.new(policyfile: policyfile_relative_path,
-                                               ui:,
-                                               policy_group:,
-                                               config: chef_config,
-                                               root_dir: Dir.pwd)
+          ui:,
+          policy_group:,
+          config: chef_config,
+          root_dir: Dir.pwd)
       end
 
       def handle_error(error)

data/lib/chef-cli/command/push_archive.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/lib/chef-cli/command/shell_init.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");
@@ -29,6 +29,7 @@ end
 module ChefCLI
 
   class ShellCompletionTemplateContext
+    include ChefCLI::Helpers
 
     def commands
       ChefCLI.commands_map.command_specs.inject({}) do |cmd_info, (_key, cmd_spec)|
@@ -40,6 +41,10 @@ module ChefCLI
     def get_binding
       binding
     end
+
+    def habitat?
+      habitat_install?
+    end
   end
 
   module Command
@@ -103,7 +108,7 @@ module ChefCLI
           return 1
         end
 
-        env = omnibus_env.dup
+        env = (habitat_install? ? habitat_env : omnibus_env).dup
         path = env.delete("PATH")
         export(shell_name, "PATH", path)
         env.each do |var_name, value|

data/lib/chef-cli/command/show_policy.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");
@@ -87,12 +87,12 @@ module ChefCLI
       def show_policy_service
         @policy_list_service ||=
           PolicyfileServices::ShowPolicy.new(config: chef_config,
-                                             ui:,
-                                             policy_name:,
-                                             policy_group:,
-                                             show_orphans: show_orphans?,
-                                             summary_diff: show_summary_diff?,
-                                             pager: enable_pager?)
+            ui:,
+            policy_name:,
+            policy_group:,
+            show_orphans: show_orphans?,
+            summary_diff: show_summary_diff?,
+            pager: enable_pager?)
       end
 
       def debug?

data/lib/chef-cli/command/undelete.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");
@@ -93,8 +93,8 @@ module ChefCLI
       def undelete_service
         @undelete_service ||=
           PolicyfileServices::Undelete.new(config: chef_config,
-                                           ui:,
-                                           undo_record_id:)
+            ui:,
+            undo_record_id:)
       end
 
       def debug?

data/lib/chef-cli/command/update.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/lib/chef-cli/commands_map.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/lib/chef-cli/completions/bash.sh.erb

@@ -2,4 +2,4 @@ _chef_comp() {
     local COMMANDS="<%= commands.keys.join(' ')-%>"
     COMPREPLY=($(compgen -W "$COMMANDS" -- ${COMP_WORDS[COMP_CWORD]} ))
 }
-complete -F _chef_comp chef
+complete -F _chef_comp <%= habitat? ? "chef-cli" : "chef" %>

data/lib/chef-cli/completions/chef.fish.erb

@@ -5,5 +5,5 @@
 set -l chef_commands <%= commands.keys.join(' ') %>;
 
 <% commands.each do |command, desc| -%>
-complete -c chef -f -n "not __fish_seen_subcommand_from $chef_commands" -a <%= command %> -d "<%= desc %>";
+complete -c <%= habitat? ? "chef-cli" : "chef" %> -f -n "not __fish_seen_subcommand_from $chef_commands" -a <%= command %> -d "<%= desc %>";
 <% end -%>

data/lib/chef-cli/completions/zsh.zsh.erb

@@ -17,5 +17,5 @@ function _chef() {
   fi
 }
 
-compdef _chef chef
+compdef _chef <%= habitat? ? "chef-cli" : "chef" %>
 

data/lib/chef-cli/configurable.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/lib/chef-cli/cookbook_metadata.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/lib/chef-cli/cookbook_omnifetch.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");
@@ -40,7 +40,7 @@ CookbookOmnifetch.configure do |c|
     end
 
     ChefCLI::ChefServerAPIMulti.new(Chef::Config.chef_server_url,
-                                    signing_key_filename: Chef::Config.client_key,
-                                    client_name: Chef::Config.node_name)
+      signing_key_filename: Chef::Config.client_key,
+      client_name: Chef::Config.node_name)
   end
 end

data/lib/chef-cli/cookbook_profiler/git.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/lib/chef-cli/cookbook_profiler/identifiers.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/lib/chef-cli/cookbook_profiler/null_scm.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/lib/chef-cli/dist.rb

@@ -6,10 +6,16 @@ module ChefCLI
     PRODUCT = "Chef Workstation".freeze
     PRODUCT_PKG_HOME = "chef-workstation".freeze
 
+    CHEF_DK_CLI_PACKAGE = "Chef Workstation".freeze
+    CHEF_CLI_PACKAGE = "Chef-Cli".freeze
+
     # the name of the chef-cli gem
     CLI_PRODUCT = "Chef CLI".freeze
     CLI_GEM = "chef-cli".freeze
 
+    CHEF_DKE_PKG_NAME = "chef/chef-workstation".freeze
+    HAB_PKG_NAME = "chef/chef-cli".freeze
+
     # the name of the overall infra product
     INFRA_PRODUCT = "Chef Infra".freeze
 

data/lib/chef-cli/exceptions.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/lib/chef-cli/generator.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/lib/chef-cli/helpers.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");
@@ -60,6 +60,21 @@ module ChefCLI
       File.exist?(expected_omnibus_root) && File.exist?(File.join(expected_omnibus_root, "version-manifest.json"))
     end
 
+    # The habitat version of the chef-cli can be installed with standalone or chef-workstation
+    # This method checks if the habitat version of chef-cli is installed as standalone
+    def habitat_standalone?
+      @hab_standalone ||= (hab_pkg_installed?(ChefCLI::Dist::HAB_PKG_NAME) && !habitat_chef_dke?)
+    end
+
+    # This method checks if the habitat version of chef-cli is installed with chef-workstation
+    def habitat_chef_dke?
+      @hab_dke ||= hab_pkg_installed?(ChefCLI::Dist::CHEF_DKE_PKG_NAME)
+    end
+
+    def habitat_install?
+      habitat_chef_dke? || habitat_standalone?
+    end
+
     def omnibus_root
       @omnibus_root ||= omnibus_expand_path(expected_omnibus_root)
     end
@@ -83,6 +98,32 @@ module ChefCLI
                        end
     end
 
+    # Function to return the Chef CLI path based on standalone or Chef-DKE-enabled package
+    def get_pkg_install_path
+      # Check Chef-DKE package path
+      chef_dk_path = get_pkg_prefix(ChefCLI::Dist::CHEF_DKE_PKG_NAME)
+      return chef_dk_path if chef_dk_path
+
+      # Check Standalone Chef-CLI package path
+      chef_cli_path = fetch_chef_cli_version_pkg || get_pkg_prefix(ChefCLI::Dist::HAB_PKG_NAME)
+      chef_cli_path
+
+    rescue => e
+      ChefCLI::UI.new.err("Error fetching Chef-CLI path: #{e.message}")
+      nil
+    end
+
+    # Check Standalone Chef-cli environment variable for version
+    def fetch_chef_cli_version_pkg
+      chef_cli_version = ENV["CHEF_CLI_VERSION"]
+      return unless chef_cli_version
+
+      pkg_path = get_pkg_prefix("#{ChefCLI::Dist::HAB_PKG_NAME}/#{chef_cli_version}")
+      return pkg_path if pkg_path && Dir.exist?(pkg_path)
+
+      nil
+    end
+
     # Returns the directory that contains our main symlinks.
     # On Mac we place all of our symlinks under /usr/local/bin on other
     # platforms they are under /usr/bin
@@ -110,6 +151,44 @@ module ChefCLI
       @git_windows_bin_dir ||= File.expand_path(File.join(omnibus_root, "embedded", "git", "usr", "bin"))
     end
 
+    #
+    # environment vars for habitat
+    #
+    def habitat_env(show_warning: false)
+      @habitat_env ||= begin
+        if habitat_chef_dke?
+          bin_pkg_prefix = get_pkg_prefix(ChefCLI::Dist::CHEF_DKE_PKG_NAME)
+        end
+        versioned_pkg_prefix = fetch_chef_cli_version_pkg if ENV["CHEF_CLI_VERSION"]
+
+        if show_warning && ENV["CHEF_CLI_VERSION"] && !versioned_pkg_prefix
+          ChefCLI::UI.new.msg("Warning: Habitat package '#{ChefCLI::Dist::HAB_PKG_NAME}' with version '#{ENV["CHEF_CLI_VERSION"]}' not found.")
+        end
+        # Use the first available package for bin_pkg_prefix
+        bin_pkg_prefix ||= versioned_pkg_prefix || get_pkg_prefix(ChefCLI::Dist::HAB_PKG_NAME)
+        raise "Error: Could not determine the Habitat package prefix. Ensure #{ChefCLI::Dist::HAB_PKG_NAME} is installed and CHEF_CLI_VERSION is set correctly." unless bin_pkg_prefix
+
+        # Determine vendor_dir by prioritizing the versioned package first
+        vendor_pkg_prefix = versioned_pkg_prefix || get_pkg_prefix(ChefCLI::Dist::HAB_PKG_NAME)
+        raise "Error: Could not determine the vendor package prefix. Ensure #{ChefCLI::Dist::HAB_PKG_NAME} is installed and CHEF_CLI_VERSION is set correctly." unless vendor_pkg_prefix
+
+        vendor_dir = File.join(vendor_pkg_prefix, "vendor")
+        # Construct PATH
+        path = [
+          File.join(bin_pkg_prefix, "bin"),
+          File.join(vendor_dir, "bin"),
+          ENV["PATH"].split(File::PATH_SEPARATOR), # Preserve existing PATH
+        ].flatten.uniq
+
+        {
+        "PATH" => path.join(File::PATH_SEPARATOR),
+        "GEM_ROOT" => Gem.default_dir, # Default directory for gems
+        "GEM_HOME" => vendor_dir,      # Set only if vendor_dir exists
+        "GEM_PATH" => vendor_dir,      # Set only if vendor_dir exists
+        }
+      end
+    end
+
     #
     # environment vars for omnibus
     #
@@ -121,14 +200,20 @@ module ChefCLI
           path << git_bin_dir if Dir.exist?(git_bin_dir)
           path << git_windows_bin_dir if Dir.exist?(git_windows_bin_dir)
           {
-            "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),
+          "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),
           }
         end
     end
 
+    def get_pkg_prefix(pkg_name)
+      stderr_redirect = Chef::Platform.windows? ? "2>NUL" : "2>/dev/null"
+      path = `hab pkg path #{pkg_name} #{stderr_redirect}`.strip
+      path if !path.empty? && Dir.exist?(path) # Return path only if it exists
+    end
+
     def omnibus_expand_path(*paths)
       dir = File.expand_path(File.join(paths))
       raise OmnibusInstallNotFound.new unless dir && File.directory?(dir)
@@ -173,5 +258,15 @@ module ChefCLI
     def macos?
       !!(RUBY_PLATFORM =~ /darwin/)
     end
+
+    # @return [Boolean] Checks if a habitat package is installed.
+    # If habitat itself is not installed, this method will return false.
+    #
+    # @api private
+    #
+    def hab_pkg_installed?(pkg_name)
+      stderr_redirect = Chef::Platform.windows? ? "2>NUL" : "2>/dev/null"
+      `hab pkg list #{pkg_name} #{stderr_redirect}`.include?(pkg_name) rescue false
+    end
   end
 end

data/lib/chef-cli/licensing/base.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+#  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 "chef-licensing"
+require_relative "config"
+
+module ChefCLI
+  module Licensing
+    class Base
+      class << self
+        def validate
+          ChefLicensing.fetch_and_persist.each do |license_key|
+            puts "License Key: #{license_key}"
+          end
+        end
+
+        def list
+          ChefLicensing.list_license_keys_info
+        end
+
+        def add
+          ChefLicensing.add_license
+        end
+      end
+    end
+  end
+end

data/lib/chef-cli/licensing/config.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+#  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 "chef-licensing"
+
+ChefLicensing.configure do |config|
+  config.chef_product_name = "workstation"
+  config.chef_entitlement_id = "x6f3bc76-a94f-4b6c-bc97-4b7ed2b045c0"
+  config.chef_executable_name = "chef"
+  config.license_server_url = "https://services.chef.io/licensing"
+end

data/lib/chef-cli/pager.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/lib/chef-cli/policyfile/artifactory_cookbook_source.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/lib/chef-cli/policyfile/attribute_merge_checker.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/lib/chef-cli/policyfile/chef_repo_cookbook_source.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/lib/chef-cli/policyfile/chef_server_cookbook_source.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/lib/chef-cli/policyfile/chef_server_lock_fetcher.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/lib/chef-cli/policyfile/community_cookbook_source.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/lib/chef-cli/policyfile/comparison_base.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/lib/chef-cli/policyfile/cookbook_location_specification.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");
@@ -89,7 +89,8 @@ module ChefCLI
       def errors
         error_messages = []
         if source_options_invalid?
-          error_messages << "Cookbook `#{name}' has invalid source options `#{source_options.inspect}'"
+          formatted_opts = source_options.map { |k, v| "#{k.inspect}=>#{v.inspect}" }.join(", ")
+          error_messages << "Cookbook `#{name}' has invalid source options `{#{formatted_opts}}'"
         end
         error_messages
       end