test-kitchen 3.0.0 → 3.1.0

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: 7cff7935683511121e07b20e636078776ae80c20fc007b5b08a922ce76e0ce94
4
- data.tar.gz: 8207e168e7faf42b8239438753c58f2a9a37fc4f4f2dcd9728948f67b4a5afb9
3
+ metadata.gz: fc5e05dc50e7052b2002a94e950f5691d953c78d5e408b80a0f7f977ab63eb35
4
+ data.tar.gz: 43bc1979cc77277d4a3219f82d8fead18e7aa3cf068fb7484f5176ce422c8767
5
5
  SHA512:
6
- metadata.gz: 46356119baf46a5ec115cc036c81778e8f17ac2dca6a21733d7bb4ef8779d7d23724ef295cd1f0557083abe577578ff28eec2bb5d9a4596359d8c5c34ea0379b
7
- data.tar.gz: 7770f0e415279795ecf2106a6005f7b1514bd692be9a5839d24e992ad4e03dcbbe33dd86892904b1dd87a73473a3484d3f44518f7b87211d1c340c3f94abd6a3
6
+ metadata.gz: 12453b3cbf1ef1dfb49b683667fca52502b10a888e9cf953d58c22589ce99dffc9864d550463c80341049f7073aa3c3fb98eb76c4e432aa266956b6a0a86c332
7
+ data.tar.gz: bc19f713f60acc0b5437c5b29ab241255a7a82de2b206ba714596bf2a251c0e9a3c21bc152a18e171461ca24d9291098b55baeec474e495f46824782487350b8
data/Gemfile CHANGED
@@ -17,5 +17,5 @@ group :debug do
17
17
  end
18
18
 
19
19
  group :chefstyle do
20
- gem "chefstyle", "2.0.5"
20
+ gem "chefstyle", "2.1.0"
21
21
  end
@@ -439,18 +439,31 @@ module Kitchen
439
439
  elevated_username: data[:elevated_username] || data[:username],
440
440
  elevated_password: elevated_password,
441
441
  }
442
- opts.merge!(additional_transport_args(opts[:transport]))
442
+ opts.merge!(additional_transport_args(data, opts[:transport]))
443
+ if opts[:transport].to_sym == :ssl && opts.key?(:client_cert) && opts.key?(:client_key)
444
+ opts.delete(:user)
445
+ opts.delete(:password)
446
+ end
443
447
  opts
444
448
  end
445
449
 
446
- def additional_transport_args(transport_type)
450
+ def additional_transport_args(data, transport_type)
451
+ opts = {
452
+ disable_sspi: false,
453
+ basic_auth_only: false,
454
+ }
455
+
447
456
  case transport_type.to_sym
448
- when :ssl, :negotiate
449
- {
450
- no_ssl_peer_verification: true,
451
- disable_sspi: false,
452
- basic_auth_only: false,
453
- }
457
+ when :ssl
458
+ if data.key?(:client_cert) && data.key?(:client_key)
459
+ opts[:client_cert] = data[:client_cert]
460
+ opts[:client_key] = data[:client_key]
461
+ end
462
+ opts[:no_ssl_peer_verification] = data.key?(:no_ssl_peer_verification) ? data[:no_ssl_peer_verification] : true
463
+ opts
464
+ when :negotiate
465
+ opts[:no_ssl_peer_verification] = true
466
+ opts
454
467
  when :plaintext
455
468
  {
456
469
  disable_sspi: true,
@@ -16,5 +16,5 @@
16
16
  # limitations under the License.
17
17
 
18
18
  module Kitchen
19
- VERSION = "3.0.0".freeze
19
+ VERSION = "3.1.0".freeze
20
20
  end
data/test-kitchen.gemspec CHANGED
@@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
20
20
  gem.executables = %w{kitchen}
21
21
  gem.require_paths = ["lib"]
22
22
 
23
- gem.required_ruby_version = ">= 2.5"
23
+ gem.required_ruby_version = ">= 2.6"
24
24
 
25
25
  gem.add_dependency "mixlib-shellout", ">= 1.2", "< 4.0"
26
26
  gem.add_dependency "net-scp", ">= 1.1", "< 4.0" # pinning until we can confirm 4+ works
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
46
46
  gem.add_development_dependency "fakefs", "~> 1.0"
47
47
  gem.add_development_dependency "minitest", "~> 5.3", "< 5.15"
48
48
  gem.add_development_dependency "mocha", "~> 1.1"
49
- gem.add_development_dependency "cucumber", ">= 2.1", "< 4.0" # we just need to validate 4.0 when it comes out
49
+ gem.add_development_dependency "cucumber", ">= 2.1", "< 8.0"
50
50
  gem.add_development_dependency "countloc", "~> 0.4"
51
51
  gem.add_development_dependency "maruku", "~> 0.6"
52
52
  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: 3.0.0
4
+ version: 3.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Fletcher Nichol
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-02 00:00:00.000000000 Z
11
+ date: 2021-10-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-shellout
@@ -347,7 +347,7 @@ dependencies:
347
347
  version: '2.1'
348
348
  - - "<"
349
349
  - !ruby/object:Gem::Version
350
- version: '4.0'
350
+ version: '8.0'
351
351
  type: :development
352
352
  prerelease: false
353
353
  version_requirements: !ruby/object:Gem::Requirement
@@ -357,7 +357,7 @@ dependencies:
357
357
  version: '2.1'
358
358
  - - "<"
359
359
  - !ruby/object:Gem::Version
360
- version: '4.0'
360
+ version: '8.0'
361
361
  - !ruby/object:Gem::Dependency
362
362
  name: countloc
363
363
  requirement: !ruby/object:Gem::Requirement
@@ -513,14 +513,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
513
513
  requirements:
514
514
  - - ">="
515
515
  - !ruby/object:Gem::Version
516
- version: '2.5'
516
+ version: '2.6'
517
517
  required_rubygems_version: !ruby/object:Gem::Requirement
518
518
  requirements:
519
519
  - - ">="
520
520
  - !ruby/object:Gem::Version
521
521
  version: '0'
522
522
  requirements: []
523
- rubygems_version: 3.2.15
523
+ rubygems_version: 3.2.22
524
524
  signing_key:
525
525
  specification_version: 4
526
526
  summary: Test Kitchen is an integration tool for developing and testing infrastructure