kitchen-nodes 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0ac0bec76ff5ea74db4a5108e2496f2da73abce
-  data.tar.gz: 8a6a61cc1b3cfdb2aedf36fbaebe9e240ed1991a
+  metadata.gz: 4b8930d518f65a1dee4809dbb78e4ae736fe4541
+  data.tar.gz: aa20c8911a41adc5825ff1652c23bcf8f60181ed
 SHA512:
-  metadata.gz: b802b58bcb5b36059cfc9da263a540fb4221627f48ab8bd52fde5f20f49d0c1165c96f158c743a35fcdf3f1dcd48f65c023c49c96b88b3c0075524633d5c78fd
-  data.tar.gz: c6e999c8e2eb11768ce1300cd2f9448bfe0e537ef9b6fbbc0d72648d44b40a4275cef99beeb720af5d8a672d7fa518ee4e997677cfbac35d82fadf17f0a7b653
+  metadata.gz: 49add0cf3e506a17bbcee92212ac72b38629141c25e3d3c23333540736b255f49c8a000304dd27aa07b5195926e1b2ead7926fc847225470fd407109316a78f2
+  data.tar.gz: ef5e99b812d19f73495d89f2d8d208a1aab8159a938c19a285fef8e2527723aa74c0cc31140ed68b3c4a881281d49bb1f150bd5714221bcca870a52c904a7455

data/.gitignore

@@ -2,7 +2,9 @@
 *.rbc
 .bundle
 .config
+.kitchen/
 .yardoc
+Berksfile.lock
 Gemfile.lock
 InstalledFiles
 _yardoc

data/.kitchen.yml

@@ -0,0 +1,41 @@
+---
+driver:
+  name: vagrant
+  network:
+    - ["private_network", { type: "dhcp" }]
+
+provisioner:
+  name: nodes
+
+platforms:
+- name: ubuntu-12.04
+  run_list:
+  - recipe[apt]
+  driver_config:
+    box: hashicorp/precise64
+
+- name: windows-2012R2
+  driver_config:
+    gui: true
+    box: mwrock/Windows2012R2
+
+suites:
+- name: node1
+  run_list:
+  - recipe[hurry-up-and-test::set_non_nat_vbox_ip]
+  - recipe[node-tests::node1]
+  attributes:
+    consul:
+      config:
+        bootstrap_expect: 2
+        server: true
+
+- name: node2
+  run_list:
+  - recipe[hurry-up-and-test::set_non_nat_vbox_ip]
+  - recipe[node-tests::node2]
+  attributes:
+    consul:
+      config:
+        bootstrap_expect: 2
+        server: true

data/.rubocop.yml

@@ -1,2 +1,6 @@
 Metrics/MethodLength:
   Max: 20
+
+AllCops:
+  Exclude:
+  - '.kitchen/**/*'

data/Berksfile

@@ -0,0 +1,7 @@
+source 'https://supermarket.chef.io'
+
+group :integration do
+  cookbook 'apt'
+  cookbook 'hurry-up-and-test'
+  cookbook 'node-tests', path: './test/integration/cookbooks/node-tests'
+end

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'kitchen-vagrant'
+gem 'berkshelf'
+gem 'winrm-transport'

data/kitchen-nodes.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'fakefs', '~> 0.4'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'rubocop', '~> 0.29'
+  spec.add_development_dependency 'rubocop', '~> 0.34'
 end

data/lib/kitchen/provisioner/{ip_finder.rb → finder.rb}

@@ -3,10 +3,10 @@ module Kitchen
     # Locates active IPs that are not localhost
     # there are separate implementations for
     # different kitchen transports
-    module IpFinder
+    module Finder
       def self.for_transport(transport, state)
         transport_string = transport.class.name.split('::').last
-        require("kitchen/provisioner/ip_finder/#{transport_string.downcase}")
+        require("kitchen/provisioner/finder/#{transport_string.downcase}")
 
         connection = transport.connection(state)
         klass = const_get(transport_string)

data/lib/kitchen/provisioner/{ip_finder → finder}/ssh.rb

@@ -48,7 +48,7 @@ module Kitchen
   end
 
   module Provisioner
-    module IpFinder
+    module Finder
       # SSH implementation for returning active non-localhost IPs
       class Ssh
         IP4REGEX = /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
@@ -70,6 +70,12 @@ module Kitchen
           ips
         end
 
+        def find_fqdn
+          @connection.node_execute('hostname -f').chomp
+        end
+
+        private
+
         def run_ifconfig
           response = @connection.node_execute('/sbin/ifconfig -a')
           ips = []

data/lib/kitchen/provisioner/{ip_finder → finder}/winrm.rb

@@ -12,7 +12,7 @@ module Kitchen
   end
 
   module Provisioner
-    module IpFinder
+    module Finder
       # WinRM implementation for returning active non-localhost IPs
       class Winrm
         def initialize(connection)
@@ -29,6 +29,21 @@ module Kitchen
           end
           data
         end
+
+        def find_fqdn
+          out = @connection.node_execute <<-EOS
+            [System.Net.Dns]::GetHostByName($env:computername) |
+              FL HostName |
+              Out-String |
+              % { \"{0}\" -f $_.Split(':')[1].Trim() }
+          EOS
+          data = ''
+          out[:data].each do |out_data|
+            stdout = out_data[:stdout]
+            data << stdout.chomp unless stdout.nil?
+          end
+          data
+        end
       end
     end
   end

data/lib/kitchen/provisioner/nodes.rb

@@ -18,7 +18,7 @@
 
 require 'kitchen'
 require 'kitchen/provisioner/chef_zero'
-require 'kitchen/provisioner/ip_finder'
+require 'kitchen/provisioner/finder'
 require 'net/ping'
 
 module Kitchen
@@ -41,11 +41,15 @@ module Kitchen
         end
       end
 
-      def ipaddress
-        state = Kitchen::StateFile.new(
+      def state_file
+        @state_file ||= Kitchen::StateFile.new(
           config[:kitchen_root],
           instance.name
         ).read
+      end
+
+      def ipaddress
+        state = state_file
 
         if %w(127.0.0.1 localhost).include?(state[:hostname])
           return get_reachable_guest_address(state)
@@ -53,6 +57,18 @@ module Kitchen
         state[:hostname]
       end
 
+      def fqdn
+        state = state_file
+        begin
+          [:username, :password].each do |prop|
+            state[prop] = instance.driver[prop] if instance.driver[prop]
+          end
+          Finder.for_transport(instance.transport, state).find_fqdn
+        rescue
+          nil
+        end
+      end
+
       def chef_environment
         env = '_default'
         if config[:client_rb] && config[:client_rb][:environment]
@@ -67,7 +83,8 @@ module Kitchen
           chef_environment: chef_environment,
           automatic: {
             ipaddress: ipaddress,
-            platform: instance.platform.name.split('-')[0].downcase
+            platform: instance.platform.name.split('-')[0].downcase,
+            fqdn: fqdn
           },
           normal: config[:attributes],
           run_list: config[:run_list]
@@ -94,7 +111,7 @@ module Kitchen
         [:username, :password].each do |prop|
           state[prop] = instance.driver[prop] if instance.driver[prop]
         end
-        ips = IpFinder.for_transport(transport, state).find_ips
+        ips = Finder.for_transport(transport, state).find_ips
         fail 'Unable to retrieve IPs' if ips.empty?
         ips
       end

data/lib/kitchen/provisioner/nodes_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   # Version string for Nodes Kitchen driver
   module Provisioner
-    NODES_VERSION = '0.4.1'
+    NODES_VERSION = '0.5.0'
   end
 end

data/spec/unit/nodes_spec.rb

@@ -27,7 +27,7 @@ describe Kitchen::Provisioner::Nodes do
       driver: Kitchen::Driver::Dummy.new
     )
   end
-  let(:transport) { Kitchen::Transport::Dummy.new }
+  let(:transport) { Kitchen::Transport::Ssh.new }
   let(:platform) { double('platform', os_type: nil, name: 'ubuntu') }
   let(:suite) { double('suite', name: 'suite') }
   let(:state) { { hostname: '192.168.1.10' } }
@@ -38,6 +38,11 @@ describe Kitchen::Provisioner::Nodes do
     FileUtils.mkdir_p(config[:test_base_path])
     allow_any_instance_of(Kitchen::StateFile)
       .to receive(:read).and_return(state)
+    allow(transport).to receive(:connection)
+      .and_return(Kitchen::Transport::Base::Connection.new)
+    allow_any_instance_of(Kitchen::Transport::Base::Connection)
+      .to receive(:node_execute).with('hostname -f')
+      .and_return('fakehostname')
   end
   after do
     FakeFS.deactivate!
@@ -82,6 +87,25 @@ describe Kitchen::Provisioner::Nodes do
     expect(node[:automatic][:ipaddress]).to eq state[:hostname]
   end
 
+  it 'sets the fqdn' do
+    subject.create_node
+
+    expect(node[:automatic][:fqdn]).to eq 'fakehostname'
+  end
+
+  context 'cannot obtain fqdn' do
+    before do
+      allow_any_instance_of(Kitchen::Transport::Base::Connection)
+        .to receive(:node_execute).with('hostname -f')
+        .and_raise(Kitchen::Transport::TransportFailed.new(''))
+    end
+
+    it 'sets the fqdn to nil' do
+      subject.create_node
+      expect(node[:automatic][:fqdn]).to be_nil
+    end
+  end
+
   context 'no environment explicitly set' do
     before { config.delete(:client_rb) }
 
@@ -99,8 +123,6 @@ describe Kitchen::Provisioner::Nodes do
     before do
       allow_any_instance_of(Net::Ping::External).to receive(:ping)
         .and_return(true)
-      allow(transport).to receive(:connection)
-        .and_return(Kitchen::Transport::Base::Connection.new)
     end
 
     context 'cannot find an ip' do

data/test/integration/cookbooks/node-tests/libraries/helper.rb

@@ -0,0 +1,18 @@
+require 'timeout'
+
+def search_for_nodes(query, timeout = 120)
+  nodes = []
+  Timeout.timeout(timeout) do
+    nodes = search(:node, query)
+    until nodes.count > 0 && nodes[0].key?('ipaddress')
+      sleep 5
+      nodes = search(:node, query)
+    end
+  end
+
+  if nodes.count == 0 || !nodes[0].key?('ipaddress')
+    fail "Unable to find any nodes meeting the search criteria '#{query}'!"
+  end
+
+  nodes
+end

data/test/integration/cookbooks/node-tests/metadata.rb

@@ -0,0 +1,4 @@
+name 'node-tests'
+version '0.1.0'
+maintainer ''
+maintainer_email ''

data/test/integration/cookbooks/node-tests/recipes/node2.rb

@@ -0,0 +1,9 @@
+first_node = search_for_nodes(
+  "run_list:*node1* AND platform:#{node['platform']}")
+
+ruby_block 'Save first attributes' do
+  block do
+    parent = File.join(ENV['TEMP'] || '/tmp', 'kitchen')
+    IO.write(File.join(parent, 'other_node.json'), first_node[0].to_json)
+  end
+end

data/test/integration/node2/serverspec/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'winrm' if RUBY_PLATFORM =~ /mingw/

data/test/integration/node2/serverspec/default_spec.rb

@@ -0,0 +1,64 @@
+require 'serverspec'
+require 'json'
+
+if RUBY_PLATFORM =~ /mingw/
+  set :backend, :cmd
+  set :os, family: 'windows'
+else
+  set :backend, :exec
+end
+
+describe 'other node' do
+  let(:node) do
+    JSON.parse(
+      IO.read(File.join(ENV['TEMP'] || '/tmp', 'kitchen/other_node.json'))
+    )
+  end
+  let(:ip) { node['automatic']['ipaddress'] }
+  let(:fqdn) { node['automatic']['fqdn'] }
+  let(:connection) do
+    if RUBY_PLATFORM =~ /mingw/
+      require 'winrm'
+      ::WinRM::WinRMWebService.new(
+        "http://#{ip}:5985/wsman",
+        :plaintext,
+        user: 'vagrant',
+        pass: 'vagrant',
+        basic_auth_only: true
+      )
+    else
+      Net::SSH.start(
+        ip,
+        'vagrant',
+        password: 'vagrant',
+        paranoid: false
+      )
+    end
+  end
+
+  it 'has an non localhost ip' do
+    expect(ip).not_to eq('127.0.0.1')
+  end
+
+  describe command('hostname') do
+    its(:stdout) { should_not match(/#{Regexp.quote(fqdn)}/) }
+  end
+
+  if RUBY_PLATFORM =~ /mingw/
+    it 'has a computername matching node fqdn' do
+      expect(connection.run_cmd('hostname').stdout.chomp).to eq(fqdn)
+    end
+  else
+    it 'has a computername matching node fqdn' do
+      connection.open_channel do |channel|
+        channel.request_pty
+        channel.exec('hostname') do |_ch, _success|
+          channel.on_data do |_ch, data|
+            expect(data.chomp).to eq(fqdn)
+          end
+        end
+      end
+      connection.loop
+    end
+  end
+end

data/test/integration/nodes/node1-ubuntu-1204.json

@@ -0,0 +1,22 @@
+{
+  "id": "node1-ubuntu-1204",
+  "chef_environment": "_default",
+  "automatic": {
+    "ipaddress": "192.168.1.147",
+    "platform": "ubuntu",
+    "fqdn": "node1-ubuntu-1204"
+  },
+  "normal": {
+    "consul": {
+      "config": {
+        "bootstrap_expect": 2,
+        "server": true
+      }
+    }
+  },
+  "run_list": [
+    "recipe[apt]",
+    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
+    "recipe[node-tests::node1]"
+  ]
+}

data/test/integration/nodes/node1-windows-2012R2.json

@@ -0,0 +1,21 @@
+{
+  "id": "node1-windows-2012R2",
+  "chef_environment": "_default",
+  "automatic": {
+    "ipaddress": "192.168.1.149",
+    "platform": "windows",
+    "fqdn": "WIN-HKCPKCREPB8"
+  },
+  "normal": {
+    "consul": {
+      "config": {
+        "bootstrap_expect": 2,
+        "server": true
+      }
+    }
+  },
+  "run_list": [
+    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
+    "recipe[node-tests::node1]"
+  ]
+}

data/test/integration/nodes/node2-ubuntu-1204.json

@@ -0,0 +1,22 @@
+{
+  "id": "node2-ubuntu-1204",
+  "chef_environment": "_default",
+  "automatic": {
+    "ipaddress": "192.168.1.148",
+    "platform": "ubuntu",
+    "fqdn": "node2-ubuntu-1204"
+  },
+  "normal": {
+    "consul": {
+      "config": {
+        "bootstrap_expect": 2,
+        "server": true
+      }
+    }
+  },
+  "run_list": [
+    "recipe[apt]",
+    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
+    "recipe[node-tests::node2]"
+  ]
+}

data/test/integration/nodes/node2-windows-2012R2.json

@@ -0,0 +1,21 @@
+{
+  "id": "node2-windows-2012R2",
+  "chef_environment": "_default",
+  "automatic": {
+    "ipaddress": "192.168.1.150",
+    "platform": "windows",
+    "fqdn": "WIN-70EEPS83GN7"
+  },
+  "normal": {
+    "consul": {
+      "config": {
+        "bootstrap_expect": 2,
+        "server": true
+      }
+    }
+  },
+  "run_list": [
+    "recipe[hurry-up-and-test::set_non_nat_vbox_ip]",
+    "recipe[node-tests::node2]"
+  ]
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-nodes
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Matt Wrock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ping
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.29'
+        version: '0.34'
 description: A Test Kitchen Provisioner for Chef Nodes
 email:
 - matt@mattwrock.com
@@ -130,22 +130,34 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".kitchen.yml"
 - ".rubocop.yml"
 - ".travis.yml"
-- CHANGELOG.md
+- Berksfile
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - kitchen-nodes.gemspec
-- lib/kitchen/provisioner/ip_finder.rb
-- lib/kitchen/provisioner/ip_finder/ssh.rb
-- lib/kitchen/provisioner/ip_finder/winrm.rb
+- lib/kitchen/provisioner/finder.rb
+- lib/kitchen/provisioner/finder/ssh.rb
+- lib/kitchen/provisioner/finder/winrm.rb
 - lib/kitchen/provisioner/nodes.rb
 - lib/kitchen/provisioner/nodes_version.rb
 - spec/unit/nodes_spec.rb
 - spec/unit/stubs/ifconfig.txt
 - spec/unit/stubs/ip.txt
+- test/integration/cookbooks/node-tests/libraries/helper.rb
+- test/integration/cookbooks/node-tests/metadata.rb
+- test/integration/cookbooks/node-tests/recipes/node1.rb
+- test/integration/cookbooks/node-tests/recipes/node2.rb
+- test/integration/node1/serverspec/default_spec.rb
+- test/integration/node2/serverspec/Gemfile
+- test/integration/node2/serverspec/default_spec.rb
+- test/integration/nodes/node1-ubuntu-1204.json
+- test/integration/nodes/node1-windows-2012R2.json
+- test/integration/nodes/node2-ubuntu-1204.json
+- test/integration/nodes/node2-windows-2012R2.json
 homepage: ''
 licenses:
 - Apache 2.0
@@ -166,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Provisioner for Chef Nodes
@@ -174,4 +186,15 @@ test_files:
 - spec/unit/nodes_spec.rb
 - spec/unit/stubs/ifconfig.txt
 - spec/unit/stubs/ip.txt
+- test/integration/cookbooks/node-tests/libraries/helper.rb
+- test/integration/cookbooks/node-tests/metadata.rb
+- test/integration/cookbooks/node-tests/recipes/node1.rb
+- test/integration/cookbooks/node-tests/recipes/node2.rb
+- test/integration/node1/serverspec/default_spec.rb
+- test/integration/node2/serverspec/Gemfile
+- test/integration/node2/serverspec/default_spec.rb
+- test/integration/nodes/node1-ubuntu-1204.json
+- test/integration/nodes/node1-windows-2012R2.json
+- test/integration/nodes/node2-ubuntu-1204.json
+- test/integration/nodes/node2-windows-2012R2.json
 has_rdoc: 

data/CHANGELOG.md

@@ -1,3 +0,0 @@
-## 0.1.0 / Unreleased
-
-* Initial release