kitchen-policyfile-nodes 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd3001fe7b97d7e286bf216736e46e7a2e154e26
-  data.tar.gz: 0ad6b3d0d2f563dbdb9843479ff72db3703f0b36
+  metadata.gz: 60713a800964889583b52f98ead21b7d8784d003
+  data.tar.gz: f7e703225d95591709017977c71331c189409b5b
 SHA512:
-  metadata.gz: 92a9977dc49c2c681293a0fbff203d5ace3cc9c9f62d5051d01e31e2713d3f01f34e31f30ff7414501ddd9f2da42ea64123013b0c8fbfa17285b28740872aecb
-  data.tar.gz: a752e3cf02a01bacc1db2423db52b94758677b56b1750bfd76f88f73abb432bebef11a7c93d2bbf05c171b24d35b503b0f89b5e4749c1421e63fdf7cc1e94c83
+  metadata.gz: f7a53f6008d89425ac7a23060cba77b58b18664e86428616dfc3d9987d3779349632e02aec45c40348751a8f456a585dd49002203314609ba6c375e2e6bfc4e8
+  data.tar.gz: 35a1260f626f4f80894c3a42e109fd16a582396a220702a71d1776c15af94c2a5082a05d75a4dff51543ac82b3812faef83110130d6e418db532b09d38b4939c

data/.kitchen.yml

@@ -12,15 +12,34 @@ platforms:
     driver:
       box: bento/centos-6.7
 
+  - name: win2012R2
+    driver:
+      box: win-2012r2-base
+      customize:
+        memsize: 2048
+        cpus: 2
+
 suites:
   - name: sftp
     transport:
       name: sftp
     provisioner:
       named_run_list: sftp
+    excludes:
+      - win2012R2
+
+  - name: winrm
+    transport:
+      name: winrm
+    provisioner:
+      named_run_list: win
+    excludes:
+      - el6
 
   - name: ssh
     transport:
       name: ssh
     provisioner:
       named_run_list: ssh
+    excludes:
+      - win2012R2

data/README.md

@@ -1,15 +1,21 @@
 # Kitchen::PolicyfileNodes
 
 Provisioner `policyfile_nodes` extends `policyfile_zero` by adding one more step in the end of converge - it downloads the resulted node
-JSON object to the `nodes_path` on the host machine after successful converge over SSH. It allows you to use this node object for searches while converging another
-Test Kitchen suites. So, you can use actual node IP addresses to communicate nodes with each other.
+JSON object to the `nodes_path` on the host machine after successful converge. It allows you to use this node object for searches while converging another
+Test Kitchen suites. So, you can use actual node attributes like ipaddress/fqdn to communicate nodes with each other.
 
 For example, 'web' node need to search 'db' node ip.
 In `policyfile_zero` we have to create mock in node_path for this search. `policyfile_nodes` will create mock automatically.
 
 ## Requirements
 
-* ChefDK 0.10.0+
+* ChefDK 0.12.0+
+* Test Kitchen 1.7.3+
+
+## Supports
+
+* Linux
+* Windows 2012 RC2
 
 ## Installation
 

data/kitchen-policyfile-nodes.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.5'
-  spec.add_dependency 'chef-dk', '~> 0.10'
+  spec.add_dependency 'test-kitchen', '~> 1.7.3'
+  spec.add_dependency 'chef-dk', '~> 0.12'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'

data/lib/kitchen/provisioner/policyfile_nodes.rb

@@ -20,6 +20,7 @@ require 'kitchen/provisioner/policyfile_zero'
 require 'kitchen/provisioner/base'
 require 'kitchen/driver/ssh_base'
 require 'kitchen/transport/ssh'
+require 'kitchen/transport/winrm'
 
 # continue loading if kitchen-sync not installed
 begin
@@ -50,9 +51,9 @@ module Kitchen
           conn.execute(env_cmd(provisioner.prepare_command))
           conn.execute(env_cmd(provisioner.run_command))
           # Download node json object generated by chef_client
-          info("Transferring #{provisioner.int_node_file} " \
+          info("Transferring #{provisioner.unix_int_node_file} " \
                "from instance to #{provisioner.ext_node_file}")
-          conn.execute(env_cmd(conn.download(provisioner.int_node_file,
+          conn.execute(env_cmd(conn.download(provisioner.unix_int_node_file,
                                              provisioner.ext_node_file)))
           debug('Transfer complete')
         end
@@ -86,6 +87,29 @@ module Kitchen
   end
 end
 
+module Kitchen
+  module Transport
+    class Winrm
+      class Connection
+        # Download JSON node file from instance to
+        # node_path over Winrm
+        #
+        # @param remote [String] file path on instance
+        # @param local [String] file path on host
+        # TODO need to fix scheme
+        def download(remote, local)
+          FileUtils.mkdir_p(File.dirname(local))
+          file_manager ||= WinRM::FS::FileManager.new(service)
+          file_manager.download(remote, local)
+          logger.debug("Downloaded #{remote} to #{local}")
+        rescue Kitchen::Transport::WinrmFailed => ex
+          raise WinrmFailed, "Winrm download failed (#{ex.message})"
+        end
+      end
+    end
+  end
+end
+
 module Kitchen
   module Provisioner
     class Base
@@ -108,6 +132,7 @@ module Kitchen
           conn.execute(prepare_command)
           conn.execute(run_command)
           # Download node json object generated by chef_client
+          int_node_file = windows_os? ? win_int_node_file : unix_int_node_file
           info("Transferring #{int_node_file} " \
                "from instance to #{ext_node_file}")
           conn.download(int_node_file, ext_node_file)
@@ -138,9 +163,13 @@ module Kitchen
         File.join(config[:nodes_path], "#{instance.name}.json")
       end
 
-      def int_node_file
+      def unix_int_node_file
         File.join(config[:root_path], 'nodes', "#{instance.name}.json")
       end
+
+      def win_int_node_file
+        File.join(config[:root_path], 'nodes', "#{instance.name}.json").tr('/', '\\')
+      end
     end
   end
 end

data/lib/kitchen/provisioner/policyfile_nodes_version.rb

@@ -19,6 +19,6 @@
 module Kitchen
   # Version string for Policyfile_nodes Kitchen driver
   module Provisioner
-    POLICYFILE_NODES_VERSION = '1.1.0'.freeze
+    POLICYFILE_NODES_VERSION = '1.2.0'.freeze
   end
 end

data/test/integration/cookbooks/test/Policyfile.rb

@@ -1,21 +1,7 @@
-# Policyfile_base - Base file to be evaluated by other Policyfiles
-# Don't use it as a standalone Policyfile, it doesn't work.
-#
-# For more information on the Policyfile feature, visit
-# https://github.com/opscode/chef-dk/blob/master/POLICYFILE_README.md
-
-# A name that describes what the system you're building with Chef does.
 name 'test'
-
-# Where to find external cookbooks:
 default_source :supermarket
-
-# Specify a custom source for a single cookbook:
 cookbook 'test', path: './'
-
-# run_list: chef-client will run these recipes in the order specified.
 run_list 'test::default'
-
-# named_run_lists
 named_run_list 'sftp', 'test::default'
+named_run_list 'win', 'test::default'
 named_run_list 'ssh', 'test::search'

data/test/integration/cookbooks/test/recipes/search.rb

@@ -16,11 +16,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-first_node = search(:node, "name:sftp-* AND platform:#{node['platform']}")
+sftp_node = search(:node, "name:sftp-* AND platform:#{node['platform']}")
+ruby_block 'save sftp attributes' do
+  block do
+    parent = File.join(ENV['TEMP'] || '/tmp', 'kitchen')
+    IO.write(File.join(parent, 'sftp.json'), sftp_node[0].to_json)
+  end
+end
 
-ruby_block 'save attributes' do
+win_node = search(:node, 'platform:windows')
+ruby_block 'save win attributes' do
   block do
     parent = File.join(ENV['TEMP'] || '/tmp', 'kitchen')
-    IO.write(File.join(parent, 'sftp.json'), first_node[0].to_json)
+    IO.write(File.join(parent, 'win.json'), win_node[0].to_json)
   end
 end

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

@@ -9,38 +9,28 @@ describe 'sftp node' do
       IO.read(File.join(ENV['TEMP'] || '/tmp', 'kitchen/sftp.json'))
     )
   end
-  let(:ip) { node['automatic']['ipaddress'] }
-  let(:fqdn) { node['automatic']['fqdn'] }
-  let(:connection) do
-    Net::SSH.start(
-      ip,
-      'vagrant',
-      password: 'vagrant',
-      paranoid: false
-    )
+
+  it 'has ip' do
+    expect(node['automatic'].key?('ipaddress')).to eq(true)
   end
 
-  it 'has an non localhost ip' do
-    expect(ip).not_to eq('127.0.0.1')
+  it 'has fqdn' do
+    expect(node['automatic'].key?('fqdn')).to eq(true)
   end
+end
 
-  it 'has a valid ip' do
-    expect(ip).to match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/)
+describe 'win node' do
+  let(:node) do
+    JSON.parse(
+      IO.read(File.join(ENV['TEMP'] || '/tmp', 'kitchen/win.json'))
+    )
   end
 
-  describe command('hostname') do
-    its(:stdout) { should_not match(/#{Regexp.quote(fqdn)}/) }
+  it 'has ip' do
+    expect(node['automatic'].key?('ipaddress')).to eq(true)
   end
 
-  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
+  it 'has fqdn' do
+    expect(node['automatic'].key?('fqdn')).to eq(true)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-policyfile-nodes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrei Skopenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: chef-dk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Test Kitchen provisioner based on policyfile_zero that generates searchable