knife-azure 1.8.7 → 1.9.0

data/lib/chef/knife/bootstrap/common_bootstrap_options.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
 #
-# Copyright:: Copyright (c) 2016 Opscode, Inc.
+# Copyright:: Copyright 2016-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,7 +29,7 @@ class Chef
           includer.class_eval do
 
             deps do
-              require 'chef/knife/bootstrap'
+              require "chef/knife/bootstrap"
               Chef::Knife::Bootstrap.load_deps
             end
 
@@ -69,7 +69,7 @@ class Chef
               :long        => "--node-ssl-verify-mode [peer|none]",
               :description => "Whether or not to verify the SSL cert for all HTTPS requests.",
               :proc        => Proc.new { |v|
-                valid_values = ["none", "peer"]
+                valid_values = %w{none peer}
                 unless valid_values.include?(v)
                   raise "Invalid value '#{v}' for --node-ssl-verify-mode. Valid values are: #{valid_values.join(", ")}"
                 end
@@ -117,4 +117,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/knife/bootstrap_azure.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Aliasgar Batterywala (aliasgar.batterywala@clogeny.com)
-# Copyright:: Copyright (c) 2016 Opscode, Inc.
+# Copyright:: Copyright 2016-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'chef/knife/azure_base'
-require 'chef/knife/bootstrap/common_bootstrap_options'
-require 'chef/knife/bootstrap/bootstrapper'
+require "chef/knife/azure_base"
+require "chef/knife/bootstrap/common_bootstrap_options"
+require "chef/knife/bootstrap/bootstrapper"
 
 class Chef
   class Knife
@@ -49,8 +49,8 @@ class Chef
               fetch_chef_client_logs(Time.now, 35)
             end
           else
-            raise ArgumentError, 'Please specify the SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length == 0
-            raise ArgumentError, 'Please specify only one SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length > 1
+            raise ArgumentError, "Please specify the SERVER name which needs to be bootstrapped via the Chef Extension." if @name_args.length == 0
+            raise ArgumentError, "Please specify only one SERVER name which needs to be bootstrapped via the Chef Extension." if @name_args.length > 1
           end
         rescue => error
           ui.error("#{error.message}")
@@ -85,11 +85,11 @@ class Chef
           ui.info "Setting the Chef Extension parameters."
           ext_params = Hash.new
           case server.os_type.downcase
-          when 'windows'
-            ext_params[:chef_extension] = 'ChefClient'
-          when 'linux'
-            if ['ubuntu', 'debian', 'rhel', 'centos'].any? { |platform| server.os_version.downcase.include? platform }
-              ext_params[:chef_extension] = 'LinuxChefClient'
+          when "windows"
+            ext_params[:chef_extension] = "ChefClient"
+          when "linux"
+            if %w{ubuntu debian rhel centos}.any? { |platform| server.os_version.downcase.include? platform }
+              ext_params[:chef_extension] = "LinuxChefClient"
             else
               raise "OS version #{server.os_version} for OS type #{server.os_type} is not supported."
             end
@@ -121,8 +121,8 @@ class Chef
           my_role = nil
           sleep_and_wait = false
           deployment = fetch_deployment
-          if deployment.at_css('Deployment Name') != nil
-            role_list_xml =  deployment.css('RoleInstanceList RoleInstance')
+          if deployment.at_css("Deployment Name") != nil
+            role_list_xml = deployment.css("RoleInstanceList RoleInstance")
             ## list of roles found under the deployment ##
             role_list_xml.each do |role|
               ## search in the roles list for the given role ##

data/lib/chef/knife/bootstrap_azurerm.rb

@@ -1,106 +1,106 @@
-#
-# Author:: Nimisha Sharad (nimisha.sharad@clogeny.com)
-#
-# Copyright:: Copyright (c) 2016 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.
-#
-
-require 'chef/knife/azurerm_base'
-require 'chef/knife/bootstrap/common_bootstrap_options'
-require 'chef/knife/bootstrap/bootstrapper'
-require 'azure/resource_management/ARM_interface'
-require 'time'
-
-class Chef
-  class Knife
-    class BootstrapAzurerm < Knife
-      include Knife::AzurermBase
-      include Knife::Bootstrap::CommonBootstrapOptions
-      include Knife::Bootstrap::Bootstrapper
-
-      banner "knife bootstrap azurerm SERVER (options)"
-
-      option :azure_service_location,
-        :short => "-m LOCATION",
-        :long => "--azure-service-location LOCATION",
-        :description => "Required if not using an Affinity Group. Specifies the geographic location - the name of the data center location that is valid for your subscription.
-                                      Eg: westus, eastus, eastasia, southeastasia, northeurope, westeurope",
-        :proc        => Proc.new { |lo| Chef::Config[:knife][:azure_service_location] = lo }
-
-      def run
-        ui.log("Validating...")
-        validate_arm_keys!(:azure_resource_group_name, :azure_service_location)
-
-        begin
-          if @name_args.length == 1
-            ui.log("Creating VirtualMachineExtension....")
-            ext_params = set_ext_params
-            vm_extension = service.create_vm_extension(ext_params)
-            if vm_extension
-              if ext_params[:chef_extension_public_param][:extendedLogs] == 'true'
-                service.fetch_chef_client_logs(ext_params[:azure_resource_group_name], ext_params[:azure_vm_name], ext_params[:chef_extension], Time.now)
-              end 
-              ui.log("VirtualMachineExtension creation successfull.")
-              ui.log("Virtual Machine Extension name is: #{vm_extension.name}")
-              ui.log("Virtual Machine Extension ID is: #{vm_extension.id}")
-            end
-          else
-            raise ArgumentError, 'Please specify the SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length == 0
-            raise ArgumentError, 'Please specify only one SERVER name which needs to be bootstrapped via the Chef Extension.' if @name_args.length > 1
-          end
-        rescue => error
-          service.common_arm_rescue_block(error)
-        end
-      end
-
-      def set_ext_params
-        server = service.find_server(locate_config_value(:azure_resource_group_name), name_args[0])
-
-        if server
-          if service.extension_already_installed?(server)
-            raise "Virtual machine #{server.name} already has Chef extension installed on it."
-          else
-            ext_params = Hash.new
-            case server.storage_profile.os_disk.os_type.downcase
-            when 'windows'
-              ext_params[:chef_extension] = 'ChefClient'
-            when 'linux'
-              if ['ubuntu', 'debian', 'rhel', 'centos'].any? { |platform| server.storage_profile.image_reference.offer.downcase.include? platform }
-                ext_params[:chef_extension] = 'LinuxChefClient'
-              else
-                raise "Offer #{server.storage_profile.image_reference.offer} is not supported in the extension."
-              end
-            else
-              raise "OS type #{server.storage_profile.os_disk.os_type} is not supported."
-            end
-
-            ext_params[:azure_resource_group_name] = locate_config_value(:azure_resource_group_name)
-            ext_params[:azure_vm_name] = @name_args[0]
-            ext_params[:azure_service_location] = locate_config_value(:azure_service_location)
-            ext_params[:chef_extension_publisher] = get_chef_extension_publisher
-            ext_params[:chef_extension_version] = get_chef_extension_version(ext_params[:chef_extension])
-            ext_params[:chef_extension_public_param] = get_chef_extension_public_params
-            ext_params[:chef_extension_private_param] = get_chef_extension_private_params
-          end
-        else
-          raise "The given server '#{@name_args[0]}' does not exist under resource group '#{locate_config_value(:azure_resource_group_name)}'"
-        end
-
-        ext_params
-      end
-
-    end
-  end
-end
+#
+# Author:: Nimisha Sharad (nimisha.sharad@clogeny.com)
+#
+# Copyright:: Copyright 2016-2018 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 "chef/knife/azurerm_base"
+require "chef/knife/bootstrap/common_bootstrap_options"
+require "chef/knife/bootstrap/bootstrapper"
+require "azure/resource_management/ARM_interface"
+require "time"
+
+class Chef
+  class Knife
+    class BootstrapAzurerm < Knife
+      include Knife::AzurermBase
+      include Knife::Bootstrap::CommonBootstrapOptions
+      include Knife::Bootstrap::Bootstrapper
+
+      banner "knife bootstrap azurerm SERVER (options)"
+
+      option :azure_service_location,
+        :short => "-m LOCATION",
+        :long => "--azure-service-location LOCATION",
+        :description => "Required if not using an Affinity Group. Specifies the geographic location - the name of the data center location that is valid for your subscription.
+                                      Eg: westus, eastus, eastasia, southeastasia, northeurope, westeurope",
+        :proc        => Proc.new { |lo| Chef::Config[:knife][:azure_service_location] = lo }
+
+      def run
+        ui.log("Validating...")
+        validate_arm_keys!(:azure_resource_group_name, :azure_service_location)
+
+        begin
+          if @name_args.length == 1
+            ui.log("Creating VirtualMachineExtension....")
+            ext_params = set_ext_params
+            vm_extension = service.create_vm_extension(ext_params)
+            if vm_extension
+              if ext_params[:chef_extension_public_param][:extendedLogs] == "true"
+                service.fetch_chef_client_logs(ext_params[:azure_resource_group_name], ext_params[:azure_vm_name], ext_params[:chef_extension], Time.now)
+              end
+              ui.log("VirtualMachineExtension creation successfull.")
+              ui.log("Virtual Machine Extension name is: #{vm_extension.name}")
+              ui.log("Virtual Machine Extension ID is: #{vm_extension.id}")
+            end
+          else
+            raise ArgumentError, "Please specify the SERVER name which needs to be bootstrapped via the Chef Extension." if @name_args.length == 0
+            raise ArgumentError, "Please specify only one SERVER name which needs to be bootstrapped via the Chef Extension." if @name_args.length > 1
+          end
+        rescue => error
+          service.common_arm_rescue_block(error)
+        end
+      end
+
+      def set_ext_params
+        server = service.find_server(locate_config_value(:azure_resource_group_name), name_args[0])
+
+        if server
+          if service.extension_already_installed?(server)
+            raise "Virtual machine #{server.name} already has Chef extension installed on it."
+          else
+            ext_params = Hash.new
+            case server.storage_profile.os_disk.os_type.downcase
+            when "windows"
+              ext_params[:chef_extension] = "ChefClient"
+            when "linux"
+              if %w{ubuntu debian rhel centos}.any? { |platform| server.storage_profile.image_reference.offer.downcase.include? platform }
+                ext_params[:chef_extension] = "LinuxChefClient"
+              else
+                raise "Offer #{server.storage_profile.image_reference.offer} is not supported in the extension."
+              end
+            else
+              raise "OS type #{server.storage_profile.os_disk.os_type} is not supported."
+            end
+
+            ext_params[:azure_resource_group_name] = locate_config_value(:azure_resource_group_name)
+            ext_params[:azure_vm_name] = @name_args[0]
+            ext_params[:azure_service_location] = locate_config_value(:azure_service_location)
+            ext_params[:chef_extension_publisher] = get_chef_extension_publisher
+            ext_params[:chef_extension_version] = get_chef_extension_version(ext_params[:chef_extension])
+            ext_params[:chef_extension_public_param] = get_chef_extension_public_params
+            ext_params[:chef_extension_private_param] = get_chef_extension_private_params
+          end
+        else
+          raise "The given server '#{@name_args[0]}' does not exist under resource group '#{locate_config_value(:azure_resource_group_name)}'"
+        end
+
+        ext_params
+      end
+
+    end
+  end
+end

data/lib/knife-azure/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.8.7"
-    MAJOR, MINOR, TINY = VERSION.split('.')
+    VERSION = "1.9.0"
+    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: 1.8.7
+  version: 1.9.0
 platform: ruby
 authors:
 - Barry Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-04 00:00:00.000000000 Z
+date: 2019-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -43,58 +43,82 @@ dependencies:
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_compute
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.18.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.18.3
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_storage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.17'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.17.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '0.17'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.3
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.18.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.18.2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -137,62 +161,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: chef
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.2.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 12.2.1
-- !ruby/object:Gem::Dependency
-  name: mixlib-config
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.9
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.9
-- !ruby/object:Gem::Dependency
-  name: knife-cloud
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 description: A plugin to the Chef knife tool for creating instances on the Microsoft
   Azure platform
 email: oss@chef.io
@@ -205,7 +173,6 @@ files:
 - lib/azure/azure_interface.rb
 - lib/azure/custom_errors.rb
 - lib/azure/helpers.rb
-- lib/azure/resource_management/ARM_base.rb
 - lib/azure/resource_management/ARM_deployment_template.rb
 - lib/azure/resource_management/ARM_interface.rb
 - lib/azure/resource_management/vnet_config.rb
@@ -259,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="