test-kitchen 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63a2ed29a7b97053ca99c64d49da1b8fdcce272c815b8dc2eca67b19fce036cf
-  data.tar.gz: 6556c59e7fd4b3aff0a59f47e33bead60693b7b8d5eeca3fc0423878a0a25c3b
+  metadata.gz: 2e0456b45cb33179d229ccb9ee34371fdbace78b49ec713848091ef9122310c7
+  data.tar.gz: c9bc3d72ca6f8a516b74a8a679a6a37e11e22aec43e3b314a69f77bfe76afc37
 SHA512:
-  metadata.gz: 1ccc3660f32de45e297fc5aafacb527b847910bd160f4d5a4f8a67a5067a24cf9db414627a5e745a2a5240f36dde23e14a08b5882c9977cea3bb7f3e573390c6
-  data.tar.gz: 9c6aae12a10b77808dfcdc9a73ea041fd0bc4f9138cd9a1843e7af92222418dd3ab0bb9ab9187de863a4503bae819f626dcc1885ee48916e662c71e2b4aedd63
+  metadata.gz: 3a04ad019828982de7f398baa04af63111131955ce1373761ce9d787590b149a8cc8a0a251255798930541904501737d9d35b6f1fbb057ac13963608826b509c
+  data.tar.gz: c6b4e203f029a53295dcc5734d1fbd432ff5bd0817707a674645189bc08e70d83dbb2cc593ea8b0a1dc30fd3f24938cfa4295c539ece0ac4f4031f1e9bb16e88

data/lib/kitchen/provisioner/base.rb

@@ -70,6 +70,7 @@ module Kitchen
       def call(state)
         create_sandbox
         sandbox_dirs = Util.list_directory(sandbox_path)
+        check_license
 
         instance.transport.connection(state) do |conn|
           conn.execute(install_command)
@@ -105,6 +106,12 @@ module Kitchen
         false
       end
 
+      # Certain products that Test Kitchen uses to provision require accepting
+      # a license to use. Overwrite this method in the specific provisioner
+      # to implement this check.
+      def check_license
+      end
+
       # Generates a command string which will install and configure the
       # provisioner software on an instance. If no work is required, then `nil`
       # will be returned.

data/lib/kitchen/provisioner/chef_apply.rb

@@ -107,6 +107,7 @@ module Kitchen
             "--no-color",
           ]
           args << "--logfile #{config[:log_file]}" if config[:log_file]
+          args << "--chef-license #{config[:chef_license]}" if config[:chef_license]
 
           lines << wrap_shell_code(
             [cmd, *args].join(" ")

data/lib/kitchen/provisioner/chef_base.rb

@@ -27,6 +27,7 @@ require "kitchen/provisioner/chef/common_sandbox"
 require "kitchen/util"
 require "mixlib/install"
 require "mixlib/install/script_generator"
+require "license_acceptance/acceptor"
 
 begin
   require "chef-config/config"
@@ -44,6 +45,7 @@ module Kitchen
       default_config :require_chef_omnibus, true
       default_config :chef_omnibus_url, "https://omnitruck.chef.io/install.sh"
       default_config :chef_omnibus_install_options, nil
+      default_config :chef_license, nil
       default_config :run_list, []
       default_config :attributes, {}
       default_config :config_path, nil
@@ -243,6 +245,23 @@ module Kitchen
         end
       end
 
+      # (see Base#check_license)
+      def check_license
+        name = config[:product_name]
+        version = config[:product_version]
+        acceptor = LicenseAcceptance::Acceptor.new(logger: Kitchen.logger, provided: config[:chef_license])
+        if acceptor.license_required?(name, version)
+          license_name = acceptor.name_from_mixlib(name)
+          begin
+            acceptor.check_and_persist(license_name, version.to_s)
+          rescue LicenseAcceptance::LicenseNotAcceptedError
+            error("Cannot converge without accepting the Chef License. Set it in your kitchen.yml or using the CHEF_LICENSE environment variable")
+            raise
+          end
+          config[:chef_license] ||= acceptor.acceptance_value
+        end
+      end
+
       # (see Base#create_sandbox)
       def create_sandbox
         super

data/lib/kitchen/provisioner/chef_solo.rb

@@ -72,7 +72,7 @@ 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,6 +82,9 @@ 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.1.0".freeze
+  VERSION = "2.2.0".freeze
 end

data/test-kitchen.gemspec

@@ -23,17 +23,20 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = ">= 2.3"
 
-  gem.add_dependency "mixlib-shellout", ">= 1.2", "< 3.0"
-  gem.add_dependency "net-scp",         ">= 1.1", "< 3.0" # pinning until we can confirm 3+ works
-  gem.add_dependency "net-ssh",         ">= 2.9", "< 6.0" # pinning until we can confirm 6+ works
-  gem.add_dependency "net-ssh-gateway", ">= 1.2", "< 3.0" # pinning until we can confirm 3+ works
-  gem.add_dependency "ed25519",         "~> 1.2" # ed25519 ssh key support
-  gem.add_dependency "bcrypt_pbkdf",    "~> 1.0" # ed25519 ssh key support
-  gem.add_dependency "thor",            "~> 0.19"
-  gem.add_dependency "mixlib-install",  "~> 3.6"
-  gem.add_dependency "winrm",           "~> 2.0"
-  gem.add_dependency "winrm-elevated",  "~> 1.0"
-  gem.add_dependency "winrm-fs",        "~> 1.1"
+  gem.add_dependency "mixlib-shellout",    ">= 1.2", "< 3.0"
+  gem.add_dependency "net-scp",            ">= 1.1", "< 3.0" # pinning until we can confirm 3+ works
+  gem.add_dependency "net-ssh",            ">= 2.9", "< 6.0" # pinning until we can confirm 6+ works
+  gem.add_dependency "net-ssh-gateway",    ">= 1.2", "< 3.0" # pinning until we can confirm 3+ works
+  gem.add_dependency "ed25519",            "~> 1.2" # ed25519 ssh key support
+  gem.add_dependency "bcrypt_pbkdf",       "~> 1.0" # ed25519 ssh key support
+  gem.add_dependency "thor",               "~> 0.19"
+  gem.add_dependency "mixlib-install",     "~> 3.6"
+  gem.add_dependency "winrm",              "~> 2.0"
+  gem.add_dependency "winrm-elevated",     "~> 1.0"
+  gem.add_dependency "winrm-fs",           "~> 1.1"
+  # Required to run the Chef provisioner local license check for remote systems
+  # TK is not under Chef EULA
+  gem.add_dependency "license-acceptance", ">= 0.2.16", "< 2.0"
 
   gem.add_development_dependency "rb-readline"
   gem.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test-kitchen
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-18 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -188,6 +188,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: license-acceptance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.16
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.16
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rb-readline
   requirement: !ruby/object:Gem::Requirement