mixlib-install 3.13.0 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff7a4f9c339e539a6ceb50655b22976fa5c5f41c9c4f74a721dc55028d7df84f
-  data.tar.gz: 30d398aefff7ada62fcf40368a0bd40a83031d11d765341a37d6572f9561fea9
+  metadata.gz: 40469e67a42c0b360b72c220d71d9a2a0c837dc691ed9a74a9923fc81a31240c
+  data.tar.gz: f816a7403f35f3c51a456783241a485f9e21ff05fea67c5120f0585c9d92e899
 SHA512:
-  metadata.gz: ca10f06e8f5a7fd3323f23c954988c57e31fef1ea093738a6aefdf3c77bafd2c9ad44ec54a42514cfab1c81c18cc8739f55718ef21f3e5850d68f36fbb6e82cd
-  data.tar.gz: 983a976ca909b8a0e56903b44f2ea38e62f79e49b502a81174383dc2946e96a8e6f30a2365801f5d5647f43df7a7b13c8faaba686230694df018a2e69f64d8b2
+  metadata.gz: 6f9b38fec3b7689879edac7229f5793cd3c4ea842d03cd93d1c4b68afb7f02853008863ef80898a18b0745d5d25fb94afb2f1f6ea6208535bd109b0cdad247bd
+  data.tar.gz: 0d2470b2ef4d1b130f28f00b06221cfbb8e34034b320c38426953310d5d1d3f91fe2c2be42ba341952582e5f07b73eecd46e6cf999c63a73e287f03904cf1587

data/bin/mixlib-install

@@ -2,7 +2,7 @@
 
 Signal.trap("INT") { exit 1 }
 
-$:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../../lib", __FILE__)
 $stdout.sync = true
 
 require "mixlib/install/cli"

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

@@ -64,7 +64,17 @@ module Mixlib
         #
         # @return [Array<Array<Hash>] Build records for available versions
         def versions
-          items = get("/api/v1/#{options.channel}/#{omnibus_project}/versions")["results"]
+          # Commercial and trial APIs use a different URL structure
+          if use_licensed_api?
+            # Response is a JSON array of version strings
+            version_list = get("/#{options.channel}/#{omnibus_project}/versions/all")
+            # Convert to the expected format with properties
+            items = version_list.map do |version|
+              { "properties" => [{ "key" => "omnibus.version", "value" => version }] }
+            end
+          else
+            items = get("/api/v1/#{options.channel}/#{omnibus_project}/versions")["results"]
+          end
 
           # Circumvent early when there are no product artifacts in a specific channel
           if items.empty?
@@ -80,7 +90,7 @@ EOF
           # always complete. In fact we should not do this since for some arcane
           # builds like Chef Client 10.X we do not have build record created in
           # artifactory.
-          if options.channel == :unstable
+          if options.channel == :unstable && !use_licensed_api?
             # We check if "artifacts" field contains something since it is only
             # populated with the build record if "artifact.module.build" exists.
             items.reject! { |i| i["artifacts"].nil? }
@@ -123,24 +133,49 @@ EOF
         # @return [Array<ArtifactInfo>] Array of info about found artifacts
         def artifacts_for_version(version)
           begin
-            results = get("/api/v1/#{options.channel}/#{omnibus_project}/#{version}/artifacts")["results"]
+            if use_licensed_api?
+              # Commercial/trial APIs use the packages endpoint which returns metadata for all platforms
+              query = "v=#{version}"
+              packages_hash = get("/#{options.channel}/#{omnibus_project}/packages?#{query}")
+              # Response is a nested hash: platform -> platform_version -> architecture -> package_info
+              # Flatten it to an array of package metadata objects
+              results = []
+              packages_hash.each do |platform, platform_versions|
+                platform_versions.each do |platform_version, architectures|
+                  architectures.each do |arch, pkg_info|
+                    results << {
+                      "omnibus.version" => pkg_info["version"],
+                      "omnibus.platform" => platform,
+                      "omnibus.platform_version" => 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
+              end
+            else
+              results = get("/api/v1/#{options.channel}/#{omnibus_project}/#{version}/artifacts")["results"]
+              # Merge artifactory properties to a flat Hash
+              results.collect! do |result|
+                {
+                  "filename" => result["name"],
+                }.merge(
+                  map_properties(result["properties"])
+                )
+              end
+            end
           rescue Net::HTTPServerException => e
-            if e.message =~ /404/
+            if e.message.match?(/404/)
               return []
             else
               raise e
             end
           end
 
-          # Merge artifactory properties to a flat Hash
-          results.collect! do |result|
-            {
-              "filename" => result["name"],
-            }.merge(
-              map_properties(result["properties"])
-            )
-          end
-
           # Convert results to build records
           results.map { |a| create_artifact(a) }
         end
@@ -153,6 +188,13 @@ EOF
           http = Net::HTTP.new(uri.host, uri.port)
           http.use_ssl = (uri.scheme == "https")
           full_path = File.join(uri.path, url)
+
+          # Add license_id as query parameter if using commercial or trial API
+          if use_licensed_api?
+            separator = full_path.include?("?") ? "&" : "?"
+            full_path = "#{full_path}#{separator}license_id=#{options.license_id}"
+          end
+
           res = http.request(create_http_request(full_path))
           res.value
           JSON.parse(res.body)
@@ -191,7 +233,7 @@ EOF
               software_dependencies = metadata.fetch("version_manifest", {})
                                         .fetch("software", nil)
             rescue Net::HTTPServerException => e
-              if e.message =~ /404/
+              if e.message.match?(/404/)
                 license_content, software_dependencies = nil
               else
                 raise e
@@ -202,11 +244,22 @@ EOF
           end
 
           # create the download path with the correct endpoint
-          base_url = if use_compat_download_url_endpoint?(platform, platform_version)
-                       COMPAT_DOWNLOAD_URL_ENDPOINT
-                     else
-                       endpoint
-                     end
+          if use_licensed_api?
+            # Commercial/trial APIs use the download endpoint with query parameters
+            # Construct platform parameters
+            p_param = platform
+            pv_param = platform_version
+            m_param = Util.normalize_architecture(artifact_map["omnibus.architecture"])
+            v_param = artifact_map["omnibus.version"]
+            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}"
+          else
+            base_url = if use_compat_download_url_endpoint?(platform, platform_version)
+                         COMPAT_DOWNLOAD_URL_ENDPOINT
+                       else
+                         endpoint
+                       end
+            download_url = "#{base_url}/#{chef_standard_path}"
+          end
 
           ArtifactInfo.new(
             architecture:          Util.normalize_architecture(artifact_map["omnibus.architecture"]),
@@ -220,7 +273,7 @@ EOF
             sha1:                  artifact_map["omnibus.sha1"],
             sha256:                artifact_map["omnibus.sha256"],
             software_dependencies: software_dependencies,
-            url:                   "#{base_url}/#{chef_standard_path}",
+            url:                   download_url,
             version:               artifact_map["omnibus.version"]
           )
         end
@@ -241,6 +294,29 @@ EOF
           end
         end
 
+        # Public API detection methods for testing
+        def endpoint
+          @endpoint ||= if use_trial_api?
+                          Mixlib::Install::Dist::TRIAL_API_ENDPOINT
+                        elsif use_commercial_api?
+                          Mixlib::Install::Dist::COMMERCIAL_API_ENDPOINT
+                        else
+                          PRODUCT_MATRIX.lookup(options.product_name, options.product_version).api_url
+                        end
+        end
+
+        def use_trial_api?
+          !options.license_id.nil? && !options.license_id.to_s.empty? && options.license_id.start_with?("free-", "trial-")
+        end
+
+        def use_commercial_api?
+          !options.license_id.nil? && !options.license_id.to_s.empty? && !use_trial_api?
+        end
+
+        def use_licensed_api?
+          use_trial_api? || use_commercial_api?
+        end
+
         private
 
         # Converts Array<Hash> where the Hash is a key pair and
@@ -267,10 +343,6 @@ EOF
           path.join("/")
         end
 
-        def endpoint
-          @endpoint ||= PRODUCT_MATRIX.lookup(options.product_name, options.product_version).api_url
-        end
-
         def omnibus_project
           @omnibus_project ||= PRODUCT_MATRIX.lookup(options.product_name, options.product_version).omnibus_project
         end

data/lib/mixlib/install/cli.rb

@@ -35,6 +35,11 @@ module Mixlib
         say Mixlib::Install.available_versions(product_name, channel).join("\n")
       end
 
+      desc "list-products", "list available products"
+      def list_products
+        say PRODUCT_MATRIX.products.join("\n")
+      end
+
       desc "download PRODUCT_NAME", "download an artifact"
       option :channel,
         default: :stable,
@@ -66,6 +71,10 @@ If no earlier version is found the earliest version available will be set.",
       option :attributes,
         desc: "Print artifact attributes",
         type: :boolean
