test-kitchen 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fcd9952010c88bc80a5d60e98cbd1ee532e4438b7959ae9e17e2b5ce11bde9f
-  data.tar.gz: 8629120611d4ace526399b8bb2b0b2ea4c5bd87d4df7358db4b887dad2d9a2a6
+  metadata.gz: b6c58820622fdc3aac554e5fe00a8485561076e493d82ccc3d5cc53a13901e99
+  data.tar.gz: a146d43a890701b4bfe5b8043a02fe4a30c6a237565189e55b58c50653ee442a
 SHA512:
-  metadata.gz: c4fd6b84057f1bac37988dced3f52aac2468215c585ce84f85706015d5eab891cb50e7179efaa5c6fac6cb326c76281b6546011a7e663449b7be20f4894f1a56
-  data.tar.gz: 4d8a41527bae9345f9f353a0360c65654305c6493bd48ccbffd55742a5cdabad151986e2602cc051e618006f680f9fa00599e8edc34a096042cad7eec9acb42c
+  metadata.gz: 4c4fe3d155163a35ad473f6ba155a9a04b83fcfe585423accfe856db66341964e43be94553322eec2c989cfc95ee0b78cf7b55d73b5fd02baabc1fd7553d0fc9
+  data.tar.gz: 5ba0906fe1817c4c7cde1f08753c14d6c390824e8d50adf1b2cc5403630959ae8d5b85d1e0abde7a024bc5abff3a1bcf107688d5ea620336e18e2d471dde719d

data/lib/kitchen/provisioner/chef_base.rb

@@ -245,11 +245,28 @@ module Kitchen
         end
       end
 
+      # gives us the product version from either require_chef_omnibus or product_version
+      # If the non-default (true) value of require_chef_omnibus is present use that
+      # otherwise use config[:product_version] which defaults to :latest and is the actual
+      # default for chef provisioners
+      #
+      # @return [String,Symbol,NilClass] version or nil if not applicable
+      def product_version
+        case config[:require_chef_omnibus]
+        when FalseClass
+          nil
+        when TrueClass
+          config[:product_version]
+        else
+          config[:require_chef_omnibus]
+        end
+      end
+
       # (see Base#check_license)
       def check_license
         name = config[:product_name] || "chef"
-        version = config[:product_version]
-        debug("Checking if we need to prompt for license acceptance on product: #{name} version: #{version}")
+        version = product_version
+        debug("Checking if we need to prompt for license acceptance on product: #{name} version: #{version}.")
 
         acceptor = LicenseAcceptance::Acceptor.new(logger: Kitchen.logger, provided: config[:chef_license])
         if acceptor.license_required?(name, version)
@@ -355,7 +372,7 @@ module Kitchen
       def default_config_rb # rubocop:disable Metrics/MethodLength
         root = config[:root_path].gsub("$env:TEMP", "\#{ENV['TEMP']\}")
 
-        {
+        config_rb = {
           node_name: instance.name,
           checksum_path: remote_path_join(root, "checksums"),
           file_cache_path: remote_path_join(root, "cache"),
@@ -378,6 +395,8 @@ module Kitchen
           ),
           treat_deprecation_warnings_as_errors: config[:deprecations_as_errors],
         }
+        config_rb[:chef_license] = config[:chef_license] unless config[:chef_license].nil?
+        config_rb
       end
 
       # Generates a rendered client.rb/solo.rb/knife.rb formatted file as a

data/lib/kitchen/provisioner/chef_solo.rb

@@ -72,7 +72,6 @@ module Kitchen
         args << "--logfile #{config[:log_file]}" if config[:log_file]
         args << "--profile-ruby" if config[:profile_ruby]
         args << "--legacy-mode" if config[:legacy_mode]
-        args << "--chef-license #{config[:chef_license]}" if config[:chef_license]
         args
       end
     end

data/lib/kitchen/provisioner/chef_zero.rb

@@ -82,9 +82,6 @@ module Kitchen
           args << "--chef-zero-port #{config[:chef_zero_port]}"
         end
         args << "--profile-ruby" if config[:profile_ruby]
-        if config[:chef_license]
-          args << "--chef-license #{config[:chef_license]}"
-        end
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 

data/lib/kitchen/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Kitchen
-  VERSION = "2.2.1".freeze
+  VERSION = "2.2.2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-01 00:00:00.000000000 Z
+date: 2019-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout