mixlib-install 3.16.0 → 3.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d34030b7986d54d5391add8b932400aad83b2623f9a03a60667d54f82de8c50
-  data.tar.gz: e86a1612a3de84529fc03193e02d8e290609e389dd33bbeeef4d55fa929662fd
+  metadata.gz: 9317d5892b2221b3989eb249438e5d3910c622e4d310ee49f529889b70f44246
+  data.tar.gz: 9a4537be33415b1a7422eeae3f0afed215b024a078996d6462bdbebbe16096cc
 SHA512:
-  metadata.gz: d978a599bd28442d1c2324d15e6e7898b312a30453c3e6cc778145f1afa2b3ff219ab632cc486b240c7052863777dfdb9d7d3049c699ade7a92319efc50eebcf
-  data.tar.gz: b68a1acc6f92a826a74ab867c2e6db32e31d96442d34c3154330d2a8c554a2e1d780f2d0148d7b18fdea185542711e490c16eca7aa9c3ac1df45eb701cba78b8
+  metadata.gz: 9f3d84b117b34746ab9f8e7c69e7073467b510df45ff53698ff93b7f26d4192f9576b9e8944a9b649eeceb2779a0afb3f86be6687c09d1a8b1ffe1bd27c334a7
+  data.tar.gz: db4b6d3633476bf36df4b2882bd2a66c3c319bf367b9ec09aa85e80b0236a3e711d979d62f8e274ee34f70cce446d9bbba4d27b09714d21d294534dd7fb7a511

data/lib/mixlib/install/backend/base.rb

@@ -84,23 +84,9 @@ module Mixlib
         def filter_artifacts(artifacts)
           return artifacts unless platform_filters_available?
 
-          # For chef-ice, normalize the platform for comparison since chef-ice uses
-          # normalized platform names (linux, macos, windows) in the API response
-          comparison_platform = if options.product_name == "chef-ice"
-                                  Util.normalize_platform_for_commercial(options.platform)
-                                else
-                                  options.platform
-                                end
-
-          # First filter the artifacts based on the platform and architecture
+          # Filter by the exact platform and architecture the user requested.
           artifacts.select! do |a|
-            a.platform == comparison_platform && a.architecture == options.architecture
-          end
-
-          # For chef-ice, platform_version is not used (it's empty in responses)
-          # so we should return the first match if available
-          if options.product_name == "chef-ice"
-            return artifacts.first if artifacts.any?
+            a.platform == options.platform && a.architecture == options.architecture
           end
 
           # Now we are going to filter based on platform_version.

data/lib/mixlib/install/backend/package_router.rb

@@ -33,12 +33,19 @@ module Mixlib
 
         COMPAT_DOWNLOAD_URL_ENDPOINT = "http://packages.chef.io".freeze
 
+        # Architecture strings that appear as level-2 keys in PM-structure packages
+        # responses (platform -> arch -> pm -> ...) vs version strings in standard
+        # responses (platform -> version -> arch -> ...).
+        KNOWN_ARCHITECTURES = %w{x86_64 aarch64 i386 arm64 ppc64 ppc64le s390x universal x86}.freeze
+
         # Create filtered list of artifacts
         #
         # @return [Array<ArtifactInfo>] list of artifacts for the configured
         # channel, product name, and product version.
         def available_artifacts
-          artifacts = if options.latest_version? || options.partial_version?
+          artifacts = if use_licensed_api? && platform_filters_available?
+                        artifact_from_licensed_metadata
+                      elsif options.latest_version? || options.partial_version?
                         latest_version
                       else
                         artifacts_for_version(options.product_version)
@@ -78,10 +85,12 @@ module Mixlib
 
           # Circumvent early when there are no product artifacts in a specific channel
           if items.empty?
+            hint = options.license_id ? "" : "For habitat based products please provide a license ID with -L or set CHEF_LICENSE_KEY."
             raise ArtifactsNotFound, <<-EOF
 No artifacts found matching criteria.
   product name: #{options.product_name}
   channel: #{options.channel}
+  #{hint}
 EOF
           end
 
@@ -106,6 +115,9 @@ EOF
         #
         # @return [Array<ArtifactInfo>] Array of info about found artifacts
         def latest_version
+          # Trial API only supports "latest" as the version — skip version resolution
+          return artifacts_for_version("latest") if use_trial_api?
+
           product_versions = if options.partial_version?
                                v = options.product_version
                                partial_version = v.end_with?(".") ? v : v + "."
@@ -138,27 +150,24 @@ EOF
               query = "v=#{version}"
               packages_hash = get("/#{options.channel}/#{omnibus_project}/packages?#{query}")
               # Response structure differs between products:
-              # - For chef-ice: platform -> architecture -> package_manager -> package_info
-              # - For other products: platform -> platform_version -> architecture -> package_info
+              # - PM-structure products (e.g. chef-ice, inspec-enterprise): platform -> architecture -> package_manager -> package_info
+              # - Standard products: platform -> platform_version -> architecture -> package_info
               results = []
-              if omnibus_project == "chef-ice"
-                # chef-ice structure: platform -> architecture -> package_manager -> package_info
+              if pm_structure_response?(packages_hash)
                 packages_hash.each do |platform, architectures|
                   architectures.each do |arch, package_managers|
-                    package_managers.each do |pm, pkg_info|
-                      results << {
-                        "omnibus.version" => pkg_info["version"],
-                        "omnibus.platform" => platform,
-                        "omnibus.platform_version" => "",
-                        "omnibus.architecture" => arch,
-                        "omnibus.project" => omnibus_project,
-                        "omnibus.license" => "Apache-2.0",
-                        "omnibus.sha256" => pkg_info["sha256"],
-                        "omnibus.sha1" => pkg_info.fetch("sha1", ""),
-                        "omnibus.md5" => pkg_info.fetch("md5", ""),
-                        "omnibus.package_manager" => pm,
-                      }
-                    end
+                    pkg_info = package_managers.values.first
+                    results << {
+                      "omnibus.version" => pkg_info["version"],
+                      "omnibus.platform" => platform,
+                      "omnibus.platform_version" => "",
+                      "omnibus.architecture" => arch,
+                      "omnibus.project" => omnibus_project,
+                      "omnibus.license" => "Apache-2.0",
+                      "omnibus.sha256" => pkg_info["sha256"],
+                      "omnibus.sha1" => pkg_info.fetch("sha1", ""),
+                      "omnibus.md5" => pkg_info.fetch("md5", ""),
+                    }
                   end
                 end
               else
@@ -242,6 +251,50 @@ EOF
           request
         end
 
+        # Detects whether a packages API response uses PM-structure format.
+        # Standard:     platform -> platform_version -> architecture -> pkg_info
+        #
+        # Detection: PM-structure has architecture strings (x86_64, aarch64, …) as
+        # the second-level keys; standard has version strings (20.04, 18.04, …).
+        def pm_structure_response?(packages_hash)
+          first_platform = packages_hash.values.first
+          return false unless first_platform.is_a?(Hash)
+
+          first_platform.keys.any? { |k| KNOWN_ARCHITECTURES.include?(k) }
+        end
+
+        # Fetches a single artifact from the licensed API metadata endpoint.
+        # Used when a platform is specified, giving the server full context to
+        # derive the package manager and return the correct sha256 — no pm needed.
+        def artifact_from_licensed_metadata
+          version = (options.latest_version? || options.partial_version?) ? "latest" : options.product_version
+          query = "v=#{version}&p=#{options.platform}&m=#{Util.normalize_architecture(options.architecture)}"
+          query += "&pv=#{options.platform_version}" unless options.platform_version.to_s.empty?
+
+          begin
+            metadata = get("/#{options.channel}/#{omnibus_project}/metadata?#{query}")
+          rescue Net::HTTPServerException => e
+            return [] if e.message.match?(/400|404/)
+
+            raise e
+          end
+
+          return [] if metadata.nil? || metadata.empty?
+
+          artifact_map = {
+            "omnibus.version" => metadata["version"],
+            "omnibus.platform" => options.platform,
+            "omnibus.platform_version" => options.platform_version.to_s,
+            "omnibus.architecture" => options.architecture,
+            "omnibus.project" => omnibus_project,
+            "omnibus.license" => "Apache-2.0",
+            "omnibus.sha256" => metadata["sha256"],
+            "omnibus.sha1" => metadata.fetch("sha1", ""),
+            "omnibus.md5" => metadata.fetch("md5", ""),
+          }
+          [create_artifact(artifact_map)]
+        end
+
         def create_artifact(artifact_map)
           # set normalized platform and platform version
           platform, platform_version = normalize_platform(
@@ -279,22 +332,15 @@ EOF
 
           # create the download path with the correct endpoint
           if use_licensed_api?
-            # Commercial/trial APIs use the download endpoint with query parameters
-            # Construct platform parameters
-            p_param = platform
-            pv_param = platform_version
+            # Commercial/trial APIs use the download endpoint with query parameters.
+
             m_param = Util.normalize_architecture(artifact_map["omnibus.architecture"])
             v_param = artifact_map["omnibus.version"]
-
-            # For chef-ice, use normalized platform names and add package manager parameter
-            if omnibus_project == "chef-ice"
-              p_param = Util.normalize_platform_for_commercial(platform)
-              # Use package_manager from artifact_map if available, otherwise determine it
-              pm_param = artifact_map.fetch("omnibus.package_manager", Util.determine_package_manager(options.platform))
-              download_url = "#{endpoint}/#{options.channel}/#{omnibus_project}/download?v=#{v_param}&license_id=#{options.license_id}&m=#{m_param}&p=#{p_param}&pm=#{pm_param}"
-            else
-              download_url = "#{endpoint}/#{options.channel}/#{omnibus_project}/download?p=#{p_param}&pv=#{pv_param}&m=#{m_param}&v=#{v_param}&license_id=#{options.license_id}"
-            end
+            # Use the user's actual platform (e.g. "ubuntu", "el") so the server can derive pm.
+            p_param = options.platform || platform
+            pv_param = options.platform_version || platform_version
+            pv_part = pv_param.to_s.empty? ? "" : "&pv=#{pv_param}"
+            download_url = "#{endpoint}/#{options.channel}/#{omnibus_project}/download?p=#{p_param}#{pv_part}&m=#{m_param}&v=#{v_param}&license_id=#{options.license_id}"
           else
             base_url = if use_compat_download_url_endpoint?(platform, platform_version)
                          COMPAT_DOWNLOAD_URL_ENDPOINT
@@ -349,7 +395,7 @@ EOF
         end
 
         def use_trial_api?
-          !options.license_id.nil? && !options.license_id.to_s.empty? && options.license_id.start_with?("free-", "trial-")
+          !options.license_id.nil? && !options.license_id.to_s.empty? && options.license_id.start_with?("trial-")
         end
 
         def use_commercial_api?

data/lib/mixlib/install/cli.rb

@@ -31,8 +31,12 @@ module Mixlib
       end
 
       desc "list-versions PRODUCT_NAME CHANNEL", "list available version for a product/channel"
+      option :license_id,
+        desc: "License ID for commercial/trial API",
+        aliases: ["-L"]
       def list_versions(product_name, channel)
-        say Mixlib::Install.available_versions(product_name, channel).join("\n")
+        lid = options[:license_id] || ENV["CHEF_LICENSE_KEY"]
+        say Mixlib::Install.available_versions(product_name, channel, license_id: lid).join("\n")
       end
 
       desc "list-products", "list available products"

data/lib/mixlib/install/dist.rb

@@ -37,15 +37,15 @@ module Mixlib
 
       # Check if a license_id is for trial API
       # @param license_id [String] the license ID to check
-      # @return [Boolean] true if license_id indicates trial API usage
+      # @return [Boolean] true if license_id starts with 'trial-' (trial API usage)
       def self.trial_license?(license_id)
         !license_id.nil? && !license_id.to_s.empty? &&
-          license_id.start_with?("free-", "trial-")
+          license_id.start_with?("trial-")
       end
 
       # Check if a license_id is for commercial API
       # @param license_id [String] the license ID to check
-      # @return [Boolean] true if license_id indicates commercial API usage
+      # @return [Boolean] true if license_id is non-empty and does not start with 'trial-'
       def self.commercial_license?(license_id)
         !license_id.nil? && !license_id.to_s.empty? &&
           !trial_license?(license_id)

data/lib/mixlib/install/generator/bourne/scripts/fetch_metadata.sh.erb

@@ -25,46 +25,6 @@
 # $sha256:
 ############
 
-# Determine package manager based on platform for commercial API
-determine_package_manager() {
-  case "$platform" in
-    el|centos|rhel|fedora|amazon|rocky|opensuse*|sles|scientific)
-      echo "rpm"
-      ;;
-    debian|ubuntu|linuxmint|raspbian)
-      echo "deb"
-      ;;
-    mac_os_x|macos|solaris*|smartos|freebsd|aix|omnios)
-      echo "tar"
-      ;;
-    *)
-      echo "tar"
-      ;;
-  esac
-}
-
-# Normalize platform name for commercial API
-normalize_platform_name() {
-  case "$platform" in
-    el|centos|rhel|fedora|rocky|scientific)
-      echo "linux"
-      ;;
-    mac_os_x|macos)
-      echo "macos"
-      ;;
-    debian|ubuntu|linuxmint|raspbian)
-      echo "linux"
-      ;;
-    freebsd|aix|solaris*|smartos|omnios)
-      echo "unix"
-      ;;
-    *)
-      # For anything else, use linux as default
-      echo "linux"
-      ;;
-  esac
-}
-
 if [ -z "$download_url_override" ]; then
   echo "Getting information for $project $channel $version for $platform..."
 
@@ -79,9 +39,9 @@ if [ -z "$download_url_override" ]; then
   # Use commercial API if license_id is provided, otherwise use omnitruck
   if [ -z "$base_api_url" ]; then
     if [ -n "$license_id" ]; then
-      # Check if license_id starts with 'free-' or 'trial-' for trial API
+      # Check if license_id starts with 'trial-' for trial API
       case "$license_id" in
-        free-*|trial-*)
+        trial-*)
           # Trial API endpoint
           base_api_url="<%= Mixlib::Install::Dist::TRIAL_API_ENDPOINT %>"
           ;;
@@ -96,21 +56,21 @@ if [ -z "$download_url_override" ]; then
     fi
   fi
 
-  # For chef-ice product, add platform (p), machine (m), and package_manager (pm) parameters
   if [ -n "$license_id" ]; then
-    if [ "$project" = "chef-ice" ]; then
-      package_manager=$(determine_package_manager)
-      platform_param=$(normalize_platform_name)
-      metadata_url="$base_api_url/$channel/$project/metadata?license_id=$license_id&v=$version&m=$machine&p=$platform_param&pm=$package_manager"
-    else
-      # For other products, use standard parameters
-      metadata_url="$base_api_url/$channel/$project/metadata?license_id=$license_id&v=$version&p=$platform&pv=$platform_version&m=$machine"
-    fi
+    license_param="&license_id=$license_id"
   else
-    # Omnitruck URL parameters without license_id
-    metadata_url="$base_api_url/$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$machine"
+    license_param=""
   fi
 
+  if [ -n "$package_manager" ]; then
+    pm_param="&pm=$package_manager"
+  else
+    pm_param=""
+  fi
+
+  # Build the metadata URL.
+  metadata_url="$base_api_url/$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$machine${license_param}${pm_param}"
+
   do_download "$metadata_url" "$metadata_filename"
 
   cat "$metadata_filename"
@@ -141,7 +101,7 @@ if [ -z "$download_url_override" ]; then
     fi
   else
     # Parse text response from omnitruck
-    if grep '^url' $metadata_filename > /dev/null && grep '^sha256' $metadata_filename > /dev/null; then
+    if grep '^url' "$metadata_filename" > /dev/null && grep '^sha256' "$metadata_filename" > /dev/null; then
       echo "downloaded metadata file looks valid..."
       download_url=`awk '$1 == "url" { print $2 }' "$metadata_filename"`
       sha256=`awk '$1 == "sha256" { print $2 }' "$metadata_filename"`

data/lib/mixlib/install/generator/bourne/scripts/fetch_package.sh

@@ -44,21 +44,41 @@ if [ -n "$license_id" ] || ! has_package_filename "$download_url"; then
   # Just set the download directory
   if [ -n "$cmdline_filename" ]; then
     download_filename="$cmdline_filename"
-    download_dir=`dirname $download_filename`
+    download_dir=`dirname "$download_filename"`
     use_content_disposition="false"  # User specified exact filename
+    
+    # Extract filetype from filename (not path) to avoid issues with dots in directory names
+    cmdline_basename=`basename "$cmdline_filename"`
+    case "$cmdline_basename" in
+      *.*) filetype="${cmdline_basename##*.}" ;;
+      *)
+        echo "Error: -f must include the full package filename (including extension, e.g. .rpm/.deb/.msi)"
+        exit 1
+        ;;
+    esac
+    
+    # Validate against known package types
+    case "$filetype" in
+      rpm|deb|pkg|msi|dmg|bff|p5p|solaris|sh) : ;;
+      *)
+        echo "Error: Unknown package filetype '$filetype' derived from -f '$cmdline_filename'"
+        exit 1
+        ;;
+    esac
   elif [ -n "$cmdline_dl_dir" ]; then
     download_dir="$cmdline_dl_dir"
     download_filename=""  # Will be determined after download
+    filetype=""  # Will be determined after we get the actual filename
   else
     download_dir="$tmp_dir"
     download_filename=""  # Will be determined after download
+    filetype=""  # Will be determined after we get the actual filename
   fi
-  filetype=""  # Will be determined after we get the actual filename
 else
   # Traditional omnitruck URLs have the filename in the URL
   use_content_disposition="false"
-  filename=`echo $download_url | sed -e 's/?.*//' | sed -e 's/^.*\///'`
-  filetype=`echo $filename | sed -e 's/^.*\.//'`
+  filename=`echo "$download_url" | sed -e 's/?.*//' | sed -e 's/^.*\///'`
+  filetype=`echo "$filename" | sed -e 's/^.*\.//'`
 
   # use either $tmp_dir, the provided directory (-d) or the provided filename (-f)
   if [ -n "$cmdline_filename" ]; then
@@ -68,9 +88,9 @@ else
   else
     download_filename="$tmp_dir/$filename"
   fi
-  download_dir=`dirname $download_filename`
+  download_dir=`dirname "$download_filename"`
 fi
-(umask 077 && mkdir -p $download_dir) || exit 1
+(umask 077 && mkdir -p "$download_dir") || exit 1
 
 # check if we have that file locally available and if so verify the checksum
 # Use cases
@@ -135,17 +155,24 @@ if [ "$cached_file_available" != "true" ]; then
     if [ -f "$tmp_dir/stderr" ]; then
       # Method 1: Try to extract filename from content-disposition header
       # Format: content-disposition: attachment; filename="chef-18.8.54-1.el9.x86_64.rpm"
-      actual_filename=`grep -i 'content-disposition' $tmp_dir/stderr | sed -n 's/.*filename="\([^"]*\)".*/\1/p' | head -1`
+      # Some servers omit the quotes: content-disposition: attachment; filename=chef-18.8.54-1.el9.x86_64.rpm
+      actual_filename=`grep -i 'content-disposition' "$tmp_dir"/stderr | sed -n 's/.*filename="\([^"]*\)".*/\1/p' | head -1`
+      if [ -z "$actual_filename" ]; then
+        actual_filename=`grep -i 'content-disposition' "$tmp_dir"/stderr | sed -n 's/.*filename=\([^;[:space:]]*\).*/\1/p' | head -1`
+      fi
 
       # Method 2: If content-disposition failed, try to extract from location redirect header
       # Format: location: https://packages.chef.io/files/stable/chef/18.8.54/el/9/chef-18.8.54-1.el9.x86_64.rpm?licenseId=...
       if [ -z "$actual_filename" ]; then
-        actual_filename=`grep -i '^location:' $tmp_dir/stderr | head -1 | sed 's/.*\///' | sed 's/?.*//'`
+        actual_filename=`grep -i '^location:' "$tmp_dir"/stderr | head -1 | sed 's/.*\///' | sed 's/?.*//'`
       fi
 
       # Method 3: Try extracting from any URL-like pattern in stderr
+      # Exclude any line mentioning our own local temp_download path - wget logs it
+      # (e.g. "Saving to: ..." / "... saved") and it lives under tmp_dir, which is
+      # named install.sh.<pid> and can spuriously match the ".sh" extension below.
       if [ -z "$actual_filename" ]; then
-        actual_filename=`grep -i '\.rpm\|\.deb\|\.pkg\|\.msi\|\.dmg' $tmp_dir/stderr | sed -n 's/.*\/\([^/?]*\.\(rpm\|deb\|pkg\|msi\|dmg\)\).*/\1/p' | head -1`
+        actual_filename=`grep -i '\.rpm\|\.deb\|\.pkg\|\.msi\|\.dmg\|\.bff\|\.p5p\|\.solaris\|\.sh' "$tmp_dir"/stderr | grep -vF "$temp_download" | sed -n 's/.*\/\([^/?]*\.\(rpm\|deb\|pkg\|msi\|dmg\|bff\|p5p\|solaris\|sh\)\).*/\1/p' | head -1`
       fi
     fi
 
@@ -160,6 +187,10 @@ if [ "$cached_file_available" != "true" ]; then
         actual_filename="chef_${version}-1_${machine}.deb"
       elif [ "$platform" = "mac_os_x" ]; then
         actual_filename="chef-${version}.dmg"
+      elif [ "$platform" = "aix" ]; then
+        actual_filename="chef-${version}.bff"
+      elif [ "$platform" = "solaris2" ]; then
+        actual_filename="chef-${version}.solaris"
       else
         actual_filename="chef-${version}.pkg"
       fi
@@ -171,7 +202,7 @@ if [ "$cached_file_available" != "true" ]; then
     mv "$temp_download" "$download_filename"
 
     # Extract filetype from actual filename
-    filetype=`echo $actual_filename | sed -e 's/^.*\.//'`
+    filetype=`echo "$actual_filename" | sed -e 's/^.*\.//'`
 
     echo "Downloaded as: $download_filename (type: $filetype)"
   else

data/lib/mixlib/install/generator/bourne/scripts/helpers.sh.erb

@@ -30,7 +30,7 @@
 
 # Check whether a command exists - returns 0 if it does, 1 if it does not
 exists() {
-  if command -v $1 >/dev/null 2>&1
+  if command -v "$1" >/dev/null 2>&1
   then
     return 0
   else
@@ -66,7 +66,7 @@ unable_to_retrieve_package() {
     echo "Download URL: $download_url"
   fi
   if [ -n "$stderr_results" ]; then
-    echo "\nDEBUG OUTPUT FOLLOWS:\n$stderr_results"
+    printf '\nDEBUG OUTPUT FOLLOWS:\n%s\n' "$stderr_results"
   fi
   exit 1
 }
@@ -98,7 +98,7 @@ http_404_error() {
     echo "Download URL: $download_url"
   fi
   if [ -n "$stderr_results" ]; then
-    echo "\nDEBUG OUTPUT FOLLOWS:\n$stderr_results"
+    printf '\nDEBUG OUTPUT FOLLOWS:\n%s\n' "$stderr_results"
   fi
   exit 1
 }
@@ -106,9 +106,9 @@ http_404_error() {
 capture_tmp_stderr() {
   # spool up /tmp/stderr from all the commands we called
   if [ -f "$tmp_dir/stderr" ]; then
-    output=`cat $tmp_dir/stderr`
+    output=`cat "$tmp_dir"/stderr`
     stderr_results="${stderr_results}\nSTDERR from $1:\n\n$output\n"
-    rm $tmp_dir/stderr
+    rm "$tmp_dir"/stderr
   fi
 }
 
@@ -117,13 +117,13 @@ do_wget() {
   echo "trying wget..."
   # If filename is empty, use --content-disposition to get filename from server
   if [ -z "$2" ]; then
-    wget --user-agent="User-Agent: <%= user_agent_string %>" --content-disposition "$1" 2>$tmp_dir/stderr
+    wget -S --user-agent="User-Agent: <%= user_agent_string %>" --content-disposition "$1" 2>"$tmp_dir"/stderr
   else
-    wget --user-agent="User-Agent: <%= user_agent_string %>" -O "$2" "$1" 2>$tmp_dir/stderr
+    wget -S --user-agent="User-Agent: <%= user_agent_string %>" -O "$2" "$1" 2>"$tmp_dir"/stderr
   fi
   rc=$?
   # check for 404
-  if grep "ERROR 404" $tmp_dir/stderr 2>&1 >/dev/null; then
+  if grep "ERROR 404" "$tmp_dir"/stderr >/dev/null 2>&1; then
     echo "ERROR 404"
     http_404_error
   fi
@@ -148,15 +148,15 @@ do_curl() {
   echo "trying curl..."
   # If filename is empty, use -O and -J to get filename from Content-Disposition header
   if [ -z "$2" ]; then
-    curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL -D $tmp_dir/stderr -O -J "$1"
+    curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL --fail -D "$tmp_dir"/stderr -O -J "$1"
     rc=$?
   else
-    curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL -D $tmp_dir/stderr "$1" > "$2"
+    curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL --fail -D "$tmp_dir"/stderr "$1" > "$2"
     rc=$?
   fi
 
-  # check for 404
-  if grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null; then
+  # check for 404 (matches both HTTP/1.1 "404 Not Found" and HTTP/2 "404")
+  if grep "404" "$tmp_dir"/stderr >/dev/null 2>&1; then
     echo "ERROR 404"
     http_404_error
   fi
@@ -179,7 +179,7 @@ do_curl() {
 # do_fetch URL FILENAME
 do_fetch() {
   echo "trying fetch..."
-  fetch --user-agent="User-Agent: <%= user_agent_string %>" -o "$2" "$1" 2>$tmp_dir/stderr
+  fetch --user-agent="User-Agent: <%= user_agent_string %>" -o "$2" "$1" 2>"$tmp_dir"/stderr
   # check for bad return status
   [ $? -ne 0 ] && return 1
   return 0
@@ -188,12 +188,16 @@ do_fetch() {
 # do_perl URL FILENAME
 do_perl() {
   echo "trying perl..."
-  perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>$tmp_dir/stderr
+  perl -e 'use LWP::Simple; getprint($ARGV[0]);' "$1" > "$2" 2>"$tmp_dir"/stderr
   rc=$?
-  # check for 404
-  if grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null; then
-    echo "ERROR 404"
-    http_404_error
+  # check for HTTP error status codes (4xx/5xx)
+  if grep "^[45][0-9][0-9] " "$tmp_dir"/stderr >/dev/null 2>&1; then
+    if grep "404 Not Found" "$tmp_dir"/stderr >/dev/null 2>&1; then
+      echo "ERROR 404"
+      http_404_error
+    fi
+    capture_tmp_stderr "perl"
+    return 1
   fi
 
   # check for bad return status or empty output
@@ -208,10 +212,10 @@ do_perl() {
 # do_python URL FILENAME
 do_python() {
   echo "trying python..."
-  python -c "import sys,urllib2; sys.stdout.write(urllib2.urlopen(urllib2.Request(sys.argv[1], headers={ 'User-Agent': '<%= user_agent_string %>' })).read())" "$1" > "$2" 2>$tmp_dir/stderr
+  python -c "import sys,urllib2; sys.stdout.write(urllib2.urlopen(urllib2.Request(sys.argv[1], headers={ 'User-Agent': '<%= user_agent_string %>' })).read())" "$1" > "$2" 2>"$tmp_dir"/stderr
   rc=$?
   # check for 404
-  if grep "HTTP Error 404" $tmp_dir/stderr 2>&1 >/dev/null; then
+  if grep "HTTP Error 404" "$tmp_dir"/stderr >/dev/null 2>&1; then
     echo "ERROR 404"
     http_404_error
   fi
@@ -228,12 +232,12 @@ do_python() {
 do_checksum() {
   if exists sha256sum; then
     echo "Comparing checksum with sha256sum..."
-    checksum=`sha256sum $1 | awk '{ print $1 }'`
+    checksum=`sha256sum "$1" | awk '{ print $1 }'`
     [ "$checksum" = "$2" ]
     return $?
   elif exists shasum; then
     echo "Comparing checksum with shasum..."
-    checksum=`shasum -a 256 $1 | awk '{ print $1 }'`
+    checksum=`shasum -a 256 "$1" | awk '{ print $1 }'`
     [ "$checksum" = "$2" ]
     return $?
   else
@@ -247,11 +251,11 @@ do_download() {
   echo "downloading $1"
   echo "  to file $2"
 
-  url=`echo $1`
+  url="$1"
   if [ "$platform" = "solaris2" ]; then
     if [ "$platform_version" = "5.9" ] || [ "$platform_version" = "5.10" ]; then
       # solaris 9 lacks openssl, solaris 10 lacks recent enough credentials - your base O/S is completely insecure, please upgrade
-      url=`echo $url | sed -e 's/https/http/'`
+      url=`echo "$url" | sed -e 's/https/http/'`
     fi
   fi
 
@@ -259,23 +263,23 @@ do_download() {
   # perl, in particular may be present but LWP::Simple may not be installed
 
   if exists wget; then
-    do_wget $url $2 && return 0
+    do_wget "$url" "$2" && return 0
   fi
 
   if exists curl; then
-    do_curl $url $2 && return 0
+    do_curl "$url" "$2" && return 0
   fi
 
   if exists fetch; then
-    do_fetch $url $2 && return 0
+    do_fetch "$url" "$2" && return 0
   fi
 
   if exists perl; then
-    do_perl $url $2 && return 0
+    do_perl "$url" "$2" && return 0
   fi
 
   if exists python; then
-    do_python $url $2 && return 0
+    do_python "$url" "$2" && return 0
   fi
 
   unable_to_retrieve_package
@@ -285,6 +289,8 @@ do_download() {
 # TYPE is "rpm", "deb", "solaris", "sh", etc.
 install_file() {
   echo "Installing $project $version"
+  echo "File type: $1"
+  echo "Install file: $2"
   case "$1" in
     "rpm")
       if [ "$platform" = "nexus" ] || [ "$platform" = "ios_xr" ]; then
@@ -305,11 +311,11 @@ install_file() {
       ;;
     "solaris")
       echo "installing with pkgadd..."
-      echo "conflict=nocheck" > $tmp_dir/nocheck
-      echo "action=nocheck" >> $tmp_dir/nocheck
-      echo "mail=" >> $tmp_dir/nocheck
-      pkgrm -a $tmp_dir/nocheck -n $project >/dev/null 2>&1 || true
-      pkgadd -G -n -d "$2" -a $tmp_dir/nocheck $project
+      echo "conflict=nocheck" > "$tmp_dir"/nocheck
+      echo "action=nocheck" >> "$tmp_dir"/nocheck
+      echo "mail=" >> "$tmp_dir"/nocheck
+      pkgrm -a "$tmp_dir"/nocheck -n "$project" >/dev/null 2>&1 || true
+      pkgadd -G -n -d "$2" -a "$tmp_dir"/nocheck "$project"
       ;;
     "pkg")
       echo "installing with installer..."
@@ -319,7 +325,7 @@ install_file() {
       echo "installing dmg file..."
       hdiutil detach "/Volumes/<%= macos_dir %>" >/dev/null 2>&1 || true
       hdiutil attach "$2" -mountpoint "/Volumes/<%= macos_dir %>"
-      cd / && /usr/sbin/installer -pkg `find "/Volumes/<%= macos_dir %>" -name \*.pkg` -target /
+      cd / && /usr/sbin/installer -pkg "`find "/Volumes/<%= macos_dir %>" -name \*.pkg`" -target /
       hdiutil detach "/Volumes/<%= macos_dir %>"
       ;;
     "sh" )
@@ -328,7 +334,7 @@ install_file() {
       ;;
     "p5p" )
       echo "installing p5p package..."
-      pkg install -g "$2" $project
+      pkg install -g "$2" "$project"
       ;;
     *)
       echo "Unknown filetype: $1"
@@ -350,7 +356,7 @@ else
 fi
 # secure-ish temp dir creation without having mktemp available (DDoS-able but not exploitable)
 tmp_dir="$tmp/install.sh.$$"
-(umask 077 && mkdir $tmp_dir) || exit 1
+(umask 077 && mkdir "$tmp_dir") || exit 1
 
 ############
 # end of helpers.sh

data/lib/mixlib/install/generator/bourne/scripts/install_package.sh

@@ -22,7 +22,7 @@ if [ -z "$version" ] && [ "$CI" != "true" ]; then
   echo
 fi
 
-install_file $filetype "$download_filename"
+install_file "$filetype" "$download_filename"
 
 if [ -n "$tmp_dir" ]; then
   rm -r "$tmp_dir"

data/lib/mixlib/install/generator/bourne/scripts/platform_detection.sh

@@ -26,7 +26,7 @@ machine=`uname -m`
 os=`uname -s`
 
 if [ -f "/etc/lsb-release" ] && grep DISTRIB_ID /etc/lsb-release >/dev/null && ! grep wrlinux /etc/lsb-release >/dev/null; then
-  platform=`grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr '[A-Z]' '[a-z]'`
+  platform=`grep DISTRIB_ID /etc/lsb-release | cut -d "=" -f 2 | tr 'A-Z' 'a-z'`
   platform_version=`grep DISTRIB_RELEASE /etc/lsb-release | cut -d "=" -f 2`
 
   if [ "$platform" = '"cumulus linux"' ]; then
@@ -44,11 +44,11 @@ elif [ -f "/etc/Eos-release" ]; then
   platform_version=`awk '{print $4}' /etc/Eos-release`
   machine="i386"
 elif [ -f "/etc/redhat-release" ]; then
-  platform=`sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr '[A-Z]' '[a-z]'`
+  platform=`sed 's/^\(.\+\) release.*/\1/' /etc/redhat-release | tr 'A-Z' 'a-z'`
   platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/redhat-release`
 
   if [ "$platform" = "rocky linux" ]; then
-  	source /etc/os-release
+  	. /etc/os-release
  	os="${REDHAT_SUPPORT_PRODUCT}"
   	platform_version="${ROCKY_SUPPORT_PRODUCT_VERSION}"
         platform=$ID
@@ -62,8 +62,8 @@ elif [ -f "/etc/redhat-release" ]; then
   fi
 
 elif [ -f "/etc/system-release" ]; then
-  platform=`sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
-  platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/system-release | tr '[A-Z]' '[a-z]'`
+  platform=`sed 's/^\(.\+\) release.\+/\1/' /etc/system-release | tr 'A-Z' 'a-z'`
+  platform_version=`sed 's/^.\+ release \([.0-9]\+\).*/\1/' /etc/system-release | tr 'A-Z' 'a-z'`
   case $platform in amazon*) # sh compat method of checking for a substring
     . /etc/os-release
     platform_version=$VERSION_ID
@@ -71,7 +71,6 @@ elif [ -f "/etc/system-release" ]; then
     case $platform_version in
       "2022"|"2023")
         platform="amazon"
-        platform_version=$platform_version
       ;;
       "2")
         platform="el"
@@ -120,7 +119,7 @@ elif [ "$os" = "AIX" ]; then
 elif [ -f "/etc/os-release" ]; then
   . /etc/os-release
   if [ -n "$CISCO_RELEASE_INFO" ]; then
-    . $CISCO_RELEASE_INFO
+    . "$CISCO_RELEASE_INFO"
   fi
 
   platform=$ID
@@ -150,7 +149,7 @@ fi
 #   now the complete responsibility of the server-side endpoints
 #
 
-major_version=`echo $platform_version | cut -d. -f1`
+major_version=`echo "$platform_version" | cut -d. -f1`
 case $platform in
   # FIXME: should remove this case statement completely
   "el")

data/lib/mixlib/install/generator/bourne/scripts/proxy_env.sh

@@ -6,7 +6,6 @@
 if [ -n "$https_proxy" ]; then
   echo "setting https_proxy: $https_proxy"
   HTTPS_PROXY=$https_proxy
-  https_proxy=$https_proxy
   export HTTPS_PROXY
   export https_proxy
 fi
@@ -14,7 +13,6 @@ fi
 if [ -n "$http_proxy" ]; then
   echo "setting http_proxy: $http_proxy"
   HTTP_PROXY=$http_proxy
-  http_proxy=$http_proxy
   export HTTP_PROXY
   export http_proxy
 fi
@@ -22,7 +20,6 @@ fi
 if [ -n "$ftp_proxy" ]; then
   echo "setting ftp_proxy: $ftp_proxy"
   FTP_PROXY=$ftp_proxy
-  ftp_proxy=$ftp_proxy
   export FTP_PROXY
   export ftp_proxy
 fi
@@ -30,7 +27,6 @@ fi
 if [ -n "$no_proxy" ]; then
   echo "setting no_proxy: $no_proxy"
   NO_PROXY=$no_proxy
-  no_proxy=$no_proxy
   export NO_PROXY
   export no_proxy
 fi

data/lib/mixlib/install/generator/bourne/scripts/script_cli_parameters.sh.erb

@@ -7,6 +7,8 @@
 # $version: Requested version to be installed.
 # $channel: Channel to install the product from
 # $project: Project to be installed
+# $package_manager: (Optional) Package manager override (e.g. rpm, deb, tar, msi).
+#                   If omitted, the server derives it from the platform (p) parameter.
 # $cmdline_filename: Name of the package downloaded on local disk.
 # $cmdline_dl_dir: Name of the directory downloaded package will be saved to on local disk.
 # $install_strategy: Method of package installations. default strategy is to always install upon exec. Set to "once" to skip if project is installed
@@ -18,9 +20,10 @@
 # Defaults
 channel="stable"
 project="<%= default_product %>"
+package_manager=""
 <%= "license_id=\"#{license_id}\"" if license_id && !license_id.to_s.empty? %>
 
-while getopts pnv:b:c:f:P:d:s:l:a:L: opt
+while getopts pnv:b:c:f:P:d:s:l:a:L:i: opt
 do
   case "$opt" in
 
@@ -36,14 +39,15 @@ do
     l)  download_url_override="$OPTARG";;
     a)  checksum="$OPTARG";;
     L)  license_id="$OPTARG";;
+    i)  package_manager="$OPTARG";;
     \?)   # unknown flag
       echo >&2 \
-      "usage: $0 [-P project] [-b base_api_url] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum] [-L license_id]"
+      "usage: $0 [-P project] [-b base_api_url] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum] [-L license_id] [-i package_manager]"
       exit 1;;
   esac
 done
 
-shift `expr $OPTIND - 1`
+shift "`expr $OPTIND - 1`"
 
 # Use CHEF_LICENSE_KEY environment variable if license_id not provided via CLI
 if [ -z "$license_id" ] && [ -n "$CHEF_LICENSE_KEY" ]; then

data/lib/mixlib/install/generator/powershell/scripts/get_project_metadata.ps1.erb

@@ -17,7 +17,6 @@ function Get-ProjectMetadata {
     # Base url to retrieve metadata from.
     [uri]
     $base_server_uri,
-    [string]
     # Project to install
     [string]
     $project = '<%= default_product %>',
@@ -42,7 +41,10 @@ function Get-ProjectMetadata {
     $architecture = 'auto',
     # License ID for commercial API access
     [string]
-    $license_id <%= "= '#{license_id}'" if license_id && !license_id.to_s.empty? %>
+    $license_id <%= "= '#{license_id}'" if license_id && !license_id.to_s.empty? %>,
+    # Package manager override (e.g. msi, zip). If omitted, the server derives it from platform.
+    [string]
+    $package_manager
   )
 
   # The following legacy switches are just aliases for the current channel
@@ -72,8 +74,8 @@ function Get-ProjectMetadata {
 
   if ([string]::IsNullOrEmpty($base_server_uri)) {
     if (-not [string]::IsNullOrEmpty($license_id)) {
-      # Check if license_id starts with 'free-' or 'trial-' for trial API
-      if ($license_id -match '^(free-|trial-)') {
+      # Check if license_id starts with 'trial-' for trial API
+      if ($license_id -match '^(trial-)') {
         # Trial API endpoint
         $base_server_uri = "<%= Mixlib::Install::Dist::TRIAL_API_ENDPOINT %>"
       }
@@ -88,23 +90,28 @@ function Get-ProjectMetadata {
     }
   }
 
-  # For chef-ice product, add platform (p), machine (m), and package_manager (pm) parameters
+  # Only include pm param when the caller explicitly passed -package_manager;
+  # the server derives it from the platform (p) parameter otherwise.
+
+  if (-not [string]::IsNullOrEmpty($package_manager)) {
+    $pm_param = "&pm=$package_manager"
+  }
+  else {
+    $pm_param = ""
+  }
+
+  # License param (appended only when a license_id is present)
+  $license_param = ""
   if (-not [string]::IsNullOrEmpty($license_id)) {
-    if ($project -eq "chef-ice") {
-      $package_manager = "msi"
-      $platform_param = "windows"
-      $metadata_url = "$base_server_uri$channel/$project/metadata?license_id=$license_id&v=$version&m=$architecture&p=$platform_param&pm=$package_manager"
-    }
-    else {
-      # For other products, use standard parameters
-      $metadata_url = "$base_server_uri$channel/$project/metadata?license_id=$license_id&v=$version&p=$platform&pv=$platform_version&m=$architecture"
-    }
+    $license_param = "&license_id=$license_id"
   }
   else {
-    # Omnitruck URL parameters without license_id
-    $metadata_url = "$base_server_uri$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$architecture"
+    $license_param = ""
   }
 
+  # Build the metadata URL.
+  $metadata_url = "$base_server_uri$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$architecture$license_param$pm_param"
+
   Write-Host "Downloading $project details from $metadata_url"
   $response = (Get-WebContent $metadata_url).trim()
 
@@ -127,7 +134,7 @@ function Get-ProjectMetadata {
   } else {
     # Parse text response from omnitruck
     $package_metadata = $response -split '\n' |
-      foreach { $hash = @{} } {$key, $value = $_ -split '\s+'; $hash.Add($key, $value)} {$hash}
+      ForEach-Object -Begin { $hash = @{} } -Process { $key, $value = $_ -split '\s+'; $hash.Add($key, $value) } -End { $hash }
   }
 
   Write-Host "Project details: "

data/lib/mixlib/install/generator/powershell/scripts/helpers.ps1.erb

@@ -2,7 +2,10 @@
 # Set strict error handling to ensure errors cause script failures
 $ErrorActionPreference = 'Stop'
 
-try { [Console]::OutputEncoding = New-Object -typename System.Text.ASCIIEncoding } catch { }
+try { [Console]::OutputEncoding = New-Object -typename System.Text.ASCIIEncoding } catch {
+  # non-interactive/redirected hosts may not allow setting this; safe to ignore
+  Write-Verbose "Unable to set console output encoding: $($_.Exception.Message)"
+}
 [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'
 
 function Get-PlatformVersion {
@@ -36,11 +39,11 @@ function Get-PlatformArchitecture {
 }
 
 function Get-Win32OS {
-  if(!$global:win32OS)
+  if(!$script:win32OS)
   {
-    $global:win32OS = Get-WMIQuery win32_operatingsystem
+    $script:win32OS = Get-WMIQuery win32_operatingsystem
   }
-  $global:win32OS
+  $script:win32OS
 }
 
 function New-Uri {
@@ -88,7 +91,7 @@ function Get-WebContentOnFullNet {
   $bypassList = $env:no_proxy
 
 
-  if($bypassList -ne $null){
+  if($null -ne $bypassList){
 
 	 $bypassList = $bypassList.split(",")
 	 $proxy.BypassList = $byPassList
@@ -147,7 +150,7 @@ function Get-WebContentOnCore {
         $copyStreamOp = $response.Content.CopyToAsync($downloadedFileStream)
         $copyStreamOp.Wait()
         $downloadedFileStream.Close()
-        if ($copyStreamOp.Exception -ne $null) {
+        if ($null -ne $copyStreamOp.Exception) {
           throw $copyStreamOp.Exception
         }
 
@@ -173,7 +176,7 @@ function Test-ProjectPackage {
   param ($Path, $Algorithm = 'SHA256', $Hash)
   if (!$env:Valid_ProjectPackage){
     Write-Host "Testing the $Algorithm hash for $path."
-    $ActualHash = (Custom-GetFileHash -Algorithm $Algorithm -Path $Path).Hash.ToLower()
+    $ActualHash = (Get-CustomFileHash -Algorithm $Algorithm -Path $Path).Hash.ToLower()
 
     Write-Host "`tDesired Hash - '$Hash'"
     Write-Host "`tActual Hash  - '$ActualHash'"
@@ -185,13 +188,13 @@ function Test-ProjectPackage {
   return $env:Valid_ProjectPackage
 }
 
-function Custom-GetFileHash ($Path, $Algorithm) {
+function Get-CustomFileHash ($Path, $Algorithm) {
   function disposable($o){($o -is [IDisposable]) -and (($o | get-member | foreach-object {$_.name}) -contains 'Dispose')}
   function use($obj, [scriptblock]$sb){try {& $sb} catch [exception]{throw $_} finally {if (disposable $obj) {$obj.Dispose()}} }
   $Path = (resolve-path $Path).providerpath
   $hash = @{Algorithm = $Algorithm; Path = $Path}
   use ($c = Get-SHA256Converter) {
-    use ($in = (gi $Path).OpenRead()) {
+    use ($in = (Get-Item $Path).OpenRead()) {
       $hash.Hash = ([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToUpper()
     }
   }
@@ -199,7 +202,7 @@ function Custom-GetFileHash ($Path, $Algorithm) {
 }
 
 function Get-SHA256Converter {
-  if ($(Is-FIPS) -ge 1) {
+  if ($(Test-Fips) -ge 1) {
     New-Object -TypeName Security.Cryptography.SHA256Cng
   } else {
     if($PSVersionTable.PSEdition -eq 'Core') {
@@ -211,7 +214,7 @@ function Get-SHA256Converter {
   }
 }
 
-function Is-FIPS {
+function Test-Fips {
   if (!$env:fips){
     $env:fips = (Get-ItemProperty HKLM:\SYSTEM\CurrentControlSet\Control\Lsa\FipsAlgorithmPolicy).Enabled
   }

data/lib/mixlib/install/generator/powershell/scripts/install_project.ps1.erb

@@ -62,7 +62,10 @@ function Install-Project {
     $base_server_uri,
     # License ID for commercial API access
     [string]
-    $license_id <%= "= '#{license_id}'" if license_id && !license_id.to_s.empty? %>
+    $license_id <%= "= '#{license_id}'" if license_id && !license_id.to_s.empty? %>,
+    # Package manager override (e.g. msi, zip). If omitted, the server derives it from platform.
+    [string]
+    $package_manager
   )
 
   # Use CHEF_LICENSE_KEY environment variable if license_id not provided
@@ -106,7 +109,7 @@ function Install-Project {
     $download_url = $download_url_override
     $sha256 = $checksum
   } else {
-    $package_metadata = Get-ProjectMetadata -project $project -channel $channel -version $version -prerelease:$prerelease -nightlies:$nightlies -architecture $architecture -base_server_uri $base_server_uri -license_id $license_id
+    $package_metadata = Get-ProjectMetadata -project $project -channel $channel -version $version -prerelease:$prerelease -nightlies:$nightlies -architecture $architecture -base_server_uri $base_server_uri -license_id $license_id -package_manager $package_manager
     $download_url = $package_metadata.url
     $sha256 = $package_metadata.sha256
   }

data/lib/mixlib/install/product_matrix.rb

@@ -108,6 +108,12 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     github_repo "chef/chef-workstation"
   end
 
+  product "chef-workstation-enterprise" do
+    product_name "Chef Workstation Enterprise"
+    package_name "chef-workstation-enterprise"
+    github_repo "chef/chef-workstation-enterprise"
+  end
+
   product "chefdk" do
     product_name "Chef Development Kit"
     package_name "chefdk"
@@ -155,6 +161,11 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "inspec"
   end
 
+  product "inspec-enterprise" do
+    product_name "Chef InSpec Enterprise"
+    package_name "inspec-enterprise"
+  end
+
   product "mac-bootstrapper" do
     product_name "Habitat Mac Bootstrapper"
     package_name "mac-bootstrapper"
@@ -188,6 +199,11 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     downloads_product_page_url :not_available
   end
 
+  product "migrate-ice" do
+    product_name "Chef Infra-Client migration tool"
+    package_name "migrate-ice"
+  end
+
   product "omnibus-toolchain" do
     product_name "Omnibus Toolchain"
     package_name "omnibus-toolchain"

data/lib/mixlib/install/script_generator.rb

@@ -240,7 +240,7 @@ module Mixlib
         # Use custom base_url if provided, otherwise determine from license type
         endpoint_base = if @base_url
                           @base_url
-                        elsif license_id.start_with?("free-", "trial-")
+                        elsif license_id.start_with?("trial-")
                           Mixlib::Install::Dist::TRIAL_API_ENDPOINT
                         else
                           Mixlib::Install::Dist::COMMERCIAL_API_ENDPOINT
@@ -259,7 +259,7 @@ module Mixlib
           # Use custom base_url if provided, otherwise determine from license type
           endpoint_base = if @base_url
                             @base_url
-                          elsif license_id.start_with?("free-", "trial-")
+                          elsif license_id.start_with?("trial-")
                             Mixlib::Install::Dist::TRIAL_API_ENDPOINT
                           else
                             Mixlib::Install::Dist::COMMERCIAL_API_ENDPOINT
@@ -278,14 +278,7 @@ module Mixlib
           url = "#{base}#{endpoint}"
         end
 
-        # chef-ice uses different parameters than chef
-        if @project.casecmp("chef-ice") == 0
-          # For chef-ice: p (platform), m (machine), pm (package_manager)
-          url << "?p=windows&m=$platform_architecture&pm=msi"
-        else
-          # For chef and other products: p (platform), pv (platform_version), m (machine)
-          url << "?p=windows&m=$platform_architecture&pv=$platform_version"
-        end
+        url << "?p=windows&m=$platform_architecture&pv=$platform_version"
         url << "&v=#{CGI.escape(version)}" unless %w{latest true nightlies}.include?(version)
         url << "&prerelease=true" if prerelease
         url << "&nightlies=true" if nightlies

data/lib/mixlib/install/util.rb

@@ -172,53 +172,6 @@ module Mixlib
             architecture
           end
         end
-
-        #
-        # Determines package manager based on platform for commercial API
-        #
-        # @param [String] platform
-        #
-        # @return String [package_manager] (rpm, deb, tar, msi, dmg)
-        def determine_package_manager(platform)
-          case platform
-          when /^el/, /^centos/, /^rhel/, /^fedora/, /^amazon/, /^rocky/, /^opensuse/, /^sles/, /^scientific/
-            "rpm"
-          when /^debian/, /^ubuntu/, /^linuxmint/, /^raspbian/
-            "deb"
-          when /^mac_os_x/, /^macos/
-            "dmg"
-          when /^windows/
-            "msi"
-          when /^solaris/, /^smartos/, /^freebsd/, /^aix/, /^omnios/
-            "tar"
-          else
-            # Default to tar for unknown platforms
-            "tar"
-          end
-        end
-
-        #
-        # Normalizes platform name for commercial API (chef-ice)
-        # Maps specific platform names to generic categories
-        #
-        # @param [String] platform
-        #
-        # @return String [normalized_platform] (linux, macos, windows)
-        def normalize_platform_for_commercial(platform)
-          case platform
-          when /^el/, /^centos/, /^rhel/, /^fedora/, /^rocky/, /^scientific/, /^debian/, /^ubuntu/, /^linuxmint/, /^raspbian/, /^opensuse/, /^sles/, /^amazon/
-            "linux"
-          when /^mac_os_x/, /^macos/
-            "macos"
-          when /^windows/
-            "windows"
-          when /^freebsd/, /^aix/, /^solaris/, /^smartos/, /^omnios/
-            "unix"
-          else
-            # Default to linux for unknown platforms
-            "linux"
-          end
-        end
       end
     end
   end

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.16.0"
+    VERSION = "3.19.2"
   end
 end

data/lib/mixlib/install.rb

@@ -63,14 +63,18 @@ module Mixlib
     #
     # @param [String, Symbol] channel
     #
+    # @param [String] license_id (optional)
+    #
     # @return [Array<String>] list of available versions for the given
     # product_name and channel.
-    def self.available_versions(product_name, channel)
+    def self.available_versions(product_name, channel, license_id: nil)
+      opts = {
+        product_name: product_name,
+        channel: channel.to_sym,
+      }
+      opts[:license_id] = license_id if license_id
       Backend.available_versions(
-        Mixlib::Install::Options.new(
-          product_name: product_name,
-          channel: channel.to_sym
-        )
+        Mixlib::Install::Options.new(opts)
       )
     end
 
@@ -297,7 +301,7 @@ module Mixlib
     #   url pointing to the omnitruck to be queried by the script.
     # license_id [String]
     #   license ID for commercial or trial API access.
-    #   If license_id starts with 'free-' or 'trial-', trial API defaults are enforced.
+    #   If license_id starts with 'trial-', trial API defaults are enforced.
     #
     def self.install_sh(context = {})
       # Apply trial API defaults if license_id indicates trial
@@ -325,7 +329,7 @@ module Mixlib
     #   url pointing to the omnitruck to be queried by the script.
     # license_id [String]
     #   license ID for commercial or trial API access.
-    #   If license_id starts with 'free-' or 'trial-', trial API defaults are enforced.
+    #   If license_id starts with 'trial-', trial API defaults are enforced.
     #
     def self.install_ps1(context = {})
       # Apply trial API defaults if license_id indicates trial

data/mixlib-install.gemspec

@@ -19,5 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mixlib-shellout"
   spec.add_dependency "mixlib-versioning"
+  spec.add_dependency "ostruct"
   spec.add_dependency "thor"
+  spec.required_ruby_version = ">= 2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.16.0
+  version: 3.19.2
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-02-24 00:00:00.000000000 Z
+date: 2026-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -39,6 +39,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +124,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="