kitchen-lxd_sling 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7ba5674d2624b638a7ee3d0b0a4136749891dfa110403e9ce0d0c28768eed6f
-  data.tar.gz: 01c04cc5eeb4c4ae63606dbe9893dbde9866400c87414b605d6ba08e7a1696b9
+  metadata.gz: 3abb096dba2a0096045fbc2f24a8030fb1fa49670c9f9a6b8e916dbe9df1d945
+  data.tar.gz: 43142550d61d9bce30bdfa2310f4490728729044e35b88af552b3176e0b72469
 SHA512:
-  metadata.gz: fcfa99f2bf06b113b1975cd537e0cfe2935807ba59494c292f5262d799e0be3e6b14d207f1df5055ec012000ffa87e1773e45f9b2fbb01a0370367583ab5dd2d
-  data.tar.gz: 25698c18402960deba7819ef69230250de8ad05ab0682d93511b53610445cf75f07ca86c6ca528ffd717d1e6bae77dc9dfcfe87db30a07c3085cdd2b417fbd24
+  metadata.gz: 1e30da85043672b192e5c5d5c2f948f130cb4a18db835d906b6331ba81e7ba8d6fa57bf3666a5a650db6242ec030d260a87d9904ffeb6d796c2794bf87455015
+  data.tar.gz: 2c760c7997d10b71ec7cdf548bef93c05516cce6310dff8024ce682c8d8eb5b33abe06f788fa379f7f4e91c8201cd3e326900df18e9eeff3ab5ff78c4f2a5615

data/.gitattributes

@@ -0,0 +1,3 @@
+# Managing line ending conversions
+# See http://git-scm.com/docs/gitattributes#_end-of-line_conversion
+* text=auto

data/.kitchen.yml

@@ -6,17 +6,15 @@ provisioner:
   name: chef_zero
 
 platforms:
-  - name: ubuntu-16.04
-    verifier: inspec
+  - name: ubuntu-18.04
     
-transport: lxd
-
 suites:
   - name: kitchen-lxd-native
+    verifier: inspec
     provisioner:
       downloads:
         '/tmp/kitchen': <%= Dir.tmpdir %>/kitchen-download-test
   - name: kitchen-lxd-cloud
     driver:
-      image_server: https://cloud-images.ubuntu.com/releases
-      username: ubuntu
+      image_server: https://cloud-images.ubuntu.com/daily
+      ssh_login: ubuntu

data/Berksfile

@@ -1,7 +1,7 @@
-source 'https://supermarket.chef.io'
+source "https://supermarket.chef.io"
 
-cookbook 'lxd_sling', git: 'https://github.com/nexussw/lxd_sling.git'
+cookbook "lxd_sling", git: "https://github.com/nexussw/lxd_sling.git"
 
 group :test do
-  cookbook 'test', path: 'test/cookbooks/test'
+  cookbook "test", path: "test/cookbooks/test"
 end

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in kitchen-lxd_sling.gemspec
 gemspec

data/Rakefile

@@ -1,13 +1,13 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
 task default: :spec
 
 begin
-  require 'kitchen/rake_tasks'
+  require "kitchen/rake_tasks"
   Kitchen::RakeTasks.new
 rescue LoadError
-  puts '>>>>> Kitchen gem not loaded, omitting tasks' unless ENV['CI']
+  puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV["CI"]
 end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require 'bundler/setup'
-require 'kitchen/lxd_sling'
+require "bundler/setup"
+require "kitchen/lxd_sling"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require 'kitchen/lxd_sling'
 # require 'pry'
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/bin/lxc-shell

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'yaml'
+require "yaml"
 
 def symbolize_keys(hash)
   {}.tap do |retval|
@@ -12,12 +12,12 @@ end
 
 state = symbolize_keys(YAML.load(File.read(ARGV[0])))
 
-require 'kitchen'
-require 'kitchen/driver/lxd/host_locator'
-require 'tty/reader'
-require 'tty/screen'
-require 'io/wait'
-require 'io/console'
+require "kitchen"
+require "kitchen/driver/lxd/host_locator"
+require "tty/reader"
+require "tty/screen"
+require "io/wait"
+require "io/console"
 
 class NxHost
   include Kitchen::Driver::Lxd::HostLocator
@@ -38,7 +38,7 @@ end
 
 # ruby bin/lxc-shell .kitchen/kitchen-lxd-native-ubuntu-1604.yml
 
-term = ENV['TERM'] || 'dumb'
+term = ENV["TERM"] || "dumb"
 user = transport.username
 if user
   user = " - #{user}"

data/kitchen-lxd_sling.gemspec

@@ -1,34 +1,34 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'kitchen/driver/lxd_version'
+require "kitchen/driver/lxd_version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'kitchen-lxd_sling'
+  spec.name          = "kitchen-lxd_sling"
   spec.version       = Kitchen::Driver::LXD_VERSION
-  spec.authors       = ['Sean Zachariasen']
-  spec.email         = ['thewyzard@hotmail.com']
+  spec.authors       = ["Sean Zachariasen"]
+  spec.email         = ["thewyzard@hotmail.com"]
 
-  spec.summary       = 'Test Kitchen Driver for LXD'
-  spec.homepage      = 'https://github.com/NexusSW/kitchen-lxd_sling'
-  spec.license       = 'Apache-2.0'
+  spec.summary       = "Test Kitchen Driver for LXD"
+  spec.homepage      = "https://github.com/NexusSW/kitchen-lxd_sling"
+  spec.license       = "Apache-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.add_dependency 'lxd-common', '~> 0.9'
-  spec.add_dependency 'test-kitchen', '~> 1.0'
-  spec.add_dependency 'tty-reader', '~> 0.2'
-  spec.add_dependency 'tty-screen', '~> 0.6'
+  spec.add_dependency "lxd-common", "~> 0.9"
+  spec.add_dependency "test-kitchen", "~> 1.0"
+  spec.add_dependency "tty-reader", "~> 0.2"
+  spec.add_dependency "tty-screen", "~> 0.6"
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'berkshelf'
-  spec.add_development_dependency 'kitchen-inspec'
-  spec.add_development_dependency 'train-lxd'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "berkshelf"
+  spec.add_development_dependency "kitchen-inspec"
+  spec.add_development_dependency "train-lxd"
 end

data/lib/kitchen/driver/lxd.rb

@@ -1,18 +1,18 @@
-require 'kitchen'
-require 'kitchen/driver/base'
-require 'kitchen/transport/lxd'
-require 'kitchen/driver/lxd_version'
-require 'kitchen/driver/lxd/host_locator'
+require "kitchen"
+require "kitchen/driver/base"
+require "kitchen/transport/lxd"
+require "kitchen/driver/lxd_version"
+require "kitchen/driver/lxd/host_locator"
 
-require 'nexussw/lxd/driver/cli'
-require 'nexussw/lxd/driver/rest'
-require 'nexussw/lxd/transport/cli'
-require 'nexussw/lxd/transport/rest'
-require 'nexussw/lxd/transport/local'
+require "nexussw/lxd/driver/cli"
+require "nexussw/lxd/driver/rest"
+require "nexussw/lxd/transport/cli"
+require "nexussw/lxd/transport/rest"
+require "nexussw/lxd/transport/local"
 
-require 'securerandom'
+require "securerandom"
 
-require 'kitchen/verifier/inspec-lxd'
+require "kitchen/verifier/inspec-lxd"
 
 module Kitchen
   module Driver
@@ -29,12 +29,12 @@ module Kitchen
 
       default_config :server, nil
       default_config :port, 8443
-      default_config :image_server, 'https://images.linuxcontainers.org'
+      default_config :image_server, "https://images.linuxcontainers.org"
       default_config :rest_options, {}
 
       def create(state)
         state[:config] = config.select { |k, _| [:server, :port, :rest_options, :image_server].include? k }
-        info 'Utilizing REST interface at ' + host_address if respond_to?(:info) && can_rest?
+        info "Utilizing REST interface at " + host_address if respond_to?(:info) && can_rest?
 
         state[:username] = config[:username] if config.key? :username
         state[:container_name] = new_container_name unless state[:container_name]
@@ -45,16 +45,12 @@ module Kitchen
         info "Container name: #{state[:container_name]}"
         driver.create_container(state[:container_name], state[:container_options])
 
-        if state[:username] && cloud_image?
-          info 'Waiting for cloud-init...'
-          driver.wait_for state[:container_name], :cloud_init
-        end
         # Allow SSH transport on known images with sshd enabled
         # This will only work if the container is routable.  LXD does not do port forwarding (yet)
         # Which also means that you might need to do 'ssh_login: false' in the config if you're using a cloud-image and aren't routable
         # think ahead for default behaviour once LXD can port forward
         # FUTURE: If I get time I'll look into faking a port forward with something under /dev/ until then
-        info 'Waiting for an IP address...'
+        info "Waiting for an IP address..."
         state[:ip_address] = state[:hostname] = container_ip(state)
         if use_ssh?
           # Normalize [:ssh_login]
@@ -62,7 +58,13 @@ module Kitchen
           config[:ssh_login] ||= {} # if config[:ssh_login] && !config.to_hash[:ssh_login].is_a?(Hash)
 
           state[:username] = config[:ssh_login][:username] if config[:ssh_login].key? :username
-          state[:username] ||= 'root'
+          state[:username] ||= "root"
+
+          if (state[:username] != "root") && cloud_image?
+            info "Waiting for cloud-init..."
+            driver.wait_for state[:container_name], :cloud_init
+          end
+
           setup_ssh(state[:username], config[:ssh_login][:public_key] || "#{ENV['HOME']}/.ssh/id_rsa.pub", state)
           info "SSH access enabled on #{state[:ip_address]}"
         else
@@ -75,9 +77,9 @@ module Kitchen
             # only centos/7 and various ubuntu versions have been tested here
             #   - ubuntu non-cloud has no download utilities in order to dl the chef package so we must adapt that
             #   - centos/7 needs sudo installed, or you need to use sudo:false on the provisioner...  leaving it explicit for the user to fix
-            unless transport.execute('test -d /etc/apt').error?
-              info 'Installing additional dependencies...'
-              transport.execute('apt-get install openssl curl ca-certificates -y').error!
+            unless transport.execute("test -d /etc/apt").error?
+              info "Installing additional dependencies..."
+              transport.execute("apt-get install openssl curl ca-certificates -y").error!
             end
           end
         end
@@ -115,11 +117,11 @@ module Kitchen
       def cloud_image?
         server = image_server
         return false unless server && server[:server]
-        server[:server].downcase.start_with? 'https://cloud-images.ubuntu.com'
+        server[:server].downcase.start_with? "https://cloud-images.ubuntu.com"
       end
 
       def new_container_name
-        instance.name + '-' + SecureRandom.hex(8)
+        instance.name + "-" + SecureRandom.hex(8)
       end
 
       # Normalize into a hash with the correct protocol
@@ -132,7 +134,7 @@ module Kitchen
         server = config[:image_server]
         if server.is_a? String
           server = { server: server }
-          server[:protocol] = 'simplestreams' if server[:server].split(':', 3)[2].nil?
+          server[:protocol] = "simplestreams" if server[:server].split(":", 3)[2].nil?
         end
         server
       end
@@ -149,19 +151,19 @@ module Kitchen
         return name unless server
 
         # 1:
-        if server.downcase.start_with? 'https://cloud-images.ubuntu.com'
+        if server.downcase.start_with? "https://cloud-images.ubuntu.com"
           info "Using cloud-image '#{name}'"
-          return name.downcase.sub(/^ubuntu-/, '')
+          return name.downcase.sub(/^ubuntu-/, "")
         end
         # 2:
-        if server.downcase.start_with? 'https://images.linuxcontainers.org'
-          name = name.downcase.split('-')
+        if server.downcase.start_with? "https://images.linuxcontainers.org"
+          name = name.downcase.split("-")
           # 'core' parses out in this method as the 'version' so just use 'ubuntu-core' in the kitchen.yml
-          if UBUNTU_RELEASES.key?(name[1]) && name[0] == 'ubuntu'
+          if UBUNTU_RELEASES.key?(name[1]) && name[0] == "ubuntu"
             name[1] = UBUNTU_RELEASES[name[1]]
-            name[0] = 'ubuntu-core' if name[1] == '16' # Logic patch for the edge case.  We'll do something different if this gets complicated
+            name[0] = "ubuntu-core" if name[1] == "16" # Logic patch for the edge case.  We'll do something different if this gets complicated
           end
-          name = name.join('/')
+          name = name.join("/")
           info "Using standard image #{name}"
         end
         name
@@ -171,20 +173,20 @@ module Kitchen
       # leaving this mutable so that end-users can append new releases to it
       # Usage Note: If a future release is not in the below table, just specify the full image name in the kitchen yml instead of using ubuntu-<version>
       UBUNTU_RELEASES = { # rubocop:disable Style/MutableConstant
-        '12.04' => 'precise',
-        '14.04' => 'trusty',
-        '16.04' => 'xenial',
-        '17.04' => 'zesty',
-        '17.10' => 'artful',
-        '18.04' => 'bionic',
-        'core' => '16',
+        "12.04" => "precise",
+        "14.04" => "trusty",
+        "16.04" => "xenial",
+        "17.04" => "zesty",
+        "17.10" => "artful",
+        "18.04" => "bionic",
+        "core" => "16",
       }
 
       def container_options
         options = image_server
         # 0:
         found = false
-        %w(:alias :fingerprint :properties).each do |k|
+        %w{:alias :fingerprint :properties}.each do |k|
           if config.key? k
             options[k] = config[k]
             found = true
@@ -213,9 +215,9 @@ module Kitchen
           raise
         ensure
           raise ActionFailed, "User (#{username}), or their home directory, were not found within container (#{state[:container_name]})" unless sshdir && !sshdir.empty?
-          sshdir += '/.ssh'
+          sshdir += "/.ssh"
         end
-        ak_file = sshdir + '/authorized_keys'
+        ak_file = sshdir + "/authorized_keys"
 
         info "Inserting public key for container user '#{username}'"
         transport.execute("bash -c 'mkdir -p #{sshdir} 2> /dev/null; cat #{remote_file} >> #{ak_file} \

data/lib/kitchen/driver/lxd/host_locator.rb

@@ -1,7 +1,7 @@
-require 'kitchen/driver/base'
-require 'nexussw/lxd/transport/local'
-require 'nexussw/lxd/driver/cli'
-require 'nexussw/lxd/driver/rest'
+require "kitchen/driver/base"
+require "nexussw/lxd/transport/local"
+require "nexussw/lxd/driver/cli"
+require "nexussw/lxd/driver/rest"
 
 class Kitchen::Driver::Lxd < Kitchen::Driver::Base
   module HostLocator

data/lib/kitchen/driver/lxd_version.rb

@@ -2,6 +2,6 @@
 
 module Kitchen
   module Driver
-    LXD_VERSION = '0.5.2'.freeze
+    LXD_VERSION = "0.5.3".freeze
   end
 end

data/lib/kitchen/transport/lxd.rb

@@ -1,7 +1,7 @@
-require 'kitchen/transport/base'
-require 'kitchen/driver/lxd_version'
-require 'shellwords'
-require 'fileutils'
+require "kitchen/transport/base"
+require "kitchen/driver/lxd_version"
+require "shellwords"
+require "fileutils"
 
 module Kitchen
   module Transport
@@ -26,7 +26,7 @@ module Kitchen
       end
 
       def state_filename
-        instance.instance_variable_get('@state_file').instance_variable_get('@file_name')
+        instance.instance_variable_get("@state_file").instance_variable_get("@file_name")
       end
 
       class Connection < Transport::Base::Connection
@@ -44,7 +44,7 @@ module Kitchen
           # There are some bash-isms coming from chef_zero (in particular, multiple_converge)
           # so let's wrap it
           command = command.shelljoin if command.is_a? Array
-          command = ['bash', '-c', command]
+          command = ["bash", "-c", command]
           res = nx_transport.execute(command, capture: true) do |stdout_chunk, stderr_chunk|
             logger << stdout_chunk if stdout_chunk
             logger << stderr_chunk if stderr_chunk
@@ -75,8 +75,8 @@ module Kitchen
         end
 
         def login_command
-          args = [File.expand_path('../../../../bin/lxc-shell', __FILE__), state_filename]
-          LoginCommand.new 'ruby', args
+          args = [File.expand_path("../../../../bin/lxc-shell", __FILE__), state_filename]
+          LoginCommand.new "ruby", args
         end
       end
     end

data/lib/kitchen/verifier/inspec-lxd.rb

@@ -1,14 +1,14 @@
 
-require 'kitchen/verifier/base'
+require "kitchen/verifier/base"
 
 class Kitchen::Verifier::Inspec < Kitchen::Verifier::Base
   def runner_options_for_lxd(config_data)
-    require 'train/lxd'
+    require "train/lxd"
     return config_data.select { |k, _| [:config, :container_name, :username].include? k }.tap do |data|
-      data[:backend] = 'lxd'
+      data[:backend] = "lxd"
       data[:logger] = logger
     end
   rescue LoadError
-    raise 'The `train-lxd` gem is required to run inspec for this container.  Is it installed?'
+    raise "The `train-lxd` gem is required to run inspec for this container.  Is it installed?"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-lxd_sling
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Sean Zachariasen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lxd-common
@@ -157,6 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitattributes"
 - ".gitignore"
 - ".kitchen.travis.yml"
 - ".kitchen.yml"