mixlib-install 3.12.20 → 3.12.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b7e852271e0ff401f9ecd64f0713df06223310306fcab1bc2ea7f20d155da4f
-  data.tar.gz: 4cf638db66178b2436dcec6f35a55965af55686df9957d7382fcd91c206e2e02
+  metadata.gz: d9d54877c6f3a04cf9ea38a02994bb283892b0dfdc5a0c68a773d278b96d0da8
+  data.tar.gz: 910ffe3c2679ec01b086fc0201fdc9489d242b3b1af44f83f19e6dba66c6616d
 SHA512:
-  metadata.gz: a2b192a68c026200b142ed7e4d9c99bb8f5a133330613abe756bff5aab6a38f1f76e3e418c6f8fd0f277acfcab1cc4375cd418e41afe097f59f50d13bd6ad485
-  data.tar.gz: 1a2781e80f15c58942a06874cf5eb3f534dec47ead6121ea7eaf63b9e0de46b1e8893ec04d8c77a509b258bfaa69eca7395839fd8b3fb568c64ea1377182de46
+  metadata.gz: 3fdfcf10f2632d0119bc3f3d2717f1130c5afa806921fe99c1e5a6d1a62ce03d06d76e5e936aeb69e6bbed2722440906f3bf088cc797b1bb778f57919280fb2a
+  data.tar.gz: 0dacdb5d86913a580522149c4b8537efb0f5ced5f1c3d337e39087ecdaf481f5114f0e8701797ca045bef264746f440fd23f3c4ad15a6836c6b96299ae949091

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') {

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,16 @@ PRODUCT_MATRIX = Mixlib::Install::ProductMatrix.new do
     package_name "chef"
   end
 
+  product "chef-foundation" do
+    product_name "Chef Foundation"
+    package_name "chef-foundation"
+  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.20"
+    VERSION = "3.12.24"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-install
 version: !ruby/object:Gem::Version
-  version: 3.12.20
+  version: 3.12.24
 platform: ruby
 authors:
 - Thom May
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout