kitchen-k8s 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9f739bca1596328e9836a3ef45d01885509e47b
-  data.tar.gz: 3f0935d1b28d1eb95fe85bdd13c105f08575d806
+  metadata.gz: a19eb36821f265a527c1e28e93796ec45c004aa3
+  data.tar.gz: e6388f01c84365f087d74986e14da83bf0418da4
 SHA512:
-  metadata.gz: e3792ab9ccbace22b25d1cfbfc01f9c3610f69e1b511bd1df0e1b75deb2063de2c154bb284cb14843d20eb9ab95ec3431f4d133aa0af7f93fab982709e6e3cac
-  data.tar.gz: beeae1af123c0864c633a3a68908e32c0d89ef5532d9f6aae6c32c731559ee52ae61880f9135e33546736cb0fc8230412df8ecfff97e805d190a8e9796215169
+  metadata.gz: 72b84e9c0e56c57be9792d949b32add73edf6fd928ee929f26535400e2edd33d533131d072488de8ef1fbd112fe1f352dee93ed410199b17eaf496ddcc05e8ea
+  data.tar.gz: 244f09bf4579c5a64f69c6ce24b80b4b3ec9b29a06da713c986f3214092b7b892e212894d759fec3ab2a0365cba57e7f5133ad3648da7bca919286ea29d5376a

data/README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://img.shields.io/travis/mickfeech/kitchen-k8s.svg)](https://travis-ci.org/mickfeech/kitchen-k8s)
 [![Gem Version](https://badge.fury.io/rb/kitchen-k8s.svg)](https://badge.fury.io/rb/kitchen-k8s)
+[![Maintainability](https://api.codeclimate.com/v1/badges/d8b7b21a196fecda1b18/maintainability)](https://codeclimate.com/github/mickfeech/kitchen-k8s/maintainability)
 
 A [Test Kitchen](https://github.com/test-kitchen/test-kitchen) driver for testing on top of a Kubernetes cluster.
 
@@ -68,4 +69,4 @@ Copyright 2018, Chris McFee
 
 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: [http://www.apache.org/licenses/LICENSE-2.0](http://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.
+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.

data/lib/kitchen/driver/k8s.rb

@@ -8,6 +8,8 @@ require 'uri'
 
 require 'kitchen/driver/base'
 require 'kitchen/transport/k8s'
+require 'kitchen/provisioner/chef_base'
+require 'kitchen/verifier/busser'
 
 module Kitchen
   module Driver
@@ -53,7 +55,53 @@ module Kitchen
       # @api private
       def finalize_config!(instance)
         super.tap do
+          # Force the use of the Kubernetes transport since it isn't much use
+          # without that.
           instance.transport = Kitchen::Transport::K8s.new(config)
+          # Leave room for the possibility of other provisioners in the future,
+          # but force some options we need.
+          if instance.provisioner.is_a?(Kitchen::Provisioner::ChefBase)
+            instance.provisioner.send(:config).update(
+              require_chef_omnibus: false,
+              product_name: nil,
+              chef_omnibus_root: '/opt/chef',
+              sudo: false,
+            )
+          end
+          # Ditto to the above, other verifiers will need their own hacks, but
+          # this is a start at least.
+          if instance.verifier.is_a?(Kitchen::Verifier::Busser)
+            instance.verifier.send(:config).update(
+              root_path: '/tmp/kitchen/verifier',
+              sudo: false,
+            )
+          elsif defined?(Kitchen::Verifier::Inspec) && instance.verifier.is_a?(Kitchen::Verifier::Inspec)
+            # Monkeypatch kitchen-inspec to use a copy of the k8s train transport.
+            require 'kitchen/verifier/k8s'
+            _config = config # Because closure madness.
+            old_runner_options = instance.verifier.method(:runner_options)
+            instance.verifier.send(:define_singleton_method, :runner_options) do |transport, state = {}, platform = nil, suite = nil|
+              if transport.is_a?(Kitchen::Transport::K8s)
+                {
+                  "backend" => "k8s_hack",
+                  "logger" => logger,
+                  "pod" => state[:pod_id],
+                  "container" => "default",
+                  "kubectl_path" => _config[:binary],
+                  "context" => _config[:context],
+                }.tap do |runner_options|
+                  # Copied directly from kitchen-inspec because there is no way not to. Sigh.
+                  runner_options["color"] = (config[:color].nil? ? true : config[:color])
+                  runner_options["format"] = config[:format] unless config[:format].nil?
+                  runner_options["output"] = config[:output] % { platform: platform, suite: suite } unless config[:output].nil?
+                  runner_options["profiles_path"] = config[:profiles_path] unless config[:profiles_path].nil?
+                  runner_options[:controls] = config[:controls]
+                end
+              else
+                old_runner_options.call(transport, state, platform, suite)
+              end
+            end
+          end
         end
       end
 

data/lib/kitchen/driver/k8s_version.rb

@@ -1,6 +1,6 @@
 module Kitchen
   module Driver
     # Version string for k8s Kitchen driver
-    K8S_VERSION = '0.9.2'.freeze
+    K8S_VERSION = '0.9.3'.freeze
   end
 end

data/lib/kitchen/transport/k8s.rb

@@ -3,6 +3,7 @@ require 'shellwords'
 require 'kitchen/login_command'
 require 'kitchen/shell_out'
 require 'kitchen/transport/base'
+require 'thor/util'
 
 require 'kitchen/helper/k8s'
 
@@ -31,7 +32,7 @@ module Kitchen
       # (see Base::Connection#execute)
       def execute(command)
         return if command.nil?
-        run_command(kubectl_command('exec', '--tty', '--container=default', options[:pod_id], '--', *Shellwords.split(command)))
+        run_command(kubectl_command('exec', '--tty', '--container=default', options[:pod_id], '--', *Shellwords.split(wrap_command(command))))
       end
 
       # (see Base::Connection#upload)
@@ -43,9 +44,10 @@ module Kitchen
         end
       end
 
-      # (see Base::Connection#login_command)
-      def login_command
-        info('in login')
+      protected
+
+      def wrap_command(cmd)
+        cmd.match(/\Ash\s\-c/) ? cmd : Util.wrap_command(cmd.gsub('\'', "'\\\\''"))
       end
     end
   end

data/lib/kitchen/verifier/k8s.rb

@@ -0,0 +1,71 @@
+require 'mixlib/shellout'
+
+require 'train'
+
+module Train::Transports
+  class K8sHack < Train.plugin(1)
+    name 'k8s_hack'
+
+    include_options Train::Extras::CommandWrapper
+    option :pod, required: true
+    option :container, default: nil
+    option :kubectl_path, default: 'kubectl'
+    option :context, default: nil
+
+    def connection(state = {})
+      opts = merge_options(options, state || {})
+      validate_options(opts)
+      opts[:logger] ||= logger
+      unless @connection && @connection_opts == opts
+        @connection ||= Connection.new(opts)
+        @connection_opts = opts.dup
+      end
+      @connection
+    end
+
+    class Connection < BaseConnection
+      if Gem::Requirement.create('< 0.30').satisfied_by?(Gem::Version.create(Train::VERSION))
+        # The API for a connection changed a lot in 0.30, this is a compat shim.
+        def os
+          @os ||= OSCommon.new(self, family: 'unix')
+        end
+
+        def file(path)
+          @files[path] ||= file_via_connection(path)
+        end
+
+        def run_command(cmd)
+          run_command_via_connection(cmd)
+        end
+      end
+
+      def file_via_connection(path)
+        defined?(Train::File::Remote::Linux) ? Train::File::Remote::Linux.new(self, path) : LinuxFile.new(self, path)
+      end
+
+      def run_command_via_connection(cmd)
+        kubectl_cmd = [options[:kubectl_path], 'exec']
+        kubectl_cmd.concat(['--context', options[:context]]) if options[:context]
+        kubectl_cmd.concat(['--container', options[:container]]) if options[:container]
+        kubectl_cmd.concat([options[:pod], '--', '/bin/sh', '-c', cmd])
+
+        so = Mixlib::ShellOut.new(kubectl_cmd, logger: logger)
+        so.run_command
+        if so.error?
+          # Trim the "command terminated with exit code N" line from the end
+          # of the stderr content.
+          so.stderr.gsub!(/command terminated with exit code #{so.exitstatus}\n\Z/, '')
+        end
+        CommandResult.new(so.stdout, so.stderr, so.exitstatus)
+      end
+
+      def uri
+        if options[:container]
+          "kubernetes://#{options[:pod]}/#{options[:container]}"
+        else
+          "kubernetes://#{options[:pod]}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-k8s
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Chris McFee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-19 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kubeclient
@@ -205,6 +205,7 @@ files:
 - lib/kitchen/driver/k8s_version.rb
 - lib/kitchen/helper/k8s.rb
 - lib/kitchen/transport/k8s.rb
+- lib/kitchen/verifier/k8s.rb
 - test/.kitchen.yml
 - test/cookbooks/test/metadata.rb
 - test/cookbooks/test/recipes/default.rb