mixlib-install 3.14.0 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40469e67a42c0b360b72c220d71d9a2a0c837dc691ed9a74a9923fc81a31240c
-  data.tar.gz: f816a7403f35f3c51a456783241a485f9e21ff05fea67c5120f0585c9d92e899
+  metadata.gz: 87576368d2d140a99f1e02a508c19bb3d55dbc637ca3b4d6b39f6bbfcd857ad6
+  data.tar.gz: 4114e92d08cba4ea18093bfaa2e0f02b584dda06de878e56e11fd2c68aa58b9e
 SHA512:
-  metadata.gz: 6f9b38fec3b7689879edac7229f5793cd3c4ea842d03cd93d1c4b68afb7f02853008863ef80898a18b0745d5d25fb94afb2f1f6ea6208535bd109b0cdad247bd
-  data.tar.gz: 0d2470b2ef4d1b130f28f00b06221cfbb8e34034b320c38426953310d5d1d3f91fe2c2be42ba341952582e5f07b73eecd46e6cf999c63a73e287f03904cf1587
+  metadata.gz: 428a3a79f93b46f570ac709eaf7fcae54360dc893742360bf42b02ee0565c2992426d1588b4cd4baf6ae7d84898c284148a284824dece7d9890e75964fcea425
+  data.tar.gz: 991621b4937be08512cc2bb556a3848485a2a2e0223dc05382987a400131e49d20536d06df04c84a9d3d18acd10d6f93a7e6d34bb83c3022999fcfe59b4d4756

data/lib/mixlib/install/cli.rb

@@ -86,7 +86,8 @@ 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]
+          # Use license_id from options if provided, otherwise check CHEF_LICENSE_KEY env var
+          opt[:license_id] = options[:license_id] || ENV["CHEF_LICENSE_KEY"]
         end
 
         # auto detect platform options if not configured

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

@@ -1,6 +1,14 @@
-# Check for chef-client command in various locations
-for path in /hab/pkgs/chef/chef-infra-client/*/*/bin/chef-client "/usr/bin/${project}-client" "/opt/$project/bin/${project}-client"; do
-  if test -x "$path" 2>/dev/null && test "x$install_strategy" = "xonce"; then
+# Check for product installation in various locations
+if [ "$project" = "chef" ] || [ "$project" = "chef-ice" ]; then
+  # For chef or chef-ice, look for chef-infra-client paths
+  install_paths="/hab/pkgs/chef/chef-infra-client/*/*/bin /opt/chef/bin"
+else
+  # For other products, look for product-specific paths
+  install_paths="/hab/pkgs/chef/$project/*/*/bin /opt/$project/bin"
+fi
+
+for path in $install_paths; do
+  if [ -d "$path" ] 2>/dev/null && [ "x$install_strategy" = "xonce" ]; then
     echo "$project installation detected at $path"
     echo "install_strategy set to 'once'"
     echo "Nothing to install"

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

@@ -42,3 +42,8 @@ do
 done
 
 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
+  license_id="$CHEF_LICENSE_KEY"
+fi

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

@@ -24,7 +24,19 @@ module Mixlib
         def self.install_sh(context)
           install_command = []
           install_command << get_script("helpers.sh", context)
+          # If license_id is provided in context, pre-set it as a variable
+          if context[:license_id] && !context[:license_id].to_s.empty?
+            install_command << "# License ID provided via context"
+            install_command << "license_id='#{context[:license_id]}'"
+          end
           install_command << get_script("script_cli_parameters.sh")
+          # Check for CHEF_LICENSE_KEY in execution environment if not already set
+          install_command << <<~BASH.chomp
+            # Use CHEF_LICENSE_KEY from execution environment if license_id not set
+            if [ -z "${license_id:-}" ] && [ -n "${CHEF_LICENSE_KEY:-}" ]; then
+              license_id="$CHEF_LICENSE_KEY"
+            fi
+          BASH
           install_command << get_script("check_product.sh")
           install_command << get_script("platform_detection.sh")
           install_command << get_script("proxy_env.sh")
@@ -62,10 +74,18 @@ project=#{options.product_name}
 version=#{options.product_version}
 channel=#{options.channel}
 EOS
-          # Add license_id if provided
-          if options.license_id && !options.license_id.to_s.empty?
-            vars += "license_id=#{options.license_id}\n"
+          # Add license_id if provided, otherwise use CHEF_LICENSE_KEY env var
+          license_id_value = options.license_id || ENV["CHEF_LICENSE_KEY"]
+          if license_id_value && !license_id_value.to_s.empty?
+            vars += "license_id=#{license_id_value}\n"
           end
+          # Check for CHEF_LICENSE_KEY in execution environment if not already set
+          vars += <<EOS
+# Use CHEF_LICENSE_KEY from execution environment if license_id not set
+if [ -z "${license_id:-}" ] && [ -n "${CHEF_LICENSE_KEY:-}" ]; then
+  license_id="$CHEF_LICENSE_KEY"
+fi
+EOS
           vars += install_command_vars
           vars
         end

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

@@ -62,14 +62,28 @@ function Install-Project {
     $license_id
   )
 
-  # 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"
@@ -147,14 +161,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) {
         $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"

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

@@ -29,6 +29,11 @@ module Mixlib
 
           install_command = []
           install_command << ps1_modularize(install_project_module.join("\n"), "Installer-Module")
+          # If license_id is provided in context, add it to the default install command
+          if context[:license_id] && !context[:license_id].to_s.empty?
+            install_command << "# License ID provided via context - adding to install command"
+            install_command << "install -license_id '#{context[:license_id]}'"
+          end
           install_command.join("\n\n")
         end
 

data/lib/mixlib/install/options.rb

@@ -185,6 +185,7 @@ module Mixlib
           platform_version_compatibility_mode: false,
           product_version: :latest,
           include_metadata: false,
+          license_id: ENV["CHEF_LICENSE_KEY"],
         }
       end
 

data/lib/mixlib/install/version.rb

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

metadata

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