mixlib-install 3.16.0 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d34030b7986d54d5391add8b932400aad83b2623f9a03a60667d54f82de8c50
-  data.tar.gz: e86a1612a3de84529fc03193e02d8e290609e389dd33bbeeef4d55fa929662fd
+  metadata.gz: a8834bc88f13ec12a50e22d4173262a60a525c4c1841d7fbf078a078f05aaa75
+  data.tar.gz: 606b0c99f0b2245e5e5b7ccc50c15b306dd3a7e20406225342733075c9bf1069
 SHA512:
-  metadata.gz: d978a599bd28442d1c2324d15e6e7898b312a30453c3e6cc778145f1afa2b3ff219ab632cc486b240c7052863777dfdb9d7d3049c699ade7a92319efc50eebcf
-  data.tar.gz: b68a1acc6f92a826a74ab867c2e6db32e31d96442d34c3154330d2a8c554a2e1d780f2d0148d7b18fdea185542711e490c16eca7aa9c3ac1df45eb701cba78b8
+  metadata.gz: fbc683eca04103659882fdf18678b7e7221b590285794896ecfb5d73fee6d5313407eb959565ee2ae320fef92e911f47b5fe810e63d7af77d44c1f05d1da1bdc
+  data.tar.gz: b4fa005ff07749845435b43d5df9fcf4a256924415e416beaa145c91f5cf0251d01945d90749cd34c375d5591bac18643ca65668686b242d8e3661ac68de801a

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

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/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..."
 
@@ -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"

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

@@ -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 2>&1 >/dev/null; then
     echo "ERROR 404"
     http_404_error
   fi
@@ -190,10 +190,14 @@ do_perl() {
   echo "trying perl..."
   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 2>&1 >/dev/null; then
+    if grep "404 Not Found" $tmp_dir/stderr 2>&1 >/dev/null; then
+      echo "ERROR 404"
+      http_404_error
+    fi
+    capture_tmp_stderr "perl"
+    return 1
   fi
 
   # check for bad return status or empty output

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,9 +39,10 @@ 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

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

@@ -42,7 +42,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
@@ -88,23 +91,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()
 

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

@@ -155,6 +155,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"

data/lib/mixlib/install/script_generator.rb

@@ -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.17.0"
   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
 

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.17.0
 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-05-26 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:
   - - ">="