+      option :license_id,
+        desc: "License ID for commercial API downloads",
+        aliases: ["-L"]
+
       def download(product_name)
         # Set minimum options
         mixlib_install_options = {
@@ -77,6 +86,7 @@ If no earlier version is found the earliest version available will be set.",
         }.tap do |opt|
           opt[:platform] = options[:platform] if options[:platform]
           opt[:platform_version] = options[:platform_version] if options[:platform_version]
+          opt[:license_id] = options[:license_id] if options[:license_id]
         end
 
         # auto detect platform options if not configured
@@ -114,6 +124,7 @@ If no earlier version is found the earliest version available will be set.",
         aliases: ["-t"],
         default: "sh",
         enum: Mixlib::Install::Options::SUPPORTED_SHELL_TYPES.map(&:to_s)
+
       def install_script
         context = {}
         context[:base_url] = options[:endpoint] if options[:endpoint]

data/lib/mixlib/install/dist.rb

@@ -8,6 +8,10 @@ module Mixlib
       PRODUCT_ENDPOINT = "https://packages.chef.io".freeze
       # Omnitruck endpoint
       OMNITRUCK_ENDPOINT = "https://omnitruck.chef.io".freeze
+      # Commercial API endpoint
+      COMMERCIAL_API_ENDPOINT = "https://chefdownload-commercial.chef.io".freeze
+      # Trial API endpoint
+      TRIAL_API_ENDPOINT = "https://chefdownload-trial.chef.io".freeze
       # Default product name
       DEFAULT_PRODUCT = "chef".freeze
       # Default download page URL

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

@@ -21,26 +21,68 @@ if test "x$download_url_override" = "x"; then
   echo "Getting information for $project $channel $version for $platform..."
 
   metadata_filename="$tmp_dir/metadata.txt"
-  metadata_url="<%= base_url %>/$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$machine"
+
+  # Use commercial API if license_id is provided, otherwise use omnitruck
+  if test "x$license_id" != "x"; then
+    # Check if license_id starts with 'free-' or 'trial-' for trial API
+    case "$license_id" in
+      free-*|trial-*)
+        # Trial API endpoint
+        base_api_url="https://chefdownload-trial.chef.io"
+        ;;
+      *)
+        # Commercial API endpoint
+        base_api_url="https://chefdownload-commercial.chef.io"
+        ;;
+    esac
+    metadata_url="$base_api_url/$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$machine&license_id=$license_id"
+  else
+    # Omnitruck endpoint
+    metadata_url="<%= base_url %>/$channel/$project/metadata?v=$version&p=$platform&pv=$platform_version&m=$machine"
+  fi
 
   do_download "$metadata_url"  "$metadata_filename"
 
   cat "$metadata_filename"
 
   echo ""
-  # check that all the mandatory fields in the downloaded metadata are there
-  if grep '^url' $metadata_filename > /dev/null && grep '^sha256' $metadata_filename > /dev/null; then
-    echo "downloaded metadata file looks valid..."
+
+  # Commercial and trial APIs return JSON, omnitruck returns text format
+  if test "x$license_id" != "x"; then
+    # Parse JSON response from commercial/trial API
+    # Check if response looks like JSON
+    if grep -q '^{' "$metadata_filename" 2>/dev/null; then
+      # Extract url and sha256 from JSON
+      # Try using sed for simple JSON parsing (more portable than jq)
+      download_url=`sed -n 's/.*"url":"\([^"]*\)".*/\1/p' "$metadata_filename"`
+      sha256=`sed -n 's/.*"sha256":"\([^"]*\)".*/\1/p' "$metadata_filename"`
+
+      if test "x$download_url" != "x" && test "x$sha256" != "x"; then
+        echo "downloaded metadata file looks valid..."
+      else
+        echo "downloaded metadata file is corrupted or an uncaught error was encountered in downloading the file..."
+        report_bug
+        exit 1
+      fi
+    else
+      echo "downloaded metadata file is corrupted or an uncaught error was encountered in downloading the file..."
+      report_bug
+      exit 1
+    fi
   else
-    echo "downloaded metadata file is corrupted or an uncaught error was encountered in downloading the file..."
-    # this generally means one of the download methods downloaded a 404 or something like that and then reported a successful exit code,
-    # and this should be fixed in the function that was doing the download.
-    report_bug
-    exit 1
+    # Parse text response from omnitruck
+    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"`
+    else
+      echo "downloaded metadata file is corrupted or an uncaught error was encountered in downloading the file..."
+      # this generally means one of the download methods downloaded a 404 or something like that and then reported a successful exit code,
+      # and this should be fixed in the function that was doing the download.
+      report_bug
+      exit 1
+    fi
   fi
-
-  download_url=`awk '$1 == "url" { print $2 }' "$metadata_filename"`
-  sha256=`awk '$1 == "sha256" { print $2 }' "$metadata_filename"`
 else
   download_url=$download_url_override
   # Set sha256 to empty string if checksum not set

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

@@ -8,26 +8,48 @@
 # Optional Inputs:
 # $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.
+# $license_id: If set, indicates we're using commercial/trial API with content-disposition headers
 #
 # Outputs:
 # $download_filename: Name of the downloaded file on local disk.
 # $filetype: Type of the file downloaded.
 ############
 
-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 test "x$cmdline_filename" != "x"; then
-  download_filename="$cmdline_filename"
-elif test "x$cmdline_dl_dir" != "x"; then
-  download_filename="$cmdline_dl_dir/$filename"
+# For licensed APIs (commercial/trial), the URL is an endpoint, not a direct file URL
+# The actual filename will come from the Content-Disposition header
+if test "x$license_id" != "x"; then
+  # Use content-disposition to get the filename
+  use_content_disposition="true"
+  # We don't know the filename yet - it will come from Content-Disposition
+  # Just set the download directory
+  if test "x$cmdline_filename" != "x"; then
+    download_filename="$cmdline_filename"
+    download_dir=`dirname $download_filename`
+    use_content_disposition="false"  # User specified exact filename
+  elif test "x$cmdline_dl_dir" != "x"; then
+    download_dir="$cmdline_dl_dir"
+    download_filename=""  # Will be determined after download
+  else
+    download_dir="$tmp_dir"
+    download_filename=""  # Will be determined after download
+  fi
+  filetype=""  # Will be determined after we get the actual filename
 else
-  download_filename="$tmp_dir/$filename"
-fi
+  # 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/^.*\.//'`
 
-# ensure the parent directory where we download the installer always exists
-download_dir=`dirname $download_filename`
+  # use either $tmp_dir, the provided directory (-d) or the provided filename (-f)
+  if test "x$cmdline_filename" != "x"; then
+    download_filename="$cmdline_filename"
+  elif test "x$cmdline_dl_dir" != "x"; then
+    download_filename="$cmdline_dl_dir/$filename"
+  else
+    download_filename="$tmp_dir/$filename"
+  fi
+  download_dir=`dirname $download_filename`
+fi
 (umask 077 && mkdir -p $download_dir) || exit 1
 
 # check if we have that file locally available and if so verify the checksum
@@ -41,12 +63,16 @@ download_dir=`dirname $download_filename`
 cached_file_available="false"
 verify_checksum="true"
 
-if test -f $download_filename; then
+# Skip caching checks when using content-disposition since we don't know the real filename yet
+if test "x$use_content_disposition" = "xtrue"; then
+  cached_file_available="false"
+  verify_checksum="true"
+elif test "x$download_filename" != "x" && test -f "$download_filename"; then
   echo "$download_filename exists"
   cached_file_available="true"
 fi
 
-if test "x$download_url_override" != "x"; then
+if test "x$download_url_override" != "x" && test "x$use_content_disposition" = "xfalse"; then
   echo "Download URL override specified"
   if test "x$cached_file_available" = "xtrue"; then
     echo "Verifying local file"
@@ -75,7 +101,63 @@ if test "x$download_url_override" != "x"; then
 fi
 
 if test "x$cached_file_available" != "xtrue"; then
-  do_download "$download_url" "$download_filename"
+  if test "x$use_content_disposition" = "xtrue"; then
+    # For licensed APIs, download to a temporary file and extract filename from response headers
+    # The download_dir was already set during initialization above
+
+    # Create temp file for download
+    temp_download="$download_dir/chef-download-temp.$$"
+
+    # Download to temp file
+    do_download "$download_url" "$temp_download"
+
+    # Extract filename from response headers (try multiple methods for compatibility)
+    if test -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`
+
+      # 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 test "x$actual_filename" = "x"; then
+        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
+      if test "x$actual_filename" = "x"; 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`
+      fi
+    fi
+
+    # If we still couldn't extract from headers, construct filename from metadata
+    if test "x$actual_filename" = "x"; then
+      echo "Warning: Could not extract filename from response headers, using fallback"
+      # Construct a reasonable filename from available metadata
+      # This is a fallback and may not match the exact package name
+      if test "x$platform" = "xel" || test "x$platform" = "xfedora" || test "x$platform" = "xamazon"; then
+        actual_filename="chef-${version}-1.${platform}${platform_version}.${machine}.rpm"
+      elif test "x$platform" = "xdebian" || test "x$platform" = "xubuntu"; then
+        actual_filename="chef_${version}-1_${machine}.deb"
+      elif test "x$platform" = "xmac_os_x"; then
+        actual_filename="chef-${version}.dmg"
+      else
+        actual_filename="chef-${version}.pkg"
+      fi
+    fi
+
+    download_filename="$download_dir/$actual_filename"
+
+    # Move temp file to final location
+    mv "$temp_download" "$download_filename"
+
+    # Extract filetype from actual filename
+    filetype=`echo $actual_filename | sed -e 's/^.*\.//'`
+
+    echo "Downloaded as: $download_filename (type: $filetype)"
+  else
+    # Traditional download with known filename
+    do_download "$download_url" "$download_filename"
+  fi
 fi
 
 if test "x$verify_checksum" = "xtrue"; then

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

@@ -115,7 +115,12 @@ capture_tmp_stderr() {
 # do_wget URL FILENAME
 do_wget() {
   echo "trying wget..."
-  wget --user-agent="User-Agent: <%= user_agent_string %>" -O "$2" "$1" 2>$tmp_dir/stderr
+  # If filename is empty, use --content-disposition to get filename from server
+  if test "x$2" = "x"; then
+    wget --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
+  fi
   rc=$?
   # check for 404
   grep "ERROR 404" $tmp_dir/stderr 2>&1 >/dev/null
@@ -124,8 +129,14 @@ do_wget() {
     http_404_error
   fi
 
-  # check for bad return status or empty output
-  if test $rc -ne 0 || test ! -s "$2"; then
+  # check for bad return status (skip empty output check if using content-disposition)
+  if test $rc -ne 0; then
+    capture_tmp_stderr "wget"
+    return 1
+  fi
+  
+  # Only check for empty output if we specified a filename
+  if test "x$2" != "x" && test ! -s "$2"; then
     capture_tmp_stderr "wget"
     return 1
   fi
@@ -136,8 +147,15 @@ do_wget() {
 # do_curl URL FILENAME
 do_curl() {
   echo "trying curl..."
-  curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL -D $tmp_dir/stderr "$1" > "$2"
-  rc=$?
+  # If filename is empty, use -O and -J to get filename from Content-Disposition header
+  if test "x$2" = "x"; then
+    curl -A "User-Agent: <%= user_agent_string %>" --retry 5 -sL -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"
+    rc=$?
+  fi
+  
   # check for 404
   grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null
   if test $? -eq 0; then
@@ -145,8 +163,14 @@ do_curl() {
     http_404_error
   fi
 
-  # check for bad return status or empty output
-  if test $rc -ne 0 || test ! -s "$2"; then
+  # check for bad return status
+  if test $rc -ne 0; then
+    capture_tmp_stderr "curl"
+    return 1
+  fi
+  
+  # Only check for empty output if we specified a filename
+  if test "x$2" != "x" && test ! -s "$2"; then
     capture_tmp_stderr "curl"
     return 1
   fi

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

@@ -12,13 +12,14 @@
 # $install_strategy: Method of package installations. default strategy is to always install upon exec. Set to "once" to skip if project is installed
 # $download_url_override: Install package downloaded from a direct URL.
 # $checksum: SHA256 for download_url_override file (optional)
+# $license_id: License ID for commercial API access (optional)
 ############
 
 # Defaults
 channel="stable"
 project="<%= default_product %>"
 
-while getopts pnv:c:f:P:d:s:l:a opt
+while getopts pnv:c:f:P:d:s:l:a:L: opt
 do
   case "$opt" in
 
@@ -32,9 +33,10 @@ do
     s)  install_strategy="$OPTARG";;
     l)  download_url_override="$OPTARG";;
     a)  checksum="$OPTARG";;
+    L)  license_id="$OPTARG";;
     \?)   # unknown flag
       echo >&2 \
-      "usage: $0 [-P project] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum]"
+      "usage: $0 [-P project] [-c release_channel] [-v version] [-f filename | -d download_dir] [-s install_strategy] [-l download_url_override] [-a checksum] [-L license_id]"
       exit 1;;
   esac
 done

data/lib/mixlib/install/generator/bourne.rb

@@ -57,16 +57,21 @@ module Mixlib
         end
 
         def render_variables
-          <<EOS
+          vars = <<EOS
 project=#{options.product_name}
 version=#{options.product_version}
 channel=#{options.channel}
-#{install_command_vars}
 EOS
+          # Add license_id if provided
+          if options.license_id && !options.license_id.to_s.empty?
+            vars += "license_id=#{options.license_id}\n"
+          end
+          vars += install_command_vars
+          vars
         end
 
         def install_command_vars
-          return if options.install_command_options.nil?
+          return "" if options.install_command_options.nil?
           options.install_command_options.map { |key, value| "#{key}='#{value}'" }.join("\n")
         end
       end

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

@@ -39,7 +39,10 @@ function Get-ProjectMetadata {
     $nightlies,
     [validateset('auto', 'i386', 'x86_64')]
     [string]
-    $architecture = 'auto'
+    $architecture = 'auto',
+    # License ID for commercial API access
+    [string]
+    $license_id
   )
 
   # The following legacy switches are just aliases for the current channel
@@ -60,17 +63,56 @@ function Get-ProjectMetadata {
   Write-Verbose "Architecture: $architecture"
   Write-Verbose "Project: $project"
 
+  # Use commercial API if license_id is provided, otherwise use omnitruck
+  if ($license_id) {
+    # Check if license_id starts with 'free-' or 'trial-' for trial API
+    if ($license_id -match '^(free-|trial-)') {
+      $base_server_uri = 'https://chefdownload-trial.chef.io'
+      Write-Verbose "Using Trial API with license ID"
+    } else {
+      $base_server_uri = 'https://chefdownload-commercial.chef.io'
+      Write-Verbose "Using Commercial API with license ID"
+    }
+  }
+
   $metadata_base_url = "/$($channel)/$($project)/metadata"
   $metadata_array = ("?v=$($version)",
     "p=$platform",
     "pv=$platform_version",
     "m=$architecture")
+  
+  # Add license_id to query parameters if provided
+  if ($license_id) {
+    $metadata_array += "license_id=$license_id"
+  }
+  
   $metadata_base_url += [string]::join('&', $metadata_array)
   $metadata_url = new-uri $base_server_uri $metadata_base_url
 
   Write-Verbose "Downloading $project details from $metadata_url"
-  $package_metadata = (Get-WebContent $metadata_url).trim() -split '\n' |
-    foreach { $hash = @{} } {$key, $value = $_ -split '\s+'; $hash.Add($key, $value)} {$hash}
+  $response = (Get-WebContent $metadata_url).trim()
+  
+  # Commercial and trial APIs return JSON, omnitruck returns text format
+  if ($license_id) {
+    # Parse JSON response from commercial/trial API
+    try {
+      $json = $response | ConvertFrom-Json
+      $package_metadata = @{
+        url = $json.url
+        sha256 = $json.sha256
+        version = $json.version
+      }
+      if ($json.sha1) {
+        $package_metadata['sha1'] = $json.sha1
+      }
+    } catch {
+      throw "Failed to parse JSON response from API: $_"
+    }
+  } else {
+    # Parse text response from omnitruck
+    $package_metadata = $response -split '\n' |
+      foreach { $hash = @{} } {$key, $value = $_ -split '\s+'; $hash.Add($key, $value)} {$hash}
+  }
 
   Write-Verbose "Project details: "
   foreach ($key in $package_metadata.keys) {

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

@@ -6,13 +6,12 @@ function Get-PlatformVersion {
 
   $platform_version = switch ($osVersion) {
     # Windows Server build numbers from: https://betawiki.net/wiki/Microsoft_Windows
+    { $_ -ge [version]'10.0.26100' } { '2025';   break }
     { $_ -ge [version]'10.0.20145' } { '2022';   break }
     { $_ -ge [version]'10.0.17609' } { '2019';   break }
     { $_ -ge [version]'10.0.0'     } { '2016';   break }
     { $_ -ge [version]'6.3.0'      } { '2012r2'; break }
     { $_ -ge [version]'6.2.0'      } { '2012';   break }
-    { $_ -ge [version]'6.1.0'      } { '2008r2'; break }
-    { $_ -ge [version]'6.0.0'      } { '2008';   break }
   }
 
   if(Test-Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Server\ServerLevels') {
@@ -58,10 +57,10 @@ function Get-WebContent {
 
   try {
     if($PSVersionTable.PSEdition -eq 'Core') {
-      Get-WebContentOnCore $uri $filepath
+      return Get-WebContentOnCore $uri $filepath
     }
     else {
-      Get-WebContentOnFullNet $uri $filepath
+      return Get-WebContentOnFullNet $uri $filepath
     }
   }
   catch {
@@ -98,6 +97,28 @@ function Get-WebContentOnFullNet {
   }
   else {
     $wc.downloadfile($uri, $filepath)
+
+    # Try to extract filename from Content-Disposition header
+    $contentDisposition = $wc.ResponseHeaders["Content-Disposition"]
+    $extractedFilename = $null
+
+    if ($contentDisposition) {
+      # Try to match filename="..." or filename*=UTF-8''...
+      if ($contentDisposition -match 'filename="([^"]+)"') {
+        $extractedFilename = $matches[1]
+      }
+      elseif ($contentDisposition -match "filename='([^']+)'") {
+        $extractedFilename = $matches[1]
+      }
+      elseif ($contentDisposition -match "filename=([^;]+)") {
+        $extractedFilename = $matches[1].Trim()
+      }
+    }
+
+    return @{
+      Filename = $extractedFilename
+      Downloaded = $true
+    }
   }
 }
 
@@ -125,6 +146,19 @@ function Get-WebContentOnCore {
         if ($copyStreamOp.Exception -ne $null) {
           throw $copyStreamOp.Exception
         }
+
+        # Try to extract filename from Content-Disposition header
+        $extractedFilename = $null
+        $contentDisposition = $response.Content.Headers.ContentDisposition
+
+        if ($contentDisposition -and $contentDisposition.FileName) {
+          $extractedFilename = $contentDisposition.FileName.Trim('"')
+        }
+
+        return @{
+          Filename = $extractedFilename
+          Downloaded = $true
+        }
       }
     }
   }

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

@@ -56,7 +56,10 @@ function Install-Project {
     $checksum,
     # Set to 'once' to skip install if project is detected
     [string]
-    $install_strategy
+    $install_strategy,
+    # License ID for commercial API access
+    [string]
+    $license_id
   )
 
   # Check for chef-client command in various locations
@@ -86,7 +89,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
+    $package_metadata = Get-ProjectMetadata -project $project -channel $channel -version $version -prerelease:$prerelease -nightlies:$nightlies -architecture $architecture -license_id $license_id
     $download_url = $package_metadata.url
     $sha256 = $package_metadata.sha256
   }
@@ -99,7 +102,13 @@ function Install-Project {
     }
   }
   else {
-    $filename = (([System.Uri]$download_url).AbsolutePath -split '/')[-1]
+    # For licensed downloads, we won't know the filename until after download
+    if ([string]::IsNullOrEmpty($license_id)) {
+      $filename = (([System.Uri]$download_url).AbsolutePath -split '/')[-1]
+    } else {
+      $filename = "chef-download-temp-$PID"
+      Write-Host "Using temporary filename for licensed download: $filename"
+    }
   }
   Write-Host "Download directory: $download_directory"
   Write-Host "Filename: $filename"
@@ -137,7 +146,28 @@ function Install-Project {
   if (-not ($cached_installer_available)) {
     if ($pscmdlet.ShouldProcess("$($download_url)", "Download $project")) {
       Write-Host "Downloading $project from $($download_url) to $download_destination."
-      Get-WebContent $download_url -filepath $download_destination
+      $download_result = Get-WebContent $download_url -filepath $download_destination
+      
+      # For licensed downloads, extract actual filename from Content-Disposition
+      if (-not [string]::IsNullOrEmpty($license_id) -and $download_result -and $download_result.Filename) {
+        $actual_filename = $download_result.Filename
+        Write-Host "Extracted filename from Content-Disposition: $actual_filename"
+        
+        $final_destination = join-path $download_directory $actual_filename
+        
+        # Move temp file to final location with correct name
+        if ($download_destination -ne $final_destination) {
+          Write-Host "Moving to final location: $final_destination"
+          if (test-path $final_destination) {
+            remove-item $final_destination -force
+          }
+          move-item $download_destination $final_destination -force
+          $download_destination = $final_destination
+        }
+      } elseif (-not [string]::IsNullOrEmpty($license_id)) {
+        Write-Host "Warning: Could not extract filename from Content-Disposition header for licensed download."
+        Write-Host "Using temporary filename. Package installation may fail."
+      }
     }
   }
 

data/lib/mixlib/install/generator/powershell.rb

@@ -28,7 +28,7 @@ module Mixlib
           install_project_module << get_script("install_project.ps1")
 
           install_command = []
-          install_command << ps1_modularize(install_project_module.join("\n"), "Omnitruck")
+          install_command << ps1_modularize(install_project_module.join("\n"), "Installer-Module")
           install_command.join("\n\n")
         end
 
@@ -49,7 +49,7 @@ module Mixlib
           install_project_module << get_script("get_project_metadata.ps1")
           install_project_module << get_script("install_project.ps1")
           install_command = []
-          install_command << ps1_modularize(install_project_module.join("\n"), "Omnitruck")
+          install_command << ps1_modularize(install_project_module.join("\n"), "Installer-Module")
           install_command << render_command
           install_command.join("\n\n")
         end
@@ -71,6 +71,7 @@ module Mixlib
           cmd << " -version #{options.product_version}"
           cmd << " -channel #{options.channel}"
           cmd << " -architecture #{options.architecture}" if options.architecture
+          cmd << " -license_id #{options.license_id}" if options.license_id && !options.license_id.to_s.empty?
           cmd << install_command_params if options.install_command_options
           cmd << "\n"
         end

data/lib/mixlib/install/options.rb

@@ -63,6 +63,7 @@ module Mixlib
         :include_metadata,
         :user_agent_headers,
         :install_command_options,
+        :license_id,
       ]
 
       SUPPORTED_WINDOWS_DESKTOP_VERSIONS = %w{10}

data/lib/mixlib/install/product_matrix.rb

@@ -47,6 +47,11 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "chef"
   end
 
+  product "chef-ice" do
+    product_name "Chef Infra Client Enterprise"
+    package_name "chef-ice"
+  end
+
   product "chef-foundation" do
     product_name "Chef Foundation"
     package_name "chef-foundation"

data/lib/mixlib/install/script_generator.rb

@@ -224,7 +224,7 @@ module Mixlib
       end
 
       def windows_metadata_url
-        base = if omnibus_url =~ %r{/install.sh$}
+        base = if omnibus_url.match?(%r{/install.sh$})
                  "#{File.dirname(omnibus_url)}/"
                end
 

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.13.0"
+    VERSION = "3.14.0"
   end
 end

data/lib/mixlib/install.rb

@@ -98,14 +98,53 @@ module Mixlib
       artifact = artifact_info
 
       FileUtils.mkdir_p directory
-      file = File.join(directory, File.basename(artifact.url))
 
+      # Handle the full URL including query string and redirects
       uri = URI.parse(artifact.url)
-      Net::HTTP.start(uri.host) do |http|
-        resp = http.get(uri.path)
-        open(file, "wb") do |io|
-          io.write(resp.body)
+      filename = nil
+      final_body = nil
+
+      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+        # Build the request path including query string
+        request_path = uri.path
+        request_path += "?#{uri.query}" if uri.query
+
+        # Get the response, following redirects
+        response = http.request_get(request_path)
+
+        # Follow redirects
+        redirect_limit = 5
+        while response.is_a?(Net::HTTPRedirection) && redirect_limit > 0
+          redirect_uri = URI.parse(response["location"])
+          # Handle relative redirects
+          redirect_uri = uri + redirect_uri if redirect_uri.relative?
+
+          Net::HTTP.start(redirect_uri.host, redirect_uri.port, use_ssl: redirect_uri.scheme == "https") do |redirect_http|
+            redirect_path = redirect_uri.path
+            redirect_path += "?#{redirect_uri.query}" if redirect_uri.query
+            response = redirect_http.request_get(redirect_path)
+
+            # Try to get filename from Content-Disposition or final URL
+            if response["content-disposition"]
+              filename = response["content-disposition"][/filename="?([^"]+)"?/, 1]
+            else
+              filename = File.basename(redirect_uri.path)
+            end
+          end
+
+          redirect_limit -= 1
         end
+
+        final_body = response.body
+      end
+
+      # Use the extracted filename or fall back to basename of original URL
+      filename ||= File.basename(uri.path)
+      file = File.join(directory, filename)
+
+      # Write the final response body to file
+      File.open(file, "wb") do |io|
+        io.write(final_body)
       end
 
       file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.13.0
+  version: 3.14.0
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-01-06 00:00:00.000000000 Z
+date: 2026-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout