knife-windows 0.8.2 → 0.8.3.rc.0

data/spec/spec_helper.rb

@@ -1,61 +1,61 @@
-
-# Author:: Adam Edwards (<adamed@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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
-#
-# 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.
-#
-
-def windows?
-  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
-end
-
-require_relative '../lib/chef/knife/core/windows_bootstrap_context'
-require_relative '../lib/chef/knife/bootstrap_windows_winrm'
-
-if windows?
-  require 'ruby-wmi'
-end
-
-def windows2012?
-  is_win2k12 = false
-  
-  if  windows?
-    this_operating_system = WMI::Win32_OperatingSystem.find(:first)
-    os_version = this_operating_system.send('Version')
-
-    # The operating system version is a string in the following form
-    # that can be split into components based on the '.' delimiter:
-    # MajorVersionNumber.MinorVersionNumber.BuildNumber
-    os_version_components = os_version.split('.')
-
-    if os_version_components.length < 2
-      raise 'WMI returned a Windows version from Win32_OperatingSystem.Version ' +
-        'with an unexpected format. The Windows version could not be determined.'
-    end
-
-    # Windows 6.2 is Windows Server 2012, so test the major and
-    # minor version components
-    is_win2k12 = os_version_components[0] == '6' && os_version_components[1] == '2'
-  end
-
-  is_win2k12
-end
-
-
-RSpec.configure do |config|
-  config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :windows_2012_only => true unless windows2012?
-end
-
+
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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
+#
+# 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.
+#
+
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
+require_relative '../lib/chef/knife/core/windows_bootstrap_context'
+require_relative '../lib/chef/knife/bootstrap_windows_winrm'
+
+if windows?
+  require 'ruby-wmi'
+end
+
+def windows2012?
+  is_win2k12 = false
+  
+  if  windows?
+    this_operating_system = WMI::Win32_OperatingSystem.find(:first)
+    os_version = this_operating_system.send('Version')
+
+    # The operating system version is a string in the following form
+    # that can be split into components based on the '.' delimiter:
+    # MajorVersionNumber.MinorVersionNumber.BuildNumber
+    os_version_components = os_version.split('.')
+
+    if os_version_components.length < 2
+      raise 'WMI returned a Windows version from Win32_OperatingSystem.Version ' +
+        'with an unexpected format. The Windows version could not be determined.'
+    end
+
+    # Windows 6.2 is Windows Server 2012, so test the major and
+    # minor version components
+    is_win2k12 = os_version_components[0] == '6' && os_version_components[1] == '2'
+  end
+
+  is_win2k12
+end
+
+
+RSpec.configure do |config|
+  config.filter_run_excluding :windows_only => true unless windows?
+  config.filter_run_excluding :windows_2012_only => true unless windows2012?
+end
+

data/spec/unit/knife/bootstrap_template_spec.rb

@@ -1,91 +1,91 @@
-#
-# Author:: Chirag Jog (<chirag@clogeny.com>)
-# Copyright:: Copyright (c) 2013 Chirag Jog
-# License:: Apache License, Version 2.0
-#
-# 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
-#
-# 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.
-
-
-TEMPLATE_FILE = File.expand_path(File.dirname(__FILE__)) + "/../../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
-
-require 'spec_helper'
-
-describe "While Windows Bootstrapping" do
-  context "the default Windows bootstrapping template" do
-    bootstrap = Chef::Knife::BootstrapWindowsWinrm.new
-    bootstrap.config[:template_file] = TEMPLATE_FILE
-
-    template = bootstrap.load_template
-    template_file_lines = template.split('\n')
-    it "should download Platform specific MSI" do
-      download_url=template_file_lines.find {|l| l.include?("url=")}
-      download_url.include?("%MACHINE_OS%") && download_url.include?("%MACHINE_ARCH%")
-    end
-    it "should download specific version of MSI if supplied" do
-      download_url_ext= template_file_lines.find {|l| l.include?("url +=")}
-      download_url_ext.include?("[:bootstrap_version]")
-    end
-  end
-end
-
-describe Chef::Knife::BootstrapWindowsWinrm do
-  before(:all) do
-    @original_config = Chef::Config.hash_dup
-    @original_knife_config = Chef::Config[:knife].dup
-  end
-
-  after(:all) do
-    Chef::Config.configuration = @original_config
-    Chef::Config[:knife] = @original_knife_config
-  end
-
-  before(:each) do
-    Chef::Log.logger = Logger.new(StringIO.new)
-    @knife = Chef::Knife::BootstrapWindowsWinrm.new
-    # Merge default settings in.
-    @knife.merge_configs
-    @knife.config[:template_file] = TEMPLATE_FILE
-    @stdout = StringIO.new
-    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
-    @stderr = StringIO.new
-    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
-  end
-
-  describe "specifying no_proxy with various entries" do
-    subject(:knife) { described_class.new }
-    let(:options){ ["--bootstrap-proxy", "", "--bootstrap-no-proxy", setting] }
-    let(:template_file) { TEMPLATE_FILE }
-    let(:rendered_template) do
-      knife.instance_variable_set("@template_file", template_file)
-      knife.parse_options(options)
-      # Avoid referencing a validation keyfile we won't find during #render_template
-      template_string = knife.read_template.gsub(/^.*[Vv]alidation_key.*$/, '')
-      knife.render_template(template_string)
-    end
-
-    context "via --bootstrap-no-proxy" do
-      let(:setting) { "api.opscode.com" }
-
-      it "renders the client.rb with a single FQDN no_proxy entry" do
-        expect(rendered_template).to match(%r{.*no_proxy\s*\"api.opscode.com\".*})
-      end
-    end
-    context "via --bootstrap-no-proxy multiple" do
-      let(:setting) { "api.opscode.com,172.16.10.*" }
-
-      it "renders the client.rb with comma-separated FQDN and wildcard IP address no_proxy entries" do
-        expect(rendered_template).to match(%r{.*no_proxy\s*"api.opscode.com,172.16.10.\*".*})
-      end
-    end
-  end
-end
+#
+# Author:: Chirag Jog (<chirag@clogeny.com>)
+# Copyright:: Copyright (c) 2013 Chirag Jog
+# License:: Apache License, Version 2.0
+#
+# 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
+#
+# 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.
+
+
+TEMPLATE_FILE = File.expand_path(File.dirname(__FILE__)) + "/../../../lib/chef/knife/bootstrap/windows-chef-client-msi.erb"
+
+require 'spec_helper'
+
+describe "While Windows Bootstrapping" do
+  context "the default Windows bootstrapping template" do
+    bootstrap = Chef::Knife::BootstrapWindowsWinrm.new
+    bootstrap.config[:template_file] = TEMPLATE_FILE
+
+    template = bootstrap.load_template
+    template_file_lines = template.split('\n')
+    it "should download Platform specific MSI" do
+      download_url=template_file_lines.find {|l| l.include?("url=")}
+      download_url.include?("%MACHINE_OS%") && download_url.include?("%MACHINE_ARCH%")
+    end
+    it "should download specific version of MSI if supplied" do
+      download_url_ext= template_file_lines.find {|l| l.include?("url +=")}
+      download_url_ext.include?("[:bootstrap_version]")
+    end
+  end
+end
+
+describe Chef::Knife::BootstrapWindowsWinrm do
+  before(:all) do
+    @original_config = Chef::Config.hash_dup
+    @original_knife_config = Chef::Config[:knife].dup
+  end
+
+  after(:all) do
+    Chef::Config.configuration = @original_config
+    Chef::Config[:knife] = @original_knife_config
+  end
+
+  before(:each) do
+    Chef::Log.logger = Logger.new(StringIO.new)
+    @knife = Chef::Knife::BootstrapWindowsWinrm.new
+    # Merge default settings in.
+    @knife.merge_configs
+    @knife.config[:template_file] = TEMPLATE_FILE
+    @stdout = StringIO.new
+    allow(@knife.ui).to receive(:stdout).and_return(@stdout)
+    @stderr = StringIO.new
+    allow(@knife.ui).to receive(:stderr).and_return(@stderr)
+  end
+
+  describe "specifying no_proxy with various entries" do
+    subject(:knife) { described_class.new }
+    let(:options){ ["--bootstrap-proxy", "", "--bootstrap-no-proxy", setting] }
+    let(:template_file) { TEMPLATE_FILE }
+    let(:rendered_template) do
+      knife.instance_variable_set("@template_file", template_file)
+      knife.parse_options(options)
+      # Avoid referencing a validation keyfile we won't find during #render_template
+      template_string = knife.read_template.gsub(/^.*[Vv]alidation_key.*$/, '')
+      knife.render_template(template_string)
+    end
+
+    context "via --bootstrap-no-proxy" do
+      let(:setting) { "api.opscode.com" }
+
+      it "renders the client.rb with a single FQDN no_proxy entry" do
+        expect(rendered_template).to match(%r{.*no_proxy\s*\"api.opscode.com\".*})
+      end
+    end
+    context "via --bootstrap-no-proxy multiple" do
+      let(:setting) { "api.opscode.com,172.16.10.*" }
+
+      it "renders the client.rb with comma-separated FQDN and wildcard IP address no_proxy entries" do
+        expect(rendered_template).to match(%r{.*no_proxy\s*"api.opscode.com,172.16.10.\*".*})
+      end
+    end
+  end
+end

data/spec/unit/knife/bootstrap_windows_winrm_spec.rb

@@ -1,106 +1,106 @@
-#
-# Author:: Adam Edwards(<adamed@getchef.com>)
-# Copyright:: Copyright (c) 2014 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# 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
-#
-# 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.
-#
-
-require 'spec_helper'
-
-
-describe Chef::Knife::BootstrapWindowsWinrm do
-  before(:all) do
-    Chef::Config.reset
-  end
-
-  before do
-    #    Kernel.stub(:sleep).and_return 10
-    allow(bootstrap).to receive(:sleep).and_return(10)
-  end
-
-  after do
-    #    Kernel.unstub(:sleep)
-    allow(bootstrap).to receive(:sleep).and_return(10)
-  end
-
-  let (:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new(['winrm', '-d', 'windows-chef-client-msi',  '-x', 'Administrator', 'localhost']) }
-
-  let(:initial_fail_count) { 4 }  
-  it 'should retry if a 401 is received from WinRM' do
-    call_result_sequence = Array.new(initial_fail_count) {lambda {raise WinRM::WinRMHTTPTransportError, '401'}}
-    call_result_sequence.push(0)
-    allow(bootstrap).to receive(:run_command).and_return(*call_result_sequence)
-
-    expect(bootstrap).to receive(:run_command).exactly(call_result_sequence.length).times
-    bootstrap.send(:wait_for_remote_response, 2)
-  end
-
-  it 'should retry if something other than a 401 is received from WinRM' do
-    call_result_sequence = Array.new(initial_fail_count) {lambda {raise WinRM::WinRMHTTPTransportError, '500'}}
-    call_result_sequence.push(0)
-    allow(bootstrap).to receive(:run_command).and_return(*call_result_sequence)
-
-    expect(bootstrap).to receive(:run_command).exactly(call_result_sequence.length).times
-    bootstrap.send(:wait_for_remote_response, 2)
-  end
-
-  it 'should have a wait timeout of 2 minutes by default' do
-    allow(bootstrap).to receive(:run_command).and_raise(WinRM::WinRMHTTPTransportError)
-    allow(bootstrap).to receive(:create_bootstrap_bat_command).and_raise(SystemExit)
-    expect(bootstrap).to receive(:wait_for_remote_response).with(2)
-    allow(bootstrap).to receive(:validate_name_args!).and_return(nil)
-    bootstrap.config[:auth_timeout] = bootstrap.options[:auth_timeout][:default]
-    expect { bootstrap.bootstrap }.to raise_error(SystemExit)
-  end
-
-  it 'should keep retrying at 10s intervals if the timeout in minutes has not elapsed' do
-    call_result_sequence = Array.new(initial_fail_count) {lambda {raise WinRM::WinRMHTTPTransportError, '500'}}
-    call_result_sequence.push(0)
-    allow(bootstrap).to receive(:run_command).and_return(*call_result_sequence)
-
-    expect(bootstrap).to receive(:run_command).exactly(call_result_sequence.length).times
-    bootstrap.send(:wait_for_remote_response, 2)
-  end
-
-  it "should exit bootstrap with non-zero status if the bootstrap fails" do
-    command_status = 1
-
-    #Stub out calls to create the session and just get the exit codes back
-    winrm_mock = Chef::Knife::Winrm.new
-    allow(Chef::Knife::Winrm).to receive(:new).and_return(winrm_mock)
-    allow(winrm_mock).to receive(:configure_session)
-    allow(winrm_mock).to receive(:winrm_command)
-    session_mock = EventMachine::WinRM::Session.new
-    allow(EventMachine::WinRM::Session).to receive(:new).and_return(session_mock)
-    allow(session_mock).to receive(:exit_codes).and_return({"thishost" => command_status})
-   
-    #Skip over templating stuff and checking with the remote end
-    allow(bootstrap).to receive(:create_bootstrap_bat_command)
-    allow(bootstrap).to receive(:wait_for_remote_response)
-    
-    expect { bootstrap.run_with_pretty_exceptions }.to raise_error(SystemExit) { |e| expect(e.status).to eq(command_status) }
-  end
-
-
-  it 'should stop retrying if more than 2 minutes has elapsed' do
-    times = [ Time.new(2014, 4, 1, 22, 25), Time.new(2014, 4, 1, 22, 51), Time.new(2014, 4, 1, 22, 28) ]
-    allow(Time).to receive(:now).and_return(*times)
-    run_command_result = lambda {raise WinRM::WinRMHTTPTransportError, '401'}
-    allow(bootstrap).to receive(:validate_name_args!).and_return(nil)
-    allow(bootstrap).to receive(:run_command).and_return(run_command_result)
-    expect(bootstrap).to receive(:run_command).exactly(1).times
-    bootstrap.config[:auth_timeout] = bootstrap.options[:auth_timeout][:default]    
-    expect { bootstrap.bootstrap }.to raise_error RuntimeError
-  end
-end
+#
+# Author:: Adam Edwards(<adamed@getchef.com>)
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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
+#
+# 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.
+#
+
+require 'spec_helper'
+
+
+describe Chef::Knife::BootstrapWindowsWinrm do
+  before(:all) do
+    Chef::Config.reset
+  end
+
+  before do
+    #    Kernel.stub(:sleep).and_return 10
+    allow(bootstrap).to receive(:sleep).and_return(10)
+  end
+
+  after do
+    #    Kernel.unstub(:sleep)
+    allow(bootstrap).to receive(:sleep).and_return(10)
+  end
+
+  let (:bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new(['winrm', '-d', 'windows-chef-client-msi',  '-x', 'Administrator', 'localhost']) }
+
+  let(:initial_fail_count) { 4 }  
+  it 'should retry if a 401 is received from WinRM' do
+    call_result_sequence = Array.new(initial_fail_count) {lambda {raise WinRM::WinRMHTTPTransportError, '401'}}
+    call_result_sequence.push(0)
+    allow(bootstrap).to receive(:run_command).and_return(*call_result_sequence)
+
+    expect(bootstrap).to receive(:run_command).exactly(call_result_sequence.length).times
+    bootstrap.send(:wait_for_remote_response, 2)
+  end
+
+  it 'should retry if something other than a 401 is received from WinRM' do
+    call_result_sequence = Array.new(initial_fail_count) {lambda {raise WinRM::WinRMHTTPTransportError, '500'}}
+    call_result_sequence.push(0)
+    allow(bootstrap).to receive(:run_command).and_return(*call_result_sequence)
+
+    expect(bootstrap).to receive(:run_command).exactly(call_result_sequence.length).times
+    bootstrap.send(:wait_for_remote_response, 2)
+  end
+
+  it 'should have a wait timeout of 2 minutes by default' do
+    allow(bootstrap).to receive(:run_command).and_raise(WinRM::WinRMHTTPTransportError)
+    allow(bootstrap).to receive(:create_bootstrap_bat_command).and_raise(SystemExit)
+    expect(bootstrap).to receive(:wait_for_remote_response).with(2)
+    allow(bootstrap).to receive(:validate_name_args!).and_return(nil)
+    bootstrap.config[:auth_timeout] = bootstrap.options[:auth_timeout][:default]
+    expect { bootstrap.bootstrap }.to raise_error(SystemExit)
+  end
+
+  it 'should keep retrying at 10s intervals if the timeout in minutes has not elapsed' do
+    call_result_sequence = Array.new(initial_fail_count) {lambda {raise WinRM::WinRMHTTPTransportError, '500'}}
+    call_result_sequence.push(0)
+    allow(bootstrap).to receive(:run_command).and_return(*call_result_sequence)
+
+    expect(bootstrap).to receive(:run_command).exactly(call_result_sequence.length).times
+    bootstrap.send(:wait_for_remote_response, 2)
+  end
+
+  it "should exit bootstrap with non-zero status if the bootstrap fails" do
+    command_status = 1
+
+    #Stub out calls to create the session and just get the exit codes back
+    winrm_mock = Chef::Knife::Winrm.new
+    allow(Chef::Knife::Winrm).to receive(:new).and_return(winrm_mock)
+    allow(winrm_mock).to receive(:configure_session)
+    allow(winrm_mock).to receive(:winrm_command)
+    session_mock = EventMachine::WinRM::Session.new
+    allow(EventMachine::WinRM::Session).to receive(:new).and_return(session_mock)
+    allow(session_mock).to receive(:exit_codes).and_return({"thishost" => command_status})
+   
+    #Skip over templating stuff and checking with the remote end
+    allow(bootstrap).to receive(:create_bootstrap_bat_command)
+    allow(bootstrap).to receive(:wait_for_remote_response)
+    
+    expect { bootstrap.run_with_pretty_exceptions }.to raise_error(SystemExit) { |e| expect(e.status).to eq(command_status) }
+  end
+
+
+  it 'should stop retrying if more than 2 minutes has elapsed' do
+    times = [ Time.new(2014, 4, 1, 22, 25), Time.new(2014, 4, 1, 22, 51), Time.new(2014, 4, 1, 22, 28) ]
+    allow(Time).to receive(:now).and_return(*times)
+    run_command_result = lambda {raise WinRM::WinRMHTTPTransportError, '401'}
+    allow(bootstrap).to receive(:validate_name_args!).and_return(nil)
+    allow(bootstrap).to receive(:run_command).and_return(run_command_result)
+    expect(bootstrap).to receive(:run_command).exactly(1).times
+    bootstrap.config[:auth_timeout] = bootstrap.options[:auth_timeout][:default]    
+    expect { bootstrap.bootstrap }.to raise_error RuntimeError
+  end
+end