RubyGems - knife-windows - Versions diffs - 4.0.2 → 4.0.5 - Mend

knife-windows 4.0.2 → 4.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml CHANGED

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49d47d86c96375be88a4f739bf617cfbc369ce30680144b638e4612233a3e32d
-  data.tar.gz: cb252caa670a3ec82c9d9aaf3a46c5a00d0ab75c0fd8e4c6ddaab722651e4151
+  metadata.gz: ac2b46b0151ca71c6c81e0d3596d931ae6b0f0d8854d62e042dea80124484eaf
+  data.tar.gz: 62ed4aea58642c7963c7538099e74ca9f37764c951c546eaedf15d544978143b
 SHA512:
-  metadata.gz: b60265f9581770bad24a7147b2846b6c844bc4393326008ab728a1c7b6a4bd38edf23bbe7757e9e6f800a765eda84d9921a7aab3103d3e0af2a44f7646de1753
-  data.tar.gz: dc0e8b6a56491263a303654055e258e7bbe64233ee70babf3c59800d9f89c9a805610f91e297de702f2c0876c674d4cbc43431c693f999a6ae30d50a8f689d16
+  metadata.gz: e4401141da0bd90233bb91fbd73dfab433db23b932cdd344a9c33b65706813a01d907a2cca364a5a9ff792f118cf3590b2c9bb03ffab7c3b9882ee8801a829ae
+  data.tar.gz: 9bc68889c0fede227babb39ffc07858c65299837271bfc980a698d03a6b7d4da04d6a5edc6ba462d6bf7726a347327f5323cbbd820415a108dbdaf684f5f3326

data/lib/chef/knife/windows_cert_generate.rb CHANGED

@@ -27,8 +27,8 @@ class Chef
       banner "knife windows cert generate FILE_PATH (options)"
       deps do
-        require "openssl"
-        require "socket"
+        require "openssl" unless defined?(OpenSSL)
+        require "socket" unless defined?(Socket)
       end
       option :hostname,
@@ -98,7 +98,7 @@ class Chef
         cert.add_extension(ef.create_extension("subjectKeyIdentifier", "hash", false))
         cert.add_extension(ef.create_extension("authorityKeyIdentifier", "keyid:always", false))
         cert.add_extension(ef.create_extension("extendedKeyUsage", "1.3.6.1.5.5.7.3.1", false))
-        cert.sign(rsa_key, OpenSSL::Digest::SHA1.new)
+        cert.sign(rsa_key, OpenSSL::Digest.new("SHA1"))
         @thumbprint = OpenSSL::Digest::SHA1.new(cert.to_der)
         cert
       end

data/lib/chef/knife/windows_listener_create.rb CHANGED

@@ -22,7 +22,7 @@ class Chef
   class Knife
     class WindowsListenerCreate < Knife
       deps do
-        require "openssl"
+        require "openssl" unless defined?(OpenSSL)
       end
       banner "knife windows listener create (options)"

data/lib/knife-windows/version.rb CHANGED

@@ -1,6 +1,6 @@
 module Knife
   module Windows
-    VERSION = "4.0.2".freeze
+    VERSION = "4.0.5".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata CHANGED

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-windows
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.5
 platform: ruby
 authors:
 - Seth Chisamore
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-30 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -93,12 +93,6 @@ files:
 - spec/assets/fake_trusted_certs/github.pem
 - spec/assets/fake_trusted_certs/google.crt
 - spec/assets/win_fake_trusted_cert_script.txt
-- spec/assets/win_template_rendered_with_bootstrap_install_command.txt
-- spec/assets/win_template_rendered_with_bootstrap_install_command_on_13_client.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command_on_13_client.txt
-- spec/assets/win_template_unrendered.txt
 - spec/data/client.d_00/00-foo.rb
 - spec/data/client.d_00/foo/bar.rb
 - spec/data/client.d_01/foo/bar.rb
@@ -139,12 +133,6 @@ test_files:
 - spec/assets/fake_trusted_certs/github.pem
 - spec/assets/fake_trusted_certs/google.crt
 - spec/assets/win_fake_trusted_cert_script.txt
-- spec/assets/win_template_rendered_with_bootstrap_install_command.txt
-- spec/assets/win_template_rendered_with_bootstrap_install_command_on_13_client.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command_on_12_5_client.txt
-- spec/assets/win_template_rendered_without_bootstrap_install_command_on_13_client.txt
-- spec/assets/win_template_unrendered.txt
 - spec/data/client.d_00/00-foo.rb
 - spec/data/client.d_00/foo/bar.rb
 - spec/data/client.d_01/foo/bar.rb

data/spec/assets/win_template_rendered_with_bootstrap_install_command.txt DELETED

@@ -1,220 +0,0 @@
-@rem
-@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
-@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
-@rem License:: Apache License, Version 2.0
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
-@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
-@rem the line is read. See help for the /E switch from cmd.exe /? .
-@setlocal ENABLEDELAYEDEXPANSION
-@set BOOTSTRAP_DIRECTORY=C:\chef
-@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
-@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
-    @echo Existing directory not found, creating.
-    @mkdir %BOOTSTRAP_DIRECTORY%
-) else (
-    @echo Existing directory found, skipping creation.
-)
-> C:\chef\wget.vbs (
- echo.url = WScript.Arguments.Named^("url"^)
-echo.path = WScript.Arguments.Named^("path"^)
-echo.proxy = null
-echo.'* Vaguely attempt to handle file:// scheme urls by url unescaping and switching all
-echo.'* / into .  Also assume that file:/// is a local absolute path and that file://^<foo^>
-echo.'* is possibly a network file path.
-echo.If InStr^(url, "file://"^) = 1 Then
-echo.url = Unescape^(url^)
-echo.If InStr^(url, "file:///"^) = 1 Then
-echo.sourcePath = Mid^(url, Len^("file:///"^) + 1^)
-echo.Else
-echo.sourcePath = Mid^(url, Len^("file:"^) + 1^)
-echo.End If
-echo.sourcePath = Replace^(sourcePath, "/", "\"^)
-echo.
-echo.Set objFSO = CreateObject^("Scripting.FileSystemObject"^)
-echo.If objFSO.Fileexists^(path^) Then objFSO.DeleteFile path
-echo.objFSO.CopyFile sourcePath, path, true
-echo.Set objFSO = Nothing
-echo.
-echo.Else
-echo.Set objXMLHTTP = CreateObject^("MSXML2.ServerXMLHTTP"^)
-echo.Set wshShell = CreateObject^( "WScript.Shell" ^)
-echo.Set objUserVariables = wshShell.Environment^("USER"^)
-echo.
-echo.rem http proxy is optional
-echo.rem attempt to read from HTTP_PROXY env var first
-echo.On Error Resume Next
-echo.
-echo.If NOT ^(objUserVariables^("HTTP_PROXY"^) = ""^) Then
-echo.proxy = objUserVariables^("HTTP_PROXY"^)
-echo.
-echo.rem fall back to named arg
-echo.ElseIf NOT ^(WScript.Arguments.Named^("proxy"^) = ""^) Then
-echo.proxy = WScript.Arguments.Named^("proxy"^)
-echo.End If
-echo.
-echo.If NOT isNull^(proxy^) Then
-echo.rem setProxy method is only available on ServerXMLHTTP 6.0+
-echo.Set objXMLHTTP = CreateObject^("MSXML2.ServerXMLHTTP.6.0"^)
-echo.objXMLHTTP.setProxy 2, proxy
-echo.End If
-echo.
-echo.On Error Goto 0
-echo.
-echo.objXMLHTTP.open "GET", url, false
-echo.objXMLHTTP.send^(^)
-echo.If objXMLHTTP.Status = 200 Then
-echo.Set objADOStream = CreateObject^("ADODB.Stream"^)
-echo.objADOStream.Open
-echo.objADOStream.Type = 1
-echo.objADOStream.Write objXMLHTTP.ResponseBody
-echo.objADOStream.Position = 0
-echo.Set objFSO = Createobject^("Scripting.FileSystemObject"^)
-echo.If objFSO.Fileexists^(path^) Then objFSO.DeleteFile path
-echo.Set objFSO = Nothing
-echo.objADOStream.SaveToFile path
-echo.objADOStream.Close
-echo.Set objADOStream = Nothing
-echo.End If
-echo.Set objXMLHTTP = Nothing
-echo.End If
-)
-> C:\chef\wget.ps1 (
- echo.param^(
-echo.   [String] $remoteUrl,
-echo.   [String] $localPath
-echo.^)
-echo.
-echo.$ProxyUrl = $env:http_proxy;
-echo.$webClient = new-object System.Net.WebClient;
-echo.
-echo.if ^($ProxyUrl -ne ''^) {
-echo.  $WebProxy = New-Object System.Net.WebProxy^($ProxyUrl,$true^)
-echo.  $WebClient.Proxy = $WebProxy
-echo.}
-echo.
-echo.$webClient.DownloadFile^($remoteUrl, $localPath^);
-)
-@rem Determine the version and the architecture
-@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
-@set WinMajor=%%D
-@set WinMinor=%%E
-@set WinBuild=%%F
-)
-@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
-@set LATEST_OS_VERSION_MAJOR=6
-@set LATEST_OS_VERSION_MINOR=3
-@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
-@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
-  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
-)
-goto Version%WinMajor%.%WinMinor%
-:VersionUnknown
-@rem If this is an unknown version of windows set the default
-@set MACHINE_OS=2008r2
-@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
-goto architecture_select
-:Version6.0
-@set MACHINE_OS=2008
-goto architecture_select
-:Version5.2
-@set MACHINE_OS=2003r2
-goto architecture_select
-:Version6.1
-@set MACHINE_OS=2008r2
-goto architecture_select
-:Version6.2
-@set MACHINE_OS=2012
-goto architecture_select
-@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
-:Version6.3
-goto Version6.2
-:architecture_select
-goto Architecture%PROCESSOR_ARCHITEW6432%
-:Architecture
-goto Architecture%PROCESSOR_ARCHITECTURE%
-@rem If this is an unknown architecture set the default
-@set MACHINE_ARCH=i686
-goto install
-:Architecturex86
-@set MACHINE_ARCH=i686
-goto install
-:Architectureamd64
-@set MACHINE_ARCH=x86_64
-goto install
-:install
-@rem If user has provided the custom installation command for chef-client then execute it
-  chef-client -o recipe[cbk1::rec2]
-@endlocal
-@echo off
-echo Writing validation key...
-echo Validation key written.
-@echo on
-> C:\chef\client.rb (
- echo.chef_server_url  "https://localhost:443"
-echo.validation_client_name "chef-validator"
-echo.file_cache_path   "c:/chef/cache"
-echo.file_backup_path  "c:/chef/backup"
-echo.cache_options     ^({:path =^> "c:/chef/cache/checksums", :skip_expires =^> true}^)
-echo.# Using default node name ^(fqdn^)
-echo.log_level        :info
-echo.log_location       STDOUT
-)
-> C:\chef\first-boot.json (
- echo.{"run_list":null}
-)
-@echo Starting chef to bootstrap the node...
-SET "PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
-chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json

data/spec/assets/win_template_rendered_with_bootstrap_install_command_on_13_client.txt DELETED

@@ -1,220 +0,0 @@
-@rem
-@rem Author:: Seth Chisamore (<schisamo@opscode.com>)
-@rem Copyright:: Copyright (c) 2011 Opscode, Inc.
-@rem License:: Apache License, Version 2.0
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem     http://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-@rem Use delayed environment expansion so that ERRORLEVEL can be evaluated with the
-@rem !ERRORLEVEL! syntax which evaluates at execution of the line of script, not when
-@rem the line is read. See help for the /E switch from cmd.exe /? .
-@setlocal ENABLEDELAYEDEXPANSION
-@set BOOTSTRAP_DIRECTORY=C:\chef
-@echo Checking for existing directory "%BOOTSTRAP_DIRECTORY%"...
-@if NOT EXIST %BOOTSTRAP_DIRECTORY% (
-    @echo Existing directory not found, creating.
-    @mkdir %BOOTSTRAP_DIRECTORY%
-) else (
-    @echo Existing directory found, skipping creation.
-)
-> C:\chef\wget.vbs (
- echo.url = WScript.Arguments.Named^("url"^)
-echo.path = WScript.Arguments.Named^("path"^)
-echo.proxy = null
-echo.'* Vaguely attempt to handle file:// scheme urls by url unescaping and switching all
-echo.'* / into .  Also assume that file:/// is a local absolute path and that file://^<foo^>
-echo.'* is possibly a network file path.
-echo.If InStr^(url, "file://"^) = 1 Then
-echo.url = Unescape^(url^)
-echo.If InStr^(url, "file:///"^) = 1 Then
-echo.sourcePath = Mid^(url, Len^("file:///"^) + 1^)
-echo.Else
-echo.sourcePath = Mid^(url, Len^("file:"^) + 1^)
-echo.End If
-echo.sourcePath = Replace^(sourcePath, "/", "\"^)
-echo.
-echo.Set objFSO = CreateObject^("Scripting.FileSystemObject"^)
-echo.If objFSO.Fileexists^(path^) Then objFSO.DeleteFile path
-echo.objFSO.CopyFile sourcePath, path, true
-echo.Set objFSO = Nothing
-echo.
-echo.Else
-echo.Set objXMLHTTP = CreateObject^("MSXML2.ServerXMLHTTP"^)
-echo.Set wshShell = CreateObject^( "WScript.Shell" ^)
-echo.Set objUserVariables = wshShell.Environment^("USER"^)
-echo.
-echo.rem http proxy is optional
-echo.rem attempt to read from HTTP_PROXY env var first
-echo.On Error Resume Next
-echo.
-echo.If NOT ^(objUserVariables^("HTTP_PROXY"^) = ""^) Then
-echo.proxy = objUserVariables^("HTTP_PROXY"^)
-echo.
-echo.rem fall back to named arg
-echo.ElseIf NOT ^(WScript.Arguments.Named^("proxy"^) = ""^) Then
-echo.proxy = WScript.Arguments.Named^("proxy"^)
-echo.End If
-echo.
-echo.If NOT isNull^(proxy^) Then
-echo.rem setProxy method is only available on ServerXMLHTTP 6.0+
-echo.Set objXMLHTTP = CreateObject^("MSXML2.ServerXMLHTTP.6.0"^)
-echo.objXMLHTTP.setProxy 2, proxy
-echo.End If
-echo.
-echo.On Error Goto 0
-echo.
-echo.objXMLHTTP.open "GET", url, false
-echo.objXMLHTTP.send^(^)
-echo.If objXMLHTTP.Status = 200 Then
-echo.Set objADOStream = CreateObject^("ADODB.Stream"^)
-echo.objADOStream.Open
-echo.objADOStream.Type = 1
-echo.objADOStream.Write objXMLHTTP.ResponseBody
-echo.objADOStream.Position = 0
-echo.Set objFSO = Createobject^("Scripting.FileSystemObject"^)
-echo.If objFSO.Fileexists^(path^) Then objFSO.DeleteFile path
-echo.Set objFSO = Nothing
-echo.objADOStream.SaveToFile path
-echo.objADOStream.Close
-echo.Set objADOStream = Nothing
-echo.End If
-echo.Set objXMLHTTP = Nothing
-echo.End If
-)
-> C:\chef\wget.ps1 (
- echo.param^(
-echo.   [String] $remoteUrl,
-echo.   [String] $localPath
-echo.^)
-echo.
-echo.$ProxyUrl = $env:http_proxy;
-echo.$webClient = new-object System.Net.WebClient;
-echo.
-echo.if ^($ProxyUrl -ne ''^) {
-echo.  $WebProxy = New-Object System.Net.WebProxy^($ProxyUrl,$true^)
-echo.  $WebClient.Proxy = $WebProxy
-echo.}
-echo.
-echo.$webClient.DownloadFile^($remoteUrl, $localPath^);
-)
-@rem Determine the version and the architecture
-@FOR /F "usebackq tokens=1-8 delims=.[] " %%A IN (`ver`) DO (
-@set WinMajor=%%D
-@set WinMinor=%%E
-@set WinBuild=%%F
-)
-@echo Detected Windows Version %WinMajor%.%WinMinor% Build %WinBuild%
-@set LATEST_OS_VERSION_MAJOR=6
-@set LATEST_OS_VERSION_MINOR=3
-@if /i %WinMajor% GTR %LATEST_OS_VERSION_MAJOR% goto VersionUnknown
-@if /i %WinMajor% EQU %LATEST_OS_VERSION_MAJOR%  (
-  @if /i %WinMinor% GTR %LATEST_OS_VERSION_MINOR% goto VersionUnknown
-)
-goto Version%WinMajor%.%WinMinor%
-:VersionUnknown
-@rem If this is an unknown version of windows set the default
-@set MACHINE_OS=2008r2
-@echo Warning: Unknown version of Windows, assuming default of Windows %MACHINE_OS%
-goto architecture_select
-:Version6.0
-@set MACHINE_OS=2008
-goto architecture_select
-:Version5.2
-@set MACHINE_OS=2003r2
-goto architecture_select
-:Version6.1
-@set MACHINE_OS=2008r2
-goto architecture_select
-:Version6.2
-@set MACHINE_OS=2012
-goto architecture_select
-@rem Currently Windows Server 2012 R2 is treated as equivalent to Windows Server 2012
-:Version6.3
-goto Version6.2
-:architecture_select
-goto Architecture%PROCESSOR_ARCHITEW6432%
-:Architecture
-goto Architecture%PROCESSOR_ARCHITECTURE%
-@rem If this is an unknown architecture set the default
-@set MACHINE_ARCH=i686
-goto install
-:Architecturex86
-@set MACHINE_ARCH=i686
-goto install
-:Architectureamd64
-@set MACHINE_ARCH=x86_64
-goto install
-:install
-@rem If user has provided the custom installation command for chef-client then execute it
-  chef-client -o recipe[cbk1::rec2]
-@endlocal
-@echo off
-echo Writing validation key...
-echo Validation key written.
-@echo on
-> C:\chef\client.rb (
- echo.chef_server_url  "https://localhost:443"
-echo.validation_client_name "chef-validator"
-echo.file_cache_path   "c:/chef/cache"
-echo.file_backup_path  "c:/chef/backup"
-echo.cache_options     ^({:path =^> "c:/chef/cache/checksums", :skip_expires =^> true}^)
-echo.# Using default node name ^(fqdn^)
-echo.log_level        :info
-echo.log_location       STDOUT
-)
-> C:\chef\first-boot.json (
- echo.{"run_list":null}
-)
-@echo Starting chef to bootstrap the node...
-SET "PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%SYSTEMROOT%\System32\WindowsPowerShell\v1.0\;C:\ruby\bin;C:\opscode\chef\bin;C:\opscode\chef\embedded\bin"
-chef-client -c c:/chef/client.rb -j c:/chef/first-boot.json