mixlib-install 3.12.19 → 3.12.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19d5dda94374a1b0fe5e627f460c40dece9c0b2309dfda3fcb9a9ade5f62465c
-  data.tar.gz: 673be23ef2a7b4f34cc308a9995ff8a731b65ff958b8336bacdea3e1be516ce7
+  metadata.gz: 687fca4a38f2f4399c6cdbbcb83ee07d700ed88e0c0780a4e7669e8f6bee90c3
+  data.tar.gz: 07752cab13343e0d2c811ce49b9d46afef365784ac60c9a538688c2ad519b1f2
 SHA512:
-  metadata.gz: 3444cbf76a4eae7dcd9345d082dd362124180df65059ea225d85dd6544665a129a23bd3c95b97da39fd0427de8896d7a081e518e4589cb12afe0629966180123
-  data.tar.gz: 17fca79670b37d4f2983d387acd022e9576ee29d7220e61b52bb65d53d0d71342fb5106f4dc51e64dce7ea99524700056d4d87bf9c71980824ea56d7645eeb1b
+  metadata.gz: 72882b68c9bc0ddb6d54e8a3eeff527248dd4d6cab241ecc9278fd74cb869fa861cc1de4ef2fe2eb3631138ef112317e65f0dc70c26132c58cad66ad78074965
+  data.tar.gz: c39c0155192848b29405b0df348dd4e1eba26707b8e9f359dc44ecd55c1bb32e4d76cc02fd7f343e73021630cee76a77485c3f64a060973ce929539f6c659de3

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

@@ -30,7 +30,6 @@ module Mixlib
   class Install
     class Backend
       class PackageRouter < Base
-        ENDPOINT = Mixlib::Install::Dist::PRODUCT_ENDPOINT.freeze
 
         COMPAT_DOWNLOAD_URL_ENDPOINT = "http://packages.chef.io".freeze
 
@@ -269,7 +268,7 @@ EOF
         end
 
         def endpoint
-          @endpoint ||= ENV.fetch("PACKAGE_ROUTER_ENDPOINT", ENDPOINT)
+          @endpoint ||= PRODUCT_MATRIX.lookup(options.product_name, options.product_version).api_url
         end
 
         def omnibus_project

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

@@ -2,13 +2,17 @@
 [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12'
 
 function Get-PlatformVersion {
-  switch -regex ((Get-Win32OS).version) {
-    '10\.0\.\d+'   {$platform_version = '2016'}
-    '10\.0\.17\d+' {$platform_version = '2019'}
-    '6\.3\.\d+'    {$platform_version = '2012r2'}
-    '6\.2\.\d+'    {$platform_version = '2012'}
-    '6\.1\.\d+'    {$platform_version = '2008r2'}
-    '6\.0\.\d+'    {$platform_version = '2008'}
+  [version]$osVersion = (Get-Win32OS).version
+
+  $platform_version = switch ($osVersion) {
+    # Windows Server build numbers from: https://betawiki.net/wiki/Microsoft_Windows
+    { $_ -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') {
@@ -20,7 +24,7 @@ function Get-PlatformVersion {
 }
 
 function Get-PlatformArchitecture {
-  if ((Get-Win32OS).osarchitecture -like '64-bit') {
+  if ((Get-Win32OS).osarchitecture -match '64') {
     $architecture = 'x86_64'
   } else {
     $architecture = 'i386'

data/lib/mixlib/install/options.rb

@@ -26,7 +26,7 @@ module Mixlib
     class Options
       class InvalidOptions < ArgumentError; end
 
-      attr_reader :options, :errors, :original_platform_version
+      attr_reader :options, :errors, :original_platform_version, :supported_product_names
 
       SUPPORTED_ARCHITECTURES = %w{
         aarch64
@@ -46,8 +46,6 @@ module Mixlib
         :unstable,
       ]
 
-      SUPPORTED_PRODUCT_NAMES = PRODUCT_MATRIX.products
-
       SUPPORTED_SHELL_TYPES = [
         :ps1,
         :sh,
@@ -77,6 +75,15 @@ module Mixlib
         # Store original options in cases where we must remap
         @original_platform_version = options[:platform_version]
 
+        # Eval extra products definition
+        extra_products = ENV.fetch("EXTRA_PRODUCTS_FILE", nil)
+        unless extra_products.nil?
+          PRODUCT_MATRIX.instance_eval(::File.read(extra_products), extra_products)
+        end
+
+        # Store supported product names
+        @supported_product_names = PRODUCT_MATRIX.products
+
         resolve_platform_version_compatibility_mode!
 
         map_windows_versions!
@@ -189,10 +196,10 @@ Must be one of: #{SUPPORTED_ARCHITECTURES.join(", ")}
       end
 
       def validate_product_names
-        unless SUPPORTED_PRODUCT_NAMES.include? product_name
+        unless @supported_product_names.include? product_name
           errors << <<-EOS
 Unknown product name #{product_name}.
-Must be one of: #{SUPPORTED_PRODUCT_NAMES.join(", ")}
+Must be one of: #{@supported_product_names.join(", ")}
           EOS
         end
       end

data/lib/mixlib/install/product.rb

@@ -36,6 +36,7 @@ module Mixlib
         :omnibus_project,
         :github_repo,
         :downloads_product_page_url,
+        :api_url,
       ]
 
       #
@@ -86,6 +87,8 @@ module Mixlib
           "#{Mixlib::Install::Dist::DOWNLOADS_PAGE}/#{product_key}"
         when :github_repo
           "#{Mixlib::Install::Dist::GITHUB_ORG}/#{product_key}"
+        when :api_url
+          ENV.fetch("PACKAGE_ROUTER_ENDPOINT", Mixlib::Install::Dist::PRODUCT_ENDPOINT)
         else
           nil
         end

data/lib/mixlib/install/product_matrix.rb

@@ -47,6 +47,11 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "chef"
   end
 
+  product "chef-universal" do
+    product_name "Chef Infra Client MacOS Universal"
+    package_name "universal-package"
+  end
+
   product "chef-backend" do
     product_name "Chef Backend"
     package_name "chef-backend"

data/lib/mixlib/install/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Install
-    VERSION = "3.12.19"
+    VERSION = "3.12.23"
   end
 end

metadata

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