knife-windows 1.2.0 → 1.2.1

data/spec/spec_helper.rb

@@ -1,93 +1,93 @@
-
-# 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'
-require_relative '../lib/chef/knife/bootstrap_windows_ssh'
-require_relative '../lib/chef/knife/wsman_test'
-
-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
-
-def chef_gte_12?
-  Chef::VERSION.split('.').first.to_i >= 12
-end
-
-def chef_gte_12_5?
-  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.5
-end
-
-def chef_gte_12_6?
-  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.6
-end
-
-def chef_lt_12?
-  Chef::VERSION.split('.').first.to_i < 12
-end
-
-def chef_eq_11?
-  Chef::VERSION.split('.').first.to_i == 11
-end
-
-def sample_data(file_name)
-  file =  File.expand_path(File.dirname("spec/assets/*"))+"/#{file_name}"
-  File.read(file)
-end
-
-RSpec.configure do |config|
-  config.filter_run_excluding :windows_only => true unless windows?
-  config.filter_run_excluding :windows_2012_only => true unless windows2012?
-  config.filter_run_excluding :chef_gte_12_only => true unless chef_gte_12?
-  config.filter_run_excluding :chef_gte_12_5_only => true unless chef_gte_12_5?
-  config.filter_run_excluding :chef_gte_12_6_only => true unless chef_gte_12_6?
-  config.filter_run_excluding :chef_lt_12_5_only => true if chef_gte_12_5?
-  config.filter_run_excluding :chef_lt_12_only => true unless chef_lt_12?
-  config.filter_run_excluding :if_chef_11 => true if chef_eq_11?
-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'
+require_relative '../lib/chef/knife/bootstrap_windows_ssh'
+require_relative '../lib/chef/knife/wsman_test'
+
+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
+
+def chef_gte_12?
+  Chef::VERSION.split('.').first.to_i >= 12
+end
+
+def chef_gte_12_5?
+  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.5
+end
+
+def chef_gte_12_6?
+  Chef::VERSION.split('.')[0..1].join('.').to_f >= 12.6
+end
+
+def chef_lt_12?
+  Chef::VERSION.split('.').first.to_i < 12
+end
+
+def chef_eq_11?
+  Chef::VERSION.split('.').first.to_i == 11
+end
+
+def sample_data(file_name)
+  file =  File.expand_path(File.dirname("spec/assets/*"))+"/#{file_name}"
+  File.read(file)
+end
+
+RSpec.configure do |config|
+  config.filter_run_excluding :windows_only => true unless windows?
+  config.filter_run_excluding :windows_2012_only => true unless windows2012?
+  config.filter_run_excluding :chef_gte_12_only => true unless chef_gte_12?
+  config.filter_run_excluding :chef_gte_12_5_only => true unless chef_gte_12_5?
+  config.filter_run_excluding :chef_gte_12_6_only => true unless chef_gte_12_6?
+  config.filter_run_excluding :chef_lt_12_5_only => true if chef_gte_12_5?
+  config.filter_run_excluding :chef_lt_12_only => true unless chef_lt_12?
+  config.filter_run_excluding :if_chef_11 => true if chef_eq_11?
+end
+

data/spec/unit/knife/bootstrap_options_spec.rb

@@ -1,150 +1,154 @@
-#
-# Author:: Kartik Null Cating-Subramanian(<ksubramanian@chef.io>)
-# Copyright:: Copyright (c) 2015 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::Bootstrap, :chef_gte_12_6_only do
-  before(:all) do
-    Chef::Config.reset
-  end
-
-  let(:bootstrap) { Chef::Knife::Bootstrap.new }
-  let(:win_bootstrap) { nil }
-  let(:opt_map) { {} }
-  let(:ref_ignore) { [] }
-  let(:win_ignore) { [] }
-
-  def compare_property(sym)
-    win_bootstrap.options.each do |win_key, win_val|
-      unless win_ignore.include?(win_key) || opt_map.include?(win_key) then
-        actual = win_val[sym]
-        expected = bootstrap.options[win_key][sym]
-        expect(actual).to eq(expected),
-          "#{win_key} flag's #{sym} property doesn't match
-
-expected: #{expected}
-     got: #{actual}"
-      end
-    end
-  end
-
-  shared_examples 'compare_options' do
-    it 'contains the option flags' do
-      opt_map.default_proc = proc { |map, key| key }
-      filtered_keys = (win_bootstrap.options.keys - win_ignore).map! { |key| opt_map[key] }
-
-      expect(filtered_keys).to match_array(bootstrap.options.keys - ref_ignore)
-    end
-
-    it 'uses the same long-name' do
-      compare_property(:long)
-    end
-
-    it 'uses the same short-name' do
-      compare_property(:short)
-    end
-
-    it 'uses the same description' do
-      compare_property(:description)
-    end
-
-    it 'uses the same default value' do
-      compare_property(:default)
-    end
-  end
-
-  context 'when compared to BootstrapWindowsWinrm' do
-    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new }
-
-    # opt_map: Hash of symbols in windows mapping to symbols in core.  Name checks are
-    #   ignored for these.
-    let(:opt_map) { {
-      :msi_url => :bootstrap_url,
-      :encrypted_data_bag_secret => :secret,
-      :encrypted_data_bag_secret_file => :secret_file,
-      :winrm_user => :ssh_user,
-      :winrm_password => :ssh_password,
-      :winrm_port => :ssh_port,
-      :winrm_ssl_verify_mode => :host_key_verify,
-      :bootstrap_install_command => :bootstrap_install_command,
-    }}
-
-    # ref_ignore: Options in core that are not implemented here.
-    let(:ref_ignore) { [
-      # These are irrelevant to WinRM.
-      :bootstrap_curl_options,
-      :bootstrap_wget_options,
-      :forward_agent,
-      :preserve_home,
-      :ssh_gateway,
-      :use_sudo,
-      :use_sudo_password,
-      :encrypt, # irrelevant during bootstrap
-      :identity_file,
-      :ssh_identity_file,
-    ]}
-
-    # win_ignore: Options in windows that aren't relevant to core.
-    let(:win_ignore) { [
-      :attribute,
-      :auth_timeout,
-      :ca_trust_file,
-      :install_as_service,
-      :kerberos_keytab_file,
-      :kerberos_realm,
-      :kerberos_service,
-      :manual,
-      :session_timeout,
-      :winrm_authentication_protocol,
-      :winrm_transport,
-    ] }
-
-    include_examples 'compare_options'
-  end
-
-  context 'when compared to BootstrapWindowsSsh' do
-    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsSsh.new }
-
-    # opt_map: Hash of symbols in windows mapping to symbols in core.  Name checks are
-    #   ignored for these.
-    let(:opt_map) { {
-      :msi_url => :bootstrap_url,
-      :encrypted_data_bag_secret => :secret,
-      :encrypted_data_bag_secret_file => :secret_file,
-      :bootstrap_install_command => :bootstrap_install_command,
-    }}
-    # ref_ignore: Options in core that are not implemented here.
-    let(:ref_ignore) { [
-      :bootstrap_curl_options,
-      :bootstrap_wget_options,
-      :preserve_home,
-      :use_sudo,
-      :use_sudo_password,
-      :encrypt, # irrelevant during bootstrap
-    ]}
-    # win_ignore: Options in windows that aren't relevant to core.
-    let(:win_ignore) { [
-      :auth_timeout,
-      :install_as_service,
-      :host_key_verification,  # Deprecated - remove this when the flag is removed.
-    ] }
-
-    include_examples 'compare_options'
-  end
-
-end
+#
+# Author:: Kartik Null Cating-Subramanian(<ksubramanian@chef.io>)
+# Copyright:: Copyright (c) 2015 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::Bootstrap, :chef_gte_12_6_only do
+  before(:all) do
+    Chef::Config.reset
+  end
+
+  let(:bootstrap) { Chef::Knife::Bootstrap.new }
+  let(:win_bootstrap) { nil }
+  let(:opt_map) { {} }
+  let(:ref_ignore) { [] }
+  let(:win_ignore) { [] }
+
+  def compare_property(sym)
+    win_bootstrap.options.each do |win_key, win_val|
+      unless win_ignore.include?(win_key) || opt_map.include?(win_key) then
+        actual = win_val[sym]
+        expected = bootstrap.options[win_key][sym]
+        expect(actual).to eq(expected),
+          "#{win_key} flag's #{sym} property doesn't match
+
+expected: #{expected}
+     got: #{actual}"
+      end
+    end
+  end
+
+  shared_examples 'compare_options' do
+    it 'contains the option flags' do
+      opt_map.default_proc = proc { |map, key| key }
+      filtered_keys = (win_bootstrap.options.keys - win_ignore).map! { |key| opt_map[key] }
+
+      expect(filtered_keys).to match_array(bootstrap.options.keys - ref_ignore)
+    end
+
+    it 'uses the same long-name' do
+      compare_property(:long)
+    end
+
+    it 'uses the same short-name' do
+      compare_property(:short)
+    end
+
+    it 'uses the same description' do
+      compare_property(:description)
+    end
+
+    it 'uses the same default value' do
+      compare_property(:default)
+    end
+  end
+
+  context 'when compared to BootstrapWindowsWinrm' do
+    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsWinrm.new }
+
+    # opt_map: Hash of symbols in windows mapping to symbols in core.  Name checks are
+    #   ignored for these.
+    let(:opt_map) { {
+      :msi_url => :bootstrap_url,
+      :encrypted_data_bag_secret => :secret,
+      :encrypted_data_bag_secret_file => :secret_file,
+      :winrm_user => :ssh_user,
+      :winrm_password => :ssh_password,
+      :winrm_port => :ssh_port,
+      :winrm_ssl_verify_mode => :host_key_verify,
+      :bootstrap_install_command => :bootstrap_install_command,
+    }}
+
+    # ref_ignore: Options in core that are not implemented here.
+    let(:ref_ignore) { [
+      # These are irrelevant to WinRM.
+      :bootstrap_curl_options,
+      :bootstrap_wget_options,
+      :forward_agent,
+      :preserve_home,
+      :ssh_gateway,
+      :use_sudo,
+      :use_sudo_password,
+      :encrypt, # irrelevant during bootstrap
+      :identity_file,
+      :ssh_identity_file,
+      :fips, #until chef 12.7 is released
+    ]}
+
+    # win_ignore: Options in windows that aren't relevant to core.
+    let(:win_ignore) { [
+      :attribute,
+      :auth_timeout,
+      :ca_trust_file,
+      :install_as_service,
+      :kerberos_keytab_file,
+      :kerberos_realm,
+      :kerberos_service,
+      :manual,
+      :session_timeout,
+      :winrm_authentication_protocol,
+      :winrm_transport,
+      :fips, #until chef 12.7 is released
+    ] }
+
+    include_examples 'compare_options'
+  end
+
+  context 'when compared to BootstrapWindowsSsh' do
+    let(:win_bootstrap) { Chef::Knife::BootstrapWindowsSsh.new }
+
+    # opt_map: Hash of symbols in windows mapping to symbols in core.  Name checks are
+    #   ignored for these.
+    let(:opt_map) { {
+      :msi_url => :bootstrap_url,
+      :encrypted_data_bag_secret => :secret,
+      :encrypted_data_bag_secret_file => :secret_file,
+      :bootstrap_install_command => :bootstrap_install_command,
+    }}
+    # ref_ignore: Options in core that are not implemented here.
+    let(:ref_ignore) { [
+      :bootstrap_curl_options,
+      :bootstrap_wget_options,
+      :preserve_home,
+      :use_sudo,
+      :use_sudo_password,
+      :encrypt, # irrelevant during bootstrap
+      :fips, #until chef 12.7 is released
+    ]}
+    # win_ignore: Options in windows that aren't relevant to core.
+    let(:win_ignore) { [
+      :auth_timeout,
+      :install_as_service,
+      :host_key_verification,  # Deprecated - remove this when the flag is removed.
+      :fips, #until chef 12.7 is released
+    ] }
+
+    include_examples 'compare_options'
+  end
+
+end