kitchen-omnibus-chef 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092eecd5226ada1d55e5493818fde628e2cb6d8a1bca10a133b6984f46dcd3e1'
-  data.tar.gz: 8c4124b123160ac2ecf3358e42478d0c71d013ba98e630c7dd79e7f4650044ae
+  metadata.gz: 47dd4337a408e7a8d9e6eaa550b2d4857f6a783dc2cf16387621eea0eddf241c
+  data.tar.gz: 5d3f3e0c47b521deaf07f2a33513c7c38eaffd29ce3de62c8c4777ec55d316cd
 SHA512:
-  metadata.gz: 0ec4da2ff5413dd6ca0277f097cf05597065456b5ce25b86c95e2e047bc3923e3f20d6c7812e4453df203792244fffe914aa51934504ae68bebc1c1f7bef8ff2
-  data.tar.gz: a857e610c6919513ff2e75d64c835ca832c25681c3aab281ed0fc59a7c0b2ea8910bc9476d69b1c2a07e27a81f6c11ba5789d9eaf7d8ab223e369793294a6edf
+  metadata.gz: '088cf7c759d4528ff95d03d7e8428943f1a3ea96dcf229cbbc8243b1938d8e2589977dc82de148875c9fed8f4203a724c8eaf439f7264c2a25ec3c09caa64d51'
+  data.tar.gz: 46eb034545178533cf83ab889eea0121d6c702f317b51b787817b64c130693606abca0649783fcdb1cf0d80e691f59ef0d314b1e28f6b8da11a0d34949e1070f

data/kitchen-omnibus-chef.gemspec

@@ -13,6 +13,15 @@ Gem::Specification.new do |gem|
   gem.summary       = gem.description
   gem.homepage      = "https://kitchen.ci/"
 
+  # Metadata for enterprise gem integration
+  gem.metadata = {
+    "homepage_uri" => "https://kitchen.ci/",
+    "source_code_uri" => "https://github.com/test-kitchen/kitchen-omnibus-chef",
+    "changelog_uri" => "https://github.com/test-kitchen/kitchen-omnibus-chef/blob/main/CHANGELOG.md",
+    "bug_tracker_uri" => "https://github.com/test-kitchen/kitchen-omnibus-chef/issues",
+    "documentation_uri" => "https://kitchen.ci/docs/",
+  }
+
   # The gemfile and gemspec are necessary for appbundler in ChefDK / Workstation
   gem.files         = %w{LICENSE kitchen-omnibus-chef.gemspec Gemfile Rakefile} + Dir.glob("{lib,support}/**/*")
   gem.require_paths = ["lib"]
@@ -20,7 +29,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 3.1"
 
   gem.add_dependency "test-kitchen",       ">= 4.0"
-  gem.add_dependency "mixlib-install",     "~> 3.6"
+  gem.add_dependency "mixlib-install",     ">= 3.14"
   gem.add_dependency "mixlib-shellout",    ">= 1.2", "< 4.0"
   # Required to run the Chef provisioner local license check for remote systems
   # TK is not under Chef EULA

data/lib/kitchen/provisioner/chef_apply.rb

@@ -48,10 +48,45 @@ require_relative "chef_base"
 
 module Kitchen
   module Provisioner
-    # Chef Apply provisioner.
+    # Chef Apply provisioner with enterprise gem delegation support.
     #
-    # @author SAWANOBORI Yukihiko <sawanoboriyu@higanworks.com>)
+    # This provisioner will automatically detect and use kitchen-chef-enterprise
+    # or kitchen-cinc if they are installed, providing a seamless upgrade path
+    # for enterprise Chef features.
+    #
+    # @author SAWANOBORI Yukihiko <sawanoboriyu@higanworks.com>
     class ChefApply < ChefBase
+      # Factory method that returns the appropriate provisioner implementation.
+      # If an enterprise gem (kitchen-chef-enterprise or kitchen-cinc) is available,
+      # delegate to its implementation. Otherwise, use the standard implementation.
+      #
+      # @param config [Hash] configuration hash
+      # @return [ChefApply] provisioner instance
+      def self.new(config = {})
+        enterprise_gem = ChefBase.enterprise_gem_available?
+
+        if enterprise_gem
+          begin
+            omnibus_chef_class = self
+            require "#{enterprise_gem}/provisioner/chef_apply"
+            enterprise_class = Kitchen::Provisioner.const_get(:ChefApply)
+
+            if enterprise_class != omnibus_chef_class
+              if config[:instance] && config[:instance].respond_to?(:logger)
+                config[:instance].logger.info("Using #{enterprise_gem} implementation of ChefApply provisioner")
+              end
+              return enterprise_class.allocate.tap { |instance| instance.send(:initialize, config) }
+            end
+          rescue LoadError, NameError => e
+            if config[:instance] && config[:instance].respond_to?(:logger)
+              config[:instance].logger.debug("Could not load enterprise provisioner, using kitchen-omnibus-chef: #{e.message}")
+            end
+          end
+        end
+
+        allocate.tap { |instance| instance.send(:initialize, config) }
+      end
+
       kitchen_provisioner_api_version 2
 
       plugin_version Kitchen::VERSION

data/lib/kitchen/provisioner/chef_base.rb

@@ -142,6 +142,10 @@ module Kitchen
 
       default_config :checksum
 
+      default_config :chef_license_key do |_provisioner|
+        ENV["CHEF_LICENSE_KEY"]
+      end
+
       deprecate_config_for :require_chef_omnibus do |provisioner|
         case
         when provisioner[:require_chef_omnibus] == false
@@ -227,6 +231,41 @@ module Kitchen
         fully managed by using attribute settings.
       MSG
 
+      # Check if enterprise or cinc gems are available that provide
+      # higher-priority implementations of Chef provisioners
+      #
+      # @return [String, nil] the name of the enterprise gem if available
+      # @api private
+      def self.enterprise_gem_available?
+        @enterprise_gem_checked ||= false
+        return @enterprise_gem if @enterprise_gem_checked
+
+        @enterprise_gem_checked = true
+
+        enterprise_gem = begin
+                           # Try kitchen-chef-enterprise first (Progress Chef Enterprise)
+                           if Gem::Specification.find_by_name("kitchen-chef-enterprise")
+                             "kitchen-chef-enterprise"
+                           end
+                         rescue Gem::LoadError
+                           nil
+                         end
+
+        cinc_gem = nil
+        if enterprise_gem.nil?
+          cinc_gem = begin
+                       # Fall back to kitchen-cinc (Cinc Project)
+                       if Gem::Specification.find_by_name("kitchen-cinc")
+                         "kitchen-cinc"
+                       end
+                     rescue Gem::LoadError
+                       nil
+                     end
+        end
+
+        @enterprise_gem = enterprise_gem || cinc_gem
+      end
+
       # Reads the local Chef::Config object (if present). We do this because
       # we want to start bring Chef config and Chef Workstation config closer
       # together. For example, we want to configure proxy settings in 1
@@ -288,17 +327,21 @@ module Kitchen
         unless config[:download_url]
           warn(
             <<~WARNING
-              =====================================================================================================
-              \e[1m\e[93m!!!WARNING!!! Omnitruck downloads are being shutdown for specific Chef Infra Client versions
-              and will stop working entirely in the future. It is recommended to switch to using the new
-              kitchen-chef-enterprise plugin found with chef-test-kitchen-enterprise and bundled in chef-workstation 26.x+.
+              ==============================================================================================================
+              \e[1m\e[93m!!!WARNING!!! kitchen-omnibus-chef is deprecated\e[0m
+              Omnitruck downloads are being shutdown for specific Chef Infra Client versions and will stop working entirely
+              in the future. This kitchen-omnibus-chef gem is also not compatible with infra-client 19+ new habitat
+              based installation method.
+
+              For Chef customers it is recommended to switch to using the new kitchen-chef-enterprise plugin found with
+              chef-test-kitchen-enterprise and bundled in chef-workstation 26.x+.
 
               Please refer to this blog for schedule of which chef-client versions and when they will be affected:
               https://www.chef.io/blog/decoding-the-change-progress-chef-is-moving-to-licensed-downloads
 
-              For non chef customers or community users it is recommended to switch to the kitchen-cinc plugin and cinc
-              provisioners like cinc_infra.\e[0m
-              =====================================================================================================
+              For non Chef customers or community users it is recommended to switch to the new kitchen-cinc plugin and cinc
+              provisioners like cinc_infra.
+              ==============================================================================================================
             WARNING
           )
         end
@@ -549,6 +592,10 @@ module Kitchen
             opts[:install_command_options][:checksum] = config[:checksum] if config[:checksum]
           end
 
+          if config[:chef_license_key]
+            opts[:install_command_options][:license_id] = config[:chef_license_key]
+          end
+
           if instance.driver.cache_directory
             download_dir_option = windows_os? ? :download_directory : :cmdline_dl_dir
             opts[:install_command_options][download_dir_option] = instance.driver.cache_directory

data/lib/kitchen/provisioner/chef_infra.rb

@@ -19,10 +19,59 @@ require_relative "chef_base"
 
 module Kitchen
   module Provisioner
-    # Chef Zero provisioner.
+    # Chef Infra provisioner with enterprise gem delegation support.
+    #
+    # This provisioner will automatically detect and use kitchen-chef-enterprise
+    # or kitchen-cinc if they are installed, providing a seamless upgrade path
+    # for enterprise Chef features.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class ChefInfra < ChefBase
+      # Factory method that returns the appropriate provisioner implementation.
+      # If an enterprise gem (kitchen-chef-enterprise or kitchen-cinc) is available,
+      # delegate to its implementation. Otherwise, use the standard implementation.
+      #
+      # @param config [Hash] configuration hash
+      # @return [ChefInfra] provisioner instance
+      def self.new(config = {})
+        enterprise_gem = ChefBase.enterprise_gem_available?
+
+        if enterprise_gem
+          begin
+            # Store reference to our class before requiring enterprise gem
+            omnibus_chef_class = self
+
+            # Require the enterprise gem's provisioner
+            require "#{enterprise_gem}/provisioner/chef_infra"
+
+            # Check if a different class was loaded
+            enterprise_class = Kitchen::Provisioner.const_get(:ChefInfra)
+
+            if enterprise_class != omnibus_chef_class
+              # Log that we're delegating to enterprise implementation
+              if config[:instance] && config[:instance].respond_to?(:logger)
+                config[:instance].logger.info("Using #{enterprise_gem} implementation of ChefInfra provisioner")
+              end
+
+              # Return enterprise implementation
+              return enterprise_class.allocate.tap do |instance|
+                instance.send(:initialize, config)
+              end
+            end
+          rescue LoadError, NameError => e
+            # Enterprise gem didn't provide this provisioner, fall through to ours
+            if config[:instance] && config[:instance].respond_to?(:logger)
+              config[:instance].logger.debug("Could not load enterprise provisioner, using kitchen-omnibus-chef: #{e.message}")
+            end
+          end
+        end
+
+        # Use standard omnibus-chef implementation
+        allocate.tap do |instance|
+          instance.send(:initialize, config)
+        end
+      end
+
       kitchen_provisioner_api_version 2
 
       plugin_version Kitchen::VERSION

data/lib/kitchen/provisioner/chef_solo.rb

@@ -19,10 +19,45 @@ require_relative "chef_base"
 
 module Kitchen
   module Provisioner
-    # Chef Solo provisioner.
+    # Chef Solo provisioner with enterprise gem delegation support.
+    #
+    # This provisioner will automatically detect and use kitchen-chef-enterprise
+    # or kitchen-cinc if they are installed, providing a seamless upgrade path
+    # for enterprise Chef features.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class ChefSolo < ChefBase
+      # Factory method that returns the appropriate provisioner implementation.
+      # If an enterprise gem (kitchen-chef-enterprise or kitchen-cinc) is available,
+      # delegate to its implementation. Otherwise, use the standard implementation.
+      #
+      # @param config [Hash] configuration hash
+      # @return [ChefSolo] provisioner instance
+      def self.new(config = {})
+        enterprise_gem = ChefBase.enterprise_gem_available?
+
+        if enterprise_gem
+          begin
+            omnibus_chef_class = self
+            require "#{enterprise_gem}/provisioner/chef_solo"
+            enterprise_class = Kitchen::Provisioner.const_get(:ChefSolo)
+
+            if enterprise_class != omnibus_chef_class
+              if config[:instance] && config[:instance].respond_to?(:logger)
+                config[:instance].logger.info("Using #{enterprise_gem} implementation of ChefSolo provisioner")
+              end
+              return enterprise_class.allocate.tap { |instance| instance.send(:initialize, config) }
+            end
+          rescue LoadError, NameError => e
+            if config[:instance] && config[:instance].respond_to?(:logger)
+              config[:instance].logger.debug("Could not load enterprise provisioner, using kitchen-omnibus-chef: #{e.message}")
+            end
+          end
+        end
+
+        allocate.tap { |instance| instance.send(:initialize, config) }
+      end
+
       kitchen_provisioner_api_version 2
 
       plugin_version Kitchen::VERSION

data/lib/kitchen/provisioner/chef_target.rb

@@ -19,10 +19,45 @@ require_relative "chef_infra"
 
 module Kitchen
   module Provisioner
-    # Chef Target provisioner.
+    # Chef Target provisioner with enterprise gem delegation support.
+    #
+    # This provisioner will automatically detect and use kitchen-chef-enterprise
+    # or kitchen-cinc if they are installed, providing a seamless upgrade path
+    # for enterprise Chef features.
     #
     # @author Thomas Heinen <thomas.heinen@gmail.com>
     class ChefTarget < ChefInfra
+      # Factory method that returns the appropriate provisioner implementation.
+      # If an enterprise gem (kitchen-chef-enterprise or kitchen-cinc) is available,
+      # delegate to its implementation. Otherwise, use the standard implementation.
+      #
+      # @param config [Hash] configuration hash
+      # @return [ChefTarget] provisioner instance
+      def self.new(config = {})
+        enterprise_gem = ChefBase.enterprise_gem_available?
+
+        if enterprise_gem
+          begin
+            omnibus_chef_class = self
+            require "#{enterprise_gem}/provisioner/chef_target"
+            enterprise_class = Kitchen::Provisioner.const_get(:ChefTarget)
+
+            if enterprise_class != omnibus_chef_class
+              if config[:instance] && config[:instance].respond_to?(:logger)
+                config[:instance].logger.info("Using #{enterprise_gem} implementation of ChefTarget provisioner")
+              end
+              return enterprise_class.allocate.tap { |instance| instance.send(:initialize, config) }
+            end
+          rescue LoadError, NameError => e
+            if config[:instance] && config[:instance].respond_to?(:logger)
+              config[:instance].logger.debug("Could not load enterprise provisioner, using kitchen-omnibus-chef: #{e.message}")
+            end
+          end
+        end
+
+        allocate.tap { |instance| instance.send(:initialize, config) }
+      end
+
       MIN_VERSION_REQUIRED = "19.0.0".freeze
       class ChefVersionTooLow < UserError; end
       class ChefClientNotFound < UserError; end

data/lib/kitchen/provisioner/chef_zero.rb

@@ -3,10 +3,44 @@ require_relative "chef_infra"
 
 module Kitchen
   module Provisioner
-    # Chef Zero provisioner.
+    # Chef Zero provisioner (deprecated, use ChefInfra instead).
+    #
+    # This provisioner is maintained for backward compatibility and delegates
+    # to ChefInfra. It also supports enterprise gem delegation.
     #
     # @author Fletcher Nichol <fnichol@nichol.ca>
     class ChefZero < ChefInfra
+      # Factory method that returns the appropriate provisioner implementation.
+      # If an enterprise gem (kitchen-chef-enterprise or kitchen-cinc) is available,
+      # delegate to its implementation. Otherwise, use the standard ChefInfra implementation.
+      #
+      # @param config [Hash] configuration hash
+      # @return [ChefZero] provisioner instance
+      def self.new(config = {})
+        enterprise_gem = ChefBase.enterprise_gem_available?
+
+        if enterprise_gem
+          begin
+            omnibus_chef_class = self
+            require "#{enterprise_gem}/provisioner/chef_zero"
+            enterprise_class = Kitchen::Provisioner.const_get(:ChefZero)
+
+            if enterprise_class != omnibus_chef_class
+              if config[:instance] && config[:instance].respond_to?(:logger)
+                config[:instance].logger.info("Using #{enterprise_gem} implementation of ChefZero provisioner")
+              end
+              return enterprise_class.allocate.tap { |instance| instance.send(:initialize, config) }
+            end
+          rescue LoadError, NameError => e
+            if config[:instance] && config[:instance].respond_to?(:logger)
+              config[:instance].logger.debug("Could not load enterprise provisioner, using kitchen-omnibus-chef: #{e.message}")
+            end
+          end
+        end
+
+        # Fall back to ChefInfra implementation (ChefZero is just an alias)
+        allocate.tap { |instance| instance.send(:initialize, config) }
+      end
     end
   end
 end

data/lib/kitchen/provisioner/omnibus_chef_version.rb

@@ -18,6 +18,6 @@
 module Kitchen
   module Provisioner
     # Version string for Dokken Kitchen driver
-    OMNIBUS_CHEF_VERSION = "1.0.2".freeze
+    OMNIBUS_CHEF_VERSION = "1.1.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-omnibus-chef
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-19 00:00:00.000000000 Z
+date: 2026-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -28,16 +28,16 @@ dependencies:
   name: mixlib-install
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,12 @@ files:
 homepage: https://kitchen.ci/
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  homepage_uri: https://kitchen.ci/
+  source_code_uri: https://github.com/test-kitchen/kitchen-omnibus-chef
+  changelog_uri: https://github.com/test-kitchen/kitchen-omnibus-chef/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/test-kitchen/kitchen-omnibus-chef/issues
+  documentation_uri: https://kitchen.ci/docs/
 post_install_message:
 rdoc_options: []
 require_paths: