kitchen-cinc 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9dbea4a2f910479545091595aef0b7883ff27b2d032fe578f2ff179c6476280
-  data.tar.gz: '09f995bb4384586dea60dd4e42bc7652f6f17094a7a52710859450d0803c6751'
+  metadata.gz: 115d50991f3f3f920ad92ced7a40e4a71a978cda43d3fd2084673e930737134b
+  data.tar.gz: 0c216f2187fa74179d179a114eef55e45ddaa20274b54e837fc76b6729540b77
 SHA512:
-  metadata.gz: e178911a90dd93080108beff536294011e419760e21d2e44bd2dfde46712e3af21927b37a52cc0ada4018210ad00378821694f4ea715404d0c86014e3e73254d
-  data.tar.gz: d3b465b83a40e2477b7e17a85b24e6a0b3d50c0b6948575757c850dde4ffa485239611cd0470e17e753c36809399996f63c06222a596d50c34b3f4a81e76f4e8
+  metadata.gz: 1d9ff891fa13ea3faab81f13cc3ea80e603b1d61de1f368f208f99bf31d2c166593e8f839226fd9f7bcf0e1cf95d5ac6c426b7030f2af2144c648d96024819eb
+  data.tar.gz: e9d5c0b571cf11275c374baa0d2cb840af46bcd5c0093cd495c9b6973b5adebb194599b2afd34d9bc38970ba796a0a2638196a027f3cb4ef26e9fc4b533ee514

data/lib/kitchen/provisioner/chef_alias_loader.rb

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require "kitchen/util"
+
+module Kitchen
+  module Provisioner
+    # Helpers for the chef_* alias provisioners shipped by kitchen-cinc.
+    #
+    # The chef_* names have a priority order across kitchen-* gems:
+    # kitchen-chef-enterprise > kitchen-cinc > kitchen-omnibus-chef. When a
+    # higher-priority gem is installed, our chef_* alias should yield to it
+    # rather than claim the constant. Users who explicitly want kitchen-cinc
+    # behavior should use the cinc_* names in kitchen.yml.
+    module ChefAliasLoader
+      module_function
+
+      # If kitchen-chef-enterprise is installed, attempt to load its
+      # implementation of the named provisioner from its absolute path
+      # (bypasses $LOAD_PATH ambiguity). Returns true if enterprise's
+      # version was loaded and now owns the constant; false otherwise,
+      # in which case the caller should register its own subclass.
+      #
+      # @param const_name [Symbol] the unqualified constant under
+      #   Kitchen::Provisioner (e.g. :ChefInfra)
+      # @return [Boolean]
+      def defer_to_enterprise(const_name)
+        spec = enterprise_spec
+        return false unless spec
+
+        file_name = Kitchen::Util.snake_case(const_name.to_s)
+        path = File.join(spec.gem_dir, "lib", "kitchen", "provisioner", "#{file_name}.rb")
+        return false unless File.exist?(path)
+
+        require path
+        Kitchen::Provisioner.const_defined?(const_name, false)
+      end
+
+      def enterprise_spec
+        Gem::Specification.find_by_name("kitchen-chef-enterprise")
+      rescue Gem::LoadError
+        nil
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/chef_apply.rb

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "cinc_apply"
+require_relative "chef_alias_loader"
+
+# See chef_infra.rb for the priority and remove_const rationale.
+unless Kitchen::Provisioner::ChefAliasLoader.defer_to_enterprise(:ChefApply)
+  if Kitchen::Provisioner.const_defined?(:ChefApply, false) &&
+      !(Kitchen::Provisioner::ChefApply <= Kitchen::Provisioner::CincApply)
+    Kitchen::Provisioner.send(:remove_const, :ChefApply)
+  end
+
+  module Kitchen
+    module Provisioner
+      # Alias for CincApply. Lets existing kitchen.yml files using
+      # `provisioner: name: chef_apply` transparently use Cinc Apply.
+      class ChefApply < CincApply
+        kitchen_provisioner_api_version 2
+
+        plugin_version Kitchen::VERSION
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/chef_infra.rb

@@ -0,0 +1,44 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "cinc_infra"
+require_relative "chef_alias_loader"
+
+# Priority order for chef_* names: kitchen-chef-enterprise > kitchen-cinc >
+# kitchen-omnibus-chef. If enterprise is installed, defer to it. Users who
+# explicitly want kitchen-cinc should use cinc_infra in kitchen.yml.
+unless Kitchen::Provisioner::ChefAliasLoader.defer_to_enterprise(:ChefInfra)
+  # If kitchen-omnibus-chef has already defined Kitchen::Provisioner::ChefInfra
+  # with a non-CincInfra parent (i.e. omnibus-chef's gem loaded first), drop
+  # the binding before we redefine — otherwise Ruby raises TypeError on
+  # superclass mismatch. The two gems coordinate via this swap; see the
+  # kitchen-omnibus-chef factory in chef_infra.rb#new for the other side.
+  if Kitchen::Provisioner.const_defined?(:ChefInfra, false) &&
+      !(Kitchen::Provisioner::ChefInfra <= Kitchen::Provisioner::CincInfra)
+    Kitchen::Provisioner.send(:remove_const, :ChefInfra)
+  end
+
+  module Kitchen
+    module Provisioner
+      # Alias for CincInfra. Lets existing kitchen.yml files using
+      # `provisioner: name: chef_infra` transparently use Cinc Client.
+      class ChefInfra < CincInfra
+        kitchen_provisioner_api_version 2
+
+        plugin_version Kitchen::VERSION
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/chef_solo.rb

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "cinc_solo"
+require_relative "chef_alias_loader"
+
+# See chef_infra.rb for the priority and remove_const rationale.
+unless Kitchen::Provisioner::ChefAliasLoader.defer_to_enterprise(:ChefSolo)
+  if Kitchen::Provisioner.const_defined?(:ChefSolo, false) &&
+      !(Kitchen::Provisioner::ChefSolo <= Kitchen::Provisioner::CincSolo)
+    Kitchen::Provisioner.send(:remove_const, :ChefSolo)
+  end
+
+  module Kitchen
+    module Provisioner
+      # Alias for CincSolo. Lets existing kitchen.yml files using
+      # `provisioner: name: chef_solo` transparently use Cinc Solo.
+      class ChefSolo < CincSolo
+        kitchen_provisioner_api_version 2
+
+        plugin_version Kitchen::VERSION
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/chef_target.rb

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "cinc_target"
+require_relative "chef_alias_loader"
+
+# See chef_infra.rb for the priority and remove_const rationale.
+unless Kitchen::Provisioner::ChefAliasLoader.defer_to_enterprise(:ChefTarget)
+  if Kitchen::Provisioner.const_defined?(:ChefTarget, false) &&
+      !(Kitchen::Provisioner::ChefTarget <= Kitchen::Provisioner::CincTarget)
+    Kitchen::Provisioner.send(:remove_const, :ChefTarget)
+  end
+
+  module Kitchen
+    module Provisioner
+      # Alias for CincTarget. Lets existing kitchen.yml files using
+      # `provisioner: name: chef_target` transparently use Cinc Target Mode.
+      class ChefTarget < CincTarget
+        kitchen_provisioner_api_version 2
+
+        plugin_version Kitchen::VERSION
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/chef_zero.rb

@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative "cinc_infra"
+require_relative "chef_alias_loader"
+
+# Deprecated alias for ChefInfra (which itself is an alias for CincInfra).
+# Provided for backward compatibility with kitchen.yml files using the
+# legacy chef_zero provisioner name.
+#
+# See chef_infra.rb for the priority and remove_const rationale.
+unless Kitchen::Provisioner::ChefAliasLoader.defer_to_enterprise(:ChefZero)
+  if Kitchen::Provisioner.const_defined?(:ChefZero, false) &&
+      !(Kitchen::Provisioner::ChefZero <= Kitchen::Provisioner::CincInfra)
+    Kitchen::Provisioner.send(:remove_const, :ChefZero)
+  end
+
+  module Kitchen
+    module Provisioner
+      class ChefZero < CincInfra
+        kitchen_provisioner_api_version 2
+
+        plugin_version Kitchen::VERSION
+      end
+    end
+  end
+end

data/lib/kitchen/provisioner/cinc_base.rb

@@ -132,6 +132,26 @@ module Kitchen
 
       default_config :checksum
 
+      # Mapping of deprecated chef_*-prefixed config keys to their cinc_*
+      # equivalents. Lets existing kitchen.yml files using the chef_* names
+      # keep working when migrating from kitchen-omnibus-chef to kitchen-cinc.
+      CHEF_TO_CINC_KEYS = {
+        require_chef_omnibus: :require_cinc_omnibus,
+        chef_omnibus_url: :cinc_omnibus_url,
+        chef_omnibus_install_options: :cinc_omnibus_install_options,
+        chef_omnibus_root: :cinc_omnibus_root,
+        chef_client_path: :cinc_client_path,
+        chef_solo_path: :cinc_solo_path,
+        chef_apply_path: :cinc_apply_path,
+        chef_zero_host: :cinc_zero_host,
+        chef_zero_port: :cinc_zero_port,
+      }.freeze
+
+      CHEF_TO_CINC_KEYS.each do |chef_key, cinc_key|
+        deprecate_config_for chef_key,
+          "The '#{chef_key}' attribute is deprecated; use '#{cinc_key}' instead."
+      end
+
       # Reads the local Chef::Config object (if present). We do this because
       # we want to start bringing Cinc config and Cinc Workstation config closer
       # together. For example, we want to configure proxy settings in 1
@@ -139,6 +159,17 @@ module Kitchen
       #
       # @param config [Hash] initial provided configuration
       def initialize(config = {})
+        # Forward any chef_*-prefixed keys to their cinc_* equivalents so that
+        # the cinc_* default_config blocks see them as already-set and skip
+        # their default values. The chef_* key is preserved so that
+        # deprecate_config_for can emit a warning via `kitchen doctor`.
+        CHEF_TO_CINC_KEYS.each do |chef_key, cinc_key|
+          next unless config.key?(chef_key)
+          next if config.key?(cinc_key)
+
+          config[cinc_key] = config[chef_key]
+        end
+
         super(config)
 
         if defined?(ChefConfig::WorkstationConfigLoader)

data/lib/kitchen/provisioner/cinc_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Provisioner
-    CINC_VERSION = "1.0.0".freeze
+    CINC_VERSION = "1.1.0".freeze
   end
 end

data/lib/kitchen-cinc/provisioner/chef_apply.rb

@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# See chef_infra.rb in this directory for the full rationale.
+require "kitchen/provisioner/cinc_apply"
+
+if Kitchen::Provisioner.const_defined?(:ChefApply, false) &&
+    !(Kitchen::Provisioner::ChefApply <= Kitchen::Provisioner::CincApply)
+  Kitchen::Provisioner.send(:remove_const, :ChefApply)
+end
+
+require_relative "../../kitchen/provisioner/chef_apply"

data/lib/kitchen-cinc/provisioner/chef_infra.rb

@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Loaded by kitchen-omnibus-chef's factory pattern when it detects
+# kitchen-cinc is installed. See:
+#   https://github.com/test-kitchen/kitchen-omnibus-chef/blob/main/lib/kitchen/provisioner/chef_infra.rb
+#
+# Drops the omnibus-chef ChefInfra binding (if present) so we can rebind to
+# our subclass of CincInfra. The require_relative below resolves to our
+# absolute file path, which is a different $LOADED_FEATURES entry from
+# omnibus-chef's same-logical-named file — so it actually loads even when
+# `require "kitchen/provisioner/chef_infra"` would short-circuit.
+require "kitchen/provisioner/cinc_infra"
+
+if Kitchen::Provisioner.const_defined?(:ChefInfra, false) &&
+    !(Kitchen::Provisioner::ChefInfra <= Kitchen::Provisioner::CincInfra)
+  Kitchen::Provisioner.send(:remove_const, :ChefInfra)
+end
+
+require_relative "../../kitchen/provisioner/chef_infra"

data/lib/kitchen-cinc/provisioner/chef_solo.rb

@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# See chef_infra.rb in this directory for the full rationale.
+require "kitchen/provisioner/cinc_solo"
+
+if Kitchen::Provisioner.const_defined?(:ChefSolo, false) &&
+    !(Kitchen::Provisioner::ChefSolo <= Kitchen::Provisioner::CincSolo)
+  Kitchen::Provisioner.send(:remove_const, :ChefSolo)
+end
+
+require_relative "../../kitchen/provisioner/chef_solo"

data/lib/kitchen-cinc/provisioner/chef_target.rb

@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# See chef_infra.rb in this directory for the full rationale.
+require "kitchen/provisioner/cinc_target"
+
+if Kitchen::Provisioner.const_defined?(:ChefTarget, false) &&
+    !(Kitchen::Provisioner::ChefTarget <= Kitchen::Provisioner::CincTarget)
+  Kitchen::Provisioner.send(:remove_const, :ChefTarget)
+end
+
+require_relative "../../kitchen/provisioner/chef_target"

data/lib/kitchen-cinc/provisioner/chef_zero.rb

@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2026, Oregon State University
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# See chef_infra.rb in this directory for the full rationale.
+require "kitchen/provisioner/cinc_infra"
+
+if Kitchen::Provisioner.const_defined?(:ChefZero, false) &&
+    !(Kitchen::Provisioner::ChefZero <= Kitchen::Provisioner::CincInfra)
+  Kitchen::Provisioner.send(:remove_const, :ChefZero)
+end
+
+require_relative "../../kitchen/provisioner/chef_zero"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-cinc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Cinc Project
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-24 00:00:00.000000000 Z
+date: 2026-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -71,6 +71,17 @@ files:
 - LICENSE
 - Rakefile
 - kitchen-cinc.gemspec
+- lib/kitchen-cinc/provisioner/chef_apply.rb
+- lib/kitchen-cinc/provisioner/chef_infra.rb
+- lib/kitchen-cinc/provisioner/chef_solo.rb
+- lib/kitchen-cinc/provisioner/chef_target.rb
+- lib/kitchen-cinc/provisioner/chef_zero.rb
+- lib/kitchen/provisioner/chef_alias_loader.rb
+- lib/kitchen/provisioner/chef_apply.rb
+- lib/kitchen/provisioner/chef_infra.rb
+- lib/kitchen/provisioner/chef_solo.rb
+- lib/kitchen/provisioner/chef_target.rb
+- lib/kitchen/provisioner/chef_zero.rb
 - lib/kitchen/provisioner/cinc/berkshelf.rb
 - lib/kitchen/provisioner/cinc/common_sandbox.rb
 - lib/kitchen/provisioner/cinc/policyfile.rb