test-kitchen 2.2.1 → 2.2.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6fcd9952010c88bc80a5d60e98cbd1ee532e4438b7959ae9e17e2b5ce11bde9f
4
- data.tar.gz: 8629120611d4ace526399b8bb2b0b2ea4c5bd87d4df7358db4b887dad2d9a2a6
3
+ metadata.gz: b6c58820622fdc3aac554e5fe00a8485561076e493d82ccc3d5cc53a13901e99
4
+ data.tar.gz: a146d43a890701b4bfe5b8043a02fe4a30c6a237565189e55b58c50653ee442a
5
5
  SHA512:
6
- metadata.gz: c4fd6b84057f1bac37988dced3f52aac2468215c585ce84f85706015d5eab891cb50e7179efaa5c6fac6cb326c76281b6546011a7e663449b7be20f4894f1a56
7
- data.tar.gz: 4d8a41527bae9345f9f353a0360c65654305c6493bd48ccbffd55742a5cdabad151986e2602cc051e618006f680f9fa00599e8edc34a096042cad7eec9acb42c
6
+ metadata.gz: 4c4fe3d155163a35ad473f6ba155a9a04b83fcfe585423accfe856db66341964e43be94553322eec2c989cfc95ee0b78cf7b55d73b5fd02baabc1fd7553d0fc9
7
+ data.tar.gz: 5ba0906fe1817c4c7cde1f08753c14d6c390824e8d50adf1b2cc5403630959ae8d5b85d1e0abde7a024bc5abff3a1bcf107688d5ea620336e18e2d471dde719d
@@ -245,11 +245,28 @@ module Kitchen
245
245
  end
246
246
  end
247
247
 
248
+ # gives us the product version from either require_chef_omnibus or product_version
249
+ # If the non-default (true) value of require_chef_omnibus is present use that
250
+ # otherwise use config[:product_version] which defaults to :latest and is the actual
251
+ # default for chef provisioners
252
+ #
253
+ # @return [String,Symbol,NilClass] version or nil if not applicable
254
+ def product_version
255
+ case config[:require_chef_omnibus]
256
+ when FalseClass
257
+ nil
258
+ when TrueClass
259
+ config[:product_version]
260
+ else
261
+ config[:require_chef_omnibus]
262
+ end
263
+ end
264
+
248
265
  # (see Base#check_license)
249
266
  def check_license
250
267
  name = config[:product_name] || "chef"
251
- version = config[:product_version]
252
- debug("Checking if we need to prompt for license acceptance on product: #{name} version: #{version}")
268
+ version = product_version
269
+ debug("Checking if we need to prompt for license acceptance on product: #{name} version: #{version}.")
253
270
 
254
271
  acceptor = LicenseAcceptance::Acceptor.new(logger: Kitchen.logger, provided: config[:chef_license])
255
272
  if acceptor.license_required?(name, version)
@@ -355,7 +372,7 @@ module Kitchen
355
372
  def default_config_rb # rubocop:disable Metrics/MethodLength
356
373
  root = config[:root_path].gsub("$env:TEMP", "\#{ENV['TEMP']\}")
357
374
 
358
- {
375
+ config_rb = {
359
376
  node_name: instance.name,
360
377
  checksum_path: remote_path_join(root, "checksums"),
361
378
  file_cache_path: remote_path_join(root, "cache"),
@@ -378,6 +395,8 @@ module Kitchen
378
395
  ),
379
396
  treat_deprecation_warnings_as_errors: config[:deprecations_as_errors],
380
397
  }
398
+ config_rb[:chef_license] = config[:chef_license] unless config[:chef_license].nil?
399
+ config_rb
381
400
  end
382
401
 
383
402
  # Generates a rendered client.rb/solo.rb/knife.rb formatted file as a
@@ -72,7 +72,6 @@ module Kitchen
72
72
  args << "--logfile #{config[:log_file]}" if config[:log_file]
73
73
  args << "--profile-ruby" if config[:profile_ruby]
74
74
  args << "--legacy-mode" if config[:legacy_mode]
75
- args << "--chef-license #{config[:chef_license]}" if config[:chef_license]
76
75
  args
77
76
  end
78
77
  end
@@ -82,9 +82,6 @@ module Kitchen
82
82
  args << "--chef-zero-port #{config[:chef_zero_port]}"
83
83
  end
84
84
  args << "--profile-ruby" if config[:profile_ruby]
85
- if config[:chef_license]
86
- args << "--chef-license #{config[:chef_license]}"
87
- end
88
85
  end
89
86
  # rubocop:enable Metrics/CyclomaticComplexity
90
87
 
@@ -17,5 +17,5 @@
17
17
  # limitations under the License.
18
18
 
19
19
  module Kitchen
20
- VERSION = "2.2.1".freeze
20
+ VERSION = "2.2.2".freeze
21
21
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: test-kitchen
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.1
4
+ version: 2.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Fletcher Nichol
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-05-01 00:00:00.000000000 Z
11
+ date: 2019-05-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout