mixlib-install 3.14.0 → 3.16.0

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

@@ -1,3 +1,4 @@
+################ install_project.ps1
 function Install-Project {
   <#
     .SYNOPSIS
@@ -5,12 +6,11 @@ function Install-Project {
     .DESCRIPTION
     Install a Chef Software, Inc. product
     .EXAMPLE
-    iex (new-object net.webclient).downloadstring('https://omnitruck.chef.io/install.ps1'); Install-Project -project chef -channel stable
+    iex (new-object net.webclient).downloadstring('<%= base_url || "https://chefdownload-commercial.chef.io" %>/install.ps1<%= base_url && base_url.include?("chefdownload") ? "?license_id=$env:CHEF_LICENSE_KEY" : "" %>'); Install-Project -project chef -channel stable
 
     Installs the latest stable version of Chef.
     .EXAMPLE
-    iex (irm 'https://omnitruck.chef.io/install.ps1'); Install-Project -project chefdk -channel current
-
+    iex (irm '<<%= base_url || "https://chefdownload-commercial.chef.io" %>/install.ps1<%= base_url && base_url.include?("chefdownload") ? "?license_id=$env:CHEF_LICENSE_KEY" : "" %>'); Install-Project -project chef -channel current
     Installs the latest integration build of the Chef Development Kit
   #>
   [cmdletbinding(SupportsShouldProcess=$true)]
@@ -57,19 +57,36 @@ function Install-Project {
     # Set to 'once' to skip install if project is detected
     [string]
     $install_strategy,
+    # Base server URI for metadata endpoint
+    [uri]
+    $base_server_uri,
     # License ID for commercial API access
     [string]
-    $license_id
+    $license_id <%= "= '#{license_id}'" if license_id && !license_id.to_s.empty? %>
   )
 
-  # Check for chef-client command in various locations
-  $chef_locations = @(
-    "$env:systemdrive\hab\pkgs\chef\chef-infra-client\*\*\bin\chef-client.bat",
-    "$env:systemdrive\<%= windows_dir %>\$project\bin\$project-client.bat"
-  )
-  foreach ($path in $chef_locations) {
+  # Use CHEF_LICENSE_KEY environment variable if license_id not provided
+  if ([string]::IsNullOrEmpty($license_id) -and -not [string]::IsNullOrEmpty($env:CHEF_LICENSE_KEY)) {
+    $license_id = $env:CHEF_LICENSE_KEY
+  }
+
+  # Check for product installation in various locations
+  if ($project -eq 'chef' -or $project -eq 'chef-ice') {
+    # For chef or chef-ice, look for chef-infra-client paths
+    $install_locations = @(
+      "$env:systemdrive\hab\pkgs\chef\chef-infra-client\*\*\bin",
+      "$env:systemdrive\<%= windows_dir %>\chef\bin"
+    )
+  } else {
+    # For other products, look for product-specific paths
+    $install_locations = @(
+      "$env:systemdrive\hab\pkgs\chef\$project\*\*\bin",
+      "$env:systemdrive\<%= windows_dir %>\$project\bin"
+    )
+  }
+  foreach ($path in $install_locations) {
     $resolved = Get-Item $path -ErrorAction SilentlyContinue | Select-Object -First 1
-    if ($resolved -and (Test-Path $resolved.FullName) -and ($install_strategy -eq 'once')) {
+    if ($resolved -and (Test-Path $resolved.FullName -PathType Container) -and ($install_strategy -eq 'once')) {
       Write-Host "$project installation detected at $($resolved.FullName)"
       Write-Host "install_strategy set to 'once'"
       Write-Host "Nothing to install"
@@ -89,7 +106,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 -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
     $download_url = $package_metadata.url
     $sha256 = $package_metadata.sha256
   }
@@ -102,12 +119,18 @@ function Install-Project {
     }
   }
   else {
-    # 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 {
+    # Extract filename from URL path (without query params)
+    $urlPath = (([System.Uri]$download_url).AbsolutePath -split '/')[-1]
+
+    # Check if URL path has a package file extension
+    $hasPackageExtension = $urlPath -match '\.(msi|appx|pkg|dmg|rpm|deb)$'
+
+    # For licensed downloads or URLs without package extensions, we won't know the filename until after download
+    if (-not [string]::IsNullOrEmpty($license_id) -or -not $hasPackageExtension) {
       $filename = "chef-download-temp-$PID"
-      Write-Host "Using temporary filename for licensed download: $filename"
+      Write-Host "Using temporary filename for content-disposition download: $filename"
+    } else {
+      $filename = $urlPath
     }
   }
   Write-Host "Download directory: $download_directory"
@@ -147,14 +170,14 @@ function Install-Project {
     if ($pscmdlet.ShouldProcess("$($download_url)", "Download $project")) {
       Write-Host "Downloading $project from $($download_url) to $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) {
+
+      # Extract actual filename from Content-Disposition if it was a temp filename
+      if ($filename -like "chef-download-temp-*" -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"
@@ -164,8 +187,8 @@ function Install-Project {
           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."
+      } elseif ($filename -like "chef-download-temp-*") {
+        Write-Host "Warning: Could not extract filename from Content-Disposition header."
         Write-Host "Using temporary filename. Package installation may fail."
       }
     }
@@ -179,17 +202,25 @@ function Install-Project {
     Write-Host "Installing $project from $download_destination"
     $installingProject = $True
     $installAttempts = 0
+    $maxAttempts = 5
     while ($installingProject) {
       $installAttempts++
       $result = $false
-      if($download_destination.EndsWith(".appx")) {
+      if ($download_destination.EndsWith(".appx")) {
         $result = Install-ChefAppx $download_destination $project
       }
       else {
         $result = Install-ChefMsi $download_destination $daemon
       }
-      if(!$result) { continue }
+      if (!$result) {
+        if ($installAttempts -ge $maxAttempts) {
+          Write-Host "Failed to install $project after $installAttempts attempts."
+          throw "Installation failed after $installAttempts attempts."
+        }
+        continue
+      }
       $installingProject = $False
+      Write-Host "$project installation completed successfully."
     }
   }
 }

data/lib/mixlib/install/generator/powershell/scripts/platform_detection.ps1

@@ -1,3 +1,4 @@
+################ platform_detection.ps1
 $platform_version = Get-PlatformVersion
 $architecture = Get-PlatformArchitecture
 

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

@@ -25,7 +25,7 @@ module Mixlib
           install_project_module = []
           install_project_module << get_script("helpers.ps1", context)
           install_project_module << get_script("get_project_metadata.ps1", context)
-          install_project_module << get_script("install_project.ps1")
+          install_project_module << get_script("install_project.ps1", context)
 
           install_command = []
           install_command << ps1_modularize(install_project_module.join("\n"), "Installer-Module")
@@ -46,8 +46,8 @@ module Mixlib
         def install_command
           install_project_module = []
           install_project_module << get_script("helpers.ps1", user_agent_headers: options.user_agent_headers)
-          install_project_module << get_script("get_project_metadata.ps1")
-          install_project_module << get_script("install_project.ps1")
+          install_project_module << get_script("get_project_metadata.ps1", license_id: options.license_id, base_url: options.base_url)
+          install_project_module << get_script("install_project.ps1", license_id: options.license_id)
           install_command = []
           install_command << ps1_modularize(install_project_module.join("\n"), "Installer-Module")
           install_command << render_command
@@ -67,10 +67,11 @@ module Mixlib
         end
 
         def render_command
-          cmd = "install -project #{options.product_name}"
+          cmd = "Install-Project -project #{options.product_name}"
           cmd << " -version #{options.product_version}"
           cmd << " -channel #{options.channel}"
           cmd << " -architecture #{options.architecture}" if options.architecture
+          cmd << " -base_server_uri '#{options.base_url}'" if options.base_url && !options.base_url.to_s.empty?
           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"

data/lib/mixlib/install/generator.rb

@@ -22,10 +22,11 @@ module Mixlib
   class Install
     class Generator
       def self.install_command(options)
-        klass = options.for_ps1? ? PowerShell : Bourne
-        meth = options.options[:new_omnibus_download_url] ? :install_sh_from_upstream : :install_command
-
-        klass.new(options).send(meth)
+        if options.for_ps1?
+          PowerShell.new(options).install_command
+        else
+          Bourne.new(options).install_command
+        end
       end
     end
   end

data/lib/mixlib/install/options.rb

@@ -64,6 +64,7 @@ module Mixlib
         :user_agent_headers,
         :install_command_options,
         :license_id,
+        :base_url,
       ]
 
       SUPPORTED_WINDOWS_DESKTOP_VERSIONS = %w{10}
@@ -90,6 +91,8 @@ module Mixlib
 
         map_windows_versions!
 
+        enforce_trial_api_defaults!
+
         validate!
       end
 
@@ -185,6 +188,7 @@ module Mixlib
           platform_version_compatibility_mode: false,
           product_version: :latest,
           include_metadata: false,
+          license_id: ENV["CHEF_LICENSE_KEY"],
         }
       end
 
@@ -256,6 +260,43 @@ Must provide platform (-p), platform version (-l) and architecture (-a) when spe
       def all_or_none?(items)
         items.all? || items.compact.empty?
       end
+
+      # Trial API only supports stable channel and latest version
+      # If using trial API with other settings, default them and warn the user
+      def enforce_trial_api_defaults!
+        return unless use_trial_api?
+
+        original_channel = channel
+        original_version = product_version
+
+        # Force stable channel for trial API
+        if channel != :stable
+          options[:channel] = :stable
+          warn "WARNING: Trial API only supports 'stable' channel. Changing from '#{original_channel}' to 'stable'."
+        end
+
+        # Force latest version for trial API
+        if product_version != :latest && product_version.to_sym != :latest
+          options[:product_version] = :latest
+          warn "WARNING: Trial API only supports 'latest' version. Changing from '#{original_version}' to 'latest'."
+        end
+      end
+
+      def use_trial_api?
+        license_id = options[:license_id] || options["license_id"] || default_options[:license_id]
+        Mixlib::Install::Dist.trial_license?(license_id)
+      end
+
+      # Validate that licensed API usage conforms to API restrictions
+      # This is informational only - enforce_trial_api_defaults! already handles corrections
+      def validate_licensed_api_restrictions
+        return unless license_id && !license_id.to_s.empty?
+
+        if use_trial_api?
+          # These are enforced by enforce_trial_api_defaults! but we can add extra validation here if needed
+          # Currently no additional validation needed since defaults are auto-applied
+        end
+      end
     end
   end
 end

data/lib/mixlib/install/product_matrix.rb

@@ -132,7 +132,7 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     end
     config_file "/etc/delivery/delivery.rb"
     github_repo "chef/automate"
-    downloads_product_page_url "https://downloads.chef.io/automate"
+    downloads_product_page_url "#{Mixlib::Install::Dist::DOWNLOADS_PAGE}/automate"
   end
 
   product "ha" do

data/lib/mixlib/install/script_generator.rb

@@ -21,7 +21,6 @@ require_relative "util"
 require_relative "generator/powershell"
 require_relative "dist"
 require "cgi"
-require "net/http" unless defined?(Net::HTTP)
 
 module Mixlib
   class Install
@@ -58,18 +57,23 @@ module Mixlib
       attr_accessor :omnibus_url
       attr_accessor :install_msi_url
 
+      attr_accessor :license_id
+      attr_accessor :base_url
+
       VALID_INSTALL_OPTS = %w{omnibus_url
                               endpoint
                               http_proxy
                               https_proxy
                               install_flags
                               install_msi_url
+                              license_id
                               nightlies
                               prerelease
                               project
                               root
                               use_sudo
-                              sudo_command}
+                              sudo_command
+                              base_url}
 
       def initialize(version, powershell = false, opts = {})
         @version = (version || "latest").to_s.downcase
@@ -80,17 +84,29 @@ module Mixlib
         @prerelease = false
         @nightlies = false
         @endpoint = "metadata"
-        @omnibus_url = "https://www.chef.io/chef/install.sh"
+        @omnibus_url = "#{Mixlib::Install::Dist::OMNITRUCK_ENDPOINT}/install.sh"
         @use_sudo = true
         @sudo_command = "sudo -E"
+        @license_id = nil
+        @project = Mixlib::Install::Dist::DEFAULT_PRODUCT.freeze
+        @channel = "stable"
 
         @root = if powershell
-                  "$env:systemdrive\\#{Mixlib::Install::Dist::WINDOWS_INSTALL_DIR}\\#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
+                  "$env:systemdrive\\#{Mixlib::Install::Dist::OMNIBUS_WINDOWS_INSTALL_DIR}\\#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
                 else
-                  "#{Mixlib::Install::Dist::LINUX_INSTALL_DIR}/#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
+                  "#{Mixlib::Install::Dist::OMNIBUS_LINUX_INSTALL_DIR}/#{Mixlib::Install::Dist::DEFAULT_PRODUCT}"
                 end
 
         parse_opts(opts)
+
+        # Update root for chef-ice to use Habitat install directories
+        if @project&.casecmp("chef-ice") == 0
+          @root = if powershell
+                    "$env:systemdrive\\#{Mixlib::Install::Dist::HABITAT_WINDOWS_INSTALL_DIR}\\chef\\chef-infra-client\\*\\*"
+                  else
+                    "#{Mixlib::Install::Dist::HABITAT_LINUX_INSTALL_DIR}/chef/chef-infra-client/*/*"
+                  end
+        end
       end
 
       def install_command
@@ -102,17 +118,6 @@ module Mixlib
         shell_code_from_file(vars)
       end
 
-      def install_command_from_omnitruck(url)
-        uri = URI.parse(url)
-        response = Net::HTTP.get_response(uri)
-
-        if response.code == "200"
-          response.body
-        else
-          raise StandardError, "unable to fetch the install.sh"
-        end
-      end
-
       private
 
       # Generates the install command variables for Bourne shell-based
@@ -124,11 +129,12 @@ module Mixlib
         flags = %w{latest true nightlies}.include?(version) ? "" : "-v #{CGI.escape(version)}"
         flags << " " << "-n" if nightlies
         flags << " " << "-p" if prerelease
+        flags << " " << "-l #{license_id}" if license_id && !license_id.to_s.empty?
         flags << " " << install_flags if install_flags
 
         [
           shell_var("chef_omnibus_root", root),
-          shell_var("chef_omnibus_url", omnibus_url),
+          shell_var("chef_omnibus_url", omnibus_url_for_license),
           shell_var("install_flags", flags.strip),
           shell_var("pretty_version", Util.pretty_version(version)),
           shell_var("sudo_sh", sudo("sh")),
@@ -151,6 +157,7 @@ module Mixlib
           shell_var("msi", "#{download_directory}\\chef-#{version}.msi"),
           shell_var("download_directory", download_directory),
         ].tap do |vars|
+          vars << shell_var("license_id", license_id) if license_id && !license_id.to_s.empty?
           if install_msi_url
             vars << shell_var("chef_msi_url", install_msi_url)
           else
@@ -172,6 +179,7 @@ module Mixlib
           validate_opts!(opt)
           case opt.to_s
           when "project", "endpoint"
+            @project = setting if opt.to_s == "project"
             self.endpoint = metadata_endpoint_from_project(setting)
           else
             send("#{opt.to_sym}=", setting)
@@ -216,23 +224,72 @@ module Mixlib
 
       # @return the correct Chef Omnitruck API metadata endpoint, based on project
       def metadata_endpoint_from_project(project = nil)
-        if project.nil? || project.casecmp("chef") == 0
+        if project.nil? || project.casecmp(Mixlib::Install::Dist::DEFAULT_PRODUCT) == 0
           "metadata"
         else
           "metadata-#{project.downcase}"
         end
       end
 
+      # Returns the appropriate omnibus URL based on whether license_id is provided
+      # @return [String] the omnibus URL (commercial/trial or standard omnitruck)
+      # @api private
+      def omnibus_url_for_license
+        return omnibus_url if license_id.nil? || license_id.to_s.empty? || omnibus_url != "#{Mixlib::Install::Dist::OMNITRUCK_ENDPOINT}/install.sh"
+
+        # 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-")
+                          Mixlib::Install::Dist::TRIAL_API_ENDPOINT
+                        else
+                          Mixlib::Install::Dist::COMMERCIAL_API_ENDPOINT
+                        end
+
+        # Add license_id as query param when using licensed endpoints
+        "#{endpoint_base}/install.sh?license_id=#{CGI.escape(license_id)}"
+      end
+
       def windows_metadata_url
-        base = if omnibus_url.match?(%r{/install.sh$})
-                 "#{File.dirname(omnibus_url)}/"
-               end
+        # Determine if we're using commercial/trial API
+        using_licensed_api = license_id && !license_id.to_s.empty?
+
+        if using_licensed_api
+          # Commercial/trial API: <base_url>/<channel>/<project>/metadata
+          # 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-")
+                            Mixlib::Install::Dist::TRIAL_API_ENDPOINT
+                          else
+                            Mixlib::Install::Dist::COMMERCIAL_API_ENDPOINT
+                          end
+
+          product_name = @project
+          url = "#{endpoint_base}/#{@channel}/#{product_name}/metadata"
+        else
+          # Omnitruck API: use base from omnibus_url + endpoint
+          base = if omnibus_url_for_license.match?(%r{/install.sh})
+                   # Ensure base URL ends with /
+                   base_url = File.dirname(omnibus_url_for_license)
+                   base_url += "/" unless base_url.end_with?("/")
+                   base_url
+                 end
+          url = "#{base}#{endpoint}"
+        end
 
-        url = "#{base}#{endpoint}"
-        url << "?p=windows&m=$platform_architecture&pv=$platform_version"
+        # 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 << "&v=#{CGI.escape(version)}" unless %w{latest true nightlies}.include?(version)
         url << "&prerelease=true" if prerelease
         url << "&nightlies=true" if nightlies
+        url << "&license_id=#{CGI.escape(license_id)}" if license_id && !license_id.to_s.empty?
         url
       end
 

data/lib/mixlib/install/util.rb

@@ -172,6 +172,53 @@ 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.14.0"
+    VERSION = "3.16.0"
   end
 end