knife-azure 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17210f56bc1b6b7efd7152512c8ee5c416d0eb6afed2139f757bbd96f20baaa8
-  data.tar.gz: 3cba997f30e540035c9b4495326c09e70d45a3c0d7c9f84d01377168bf73837f
+  metadata.gz: '09efc06fd6788aa94f2af8ace7bd411b9d90c4f3df736a0559997bc5298a5336'
+  data.tar.gz: 6cfd515b9371c8d4a7c0c7ed58575f581470c2ecd3ed7604329291c2fb1a1eec
 SHA512:
-  metadata.gz: 884f5d06b3ad5159a97a81434e508185c64c0850f135b2b71094f70076aeecc0b7670f58d83215531344b903820caefeacec85aee53f7d254cbbbe22eca21548
-  data.tar.gz: f57c4e8b5cad7a9437a4292c1c41b2ff668d9c42f32c322ef1f1ac7fe87d735b8fff7c8d2859500958f3e11616487e0606960f75d39c7948fbdc0fdb46723924
+  metadata.gz: a8e905e8136596fa27fa18898f73dd871138f52118792939df1be75da3f4122bcf358529605793b0a517fb7cf37036bf0b3b7f85ff57ffcec1a8aa1efff45652
+  data.tar.gz: 25b0054daa620887733644c1ad87983fd7e5c325de4781071c81773dee39f83c7a8c2a308c9ee1341220583be9415d8596fa8ac9cf525fd32d0d2facec11c8d0

data/lib/azure/resource_management/windows_credentials.rb

@@ -19,8 +19,8 @@
 # XPLAT stores the access token and other information in windows credential manager.
 # Using FFI to call CredRead function
 require "chef"
-require "mixlib/shellout"
-require "ffi"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "ffi" unless defined?(FFI)
 require "chef/win32/api"
 
 module Azure

data/lib/azure/service_management/rest.rb

@@ -16,9 +16,10 @@
 # limitations under the License.
 #
 
-require "net/https"
-require "uri"
-require "nokogiri"
+require "net/http" unless defined?(Net::HTTP)
+require "openssl" unless defined?(OpenSSL)
+require "uri" unless defined?(URI)
+require "nokogiri" unless defined?(Nokogiri)
 
 module AzureAPI
 

data/lib/azure/service_management/role.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require "securerandom"
+require "securerandom" unless defined?(SecureRandom)
 require_relative "utility"
 
 module Azure

data/lib/chef/knife/azure_server_create.rb

@@ -32,7 +32,7 @@ class Chef
       include Knife::Bootstrap::Bootstrapper
 
       deps do
-        require "securerandom"
+        require "securerandom" unless defined?(SecureRandom)
         require "readline"
         require "chef/json_compat"
         require "chef/knife/bootstrap"

data/lib/chef/knife/azurerm_server_create.rb

@@ -31,7 +31,7 @@ class Chef
       include Knife::Bootstrap::Bootstrapper
 
       deps do
-        require "securerandom"
+        require "securerandom" unless defined?(SecureRandom)
         include Knife::AzurermBase
       end
 

data/lib/chef/knife/bootstrap_azurerm.rb

@@ -29,7 +29,7 @@ class Chef
       include Knife::Bootstrap::Bootstrapper
 
       deps do
-        require "time"
+        require "time" unless defined?(Time)
         include Knife::AzurermBase
       end
 

data/lib/chef/knife/helpers/azure_base.rb

@@ -204,10 +204,10 @@ class Chef
       end
 
       def parse_publish_settings_file(filename)
-        require "nokogiri"
-        require "base64"
-        require "openssl"
-        require "uri"
+        require "nokogiri" unless defined?(Nokogiri)
+        require "base64" unless defined?(Base64)
+        require "openssl" unless defined?(OpenSSL)
+        require "uri" unless defined?(URI)
         begin
           doc = Nokogiri::XML(File.open(find_file(filename)))
           profile = doc.at_css("PublishProfile")
@@ -235,8 +235,8 @@ class Chef
       end
 
       def parse_azure_profile(filename, errors)
-        require "openssl"
-        require "uri"
+        require "openssl" unless defined?(OpenSSL)
+        require "uri" unless defined?(URI)
         errors = [] if errors.nil?
         azure_profile = File.read(File.expand_path(filename))
         azure_profile = JSON.parse(azure_profile)

data/lib/chef/knife/helpers/azurerm_base.rb

@@ -35,8 +35,8 @@ class Chef
             require "chef/json_compat"
             require_relative "../../../azure/resource_management/ARM_interface"
             require "chef/mixin/shell_out"
-            require "time"
-            require "json"
+            require "time" unless defined?(Time)
+            require "json" unless defined?(JSON)
 
             if Chef::Platform.windows?
               require_relative "../../azure/resource_management/windows_credentials"
@@ -172,10 +172,10 @@ class Chef
       end
 
       def parse_publish_settings_file(filename)
-        require "nokogiri"
-        require "base64"
-        require "openssl"
-        require "uri"
+        require "nokogiri" unless defined?(Nokogiri)
+        require "base64" unless defined?(Base64)
+        require "openssl" unless defined?(OpenSSL)
+        require "uri" unless defined?(URI)
         begin
           doc = Nokogiri::XML(File.open(find_file(filename)))
           profile = doc.at_css("PublishProfile")

data/lib/knife-azure/version.rb

@@ -17,7 +17,7 @@
 
 module Knife
   module Azure
-    VERSION = "3.0.4".freeze
+    VERSION = "3.0.5".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-azure
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Barry Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef