knife-azure 1.6.0.rc.0 → 1.6.0

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

@@ -0,0 +1,116 @@
+#
+# Author:: Aliasgar Batterywala (aliasgar.batterywala@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.
+#
+
+class Chef
+  class Knife
+    class Bootstrap
+      module CommonBootstrapOptions
+
+        def self.included(includer)
+          includer.class_eval do
+
+            deps do
+              require 'chef/knife/bootstrap'
+              Chef::Knife::Bootstrap.load_deps
+            end
+
+            option :chef_node_name,
+              :short => "-N NAME",
+              :long => "--node-name NAME",
+              :description => "The Chef node name for your new node"
+
+            option :bootstrap_version,
+              :long => "--bootstrap-version VERSION",
+              :description => "The version of Chef to install",
+              :proc => Proc.new { |v| Chef::Config[:knife][:bootstrap_version] = v }
+
+            option :run_list,
+              :short => "-r RUN_LIST",
+              :long => "--run-list RUN_LIST",
+              :description => "Comma separated list of roles/recipes to apply",
+              :proc => lambda { |o| o.split(/[\s,]+/) },
+              :default => []
+
+            option :json_attributes,
+              :short => "-j JSON",
+              :long => "--json-attributes JSON",
+              :description => "A JSON string to be added to the first run of chef-client",
+              :proc => lambda { |o| JSON.parse(o) }
+
+            option :bootstrap_proxy,
+              :long => "--bootstrap-proxy PROXY_URL",
+              :description => "The proxy server for the node being bootstrapped",
+              :proc => Proc.new { |p| Chef::Config[:knife][:bootstrap_proxy] = p }
+
+            option :cert_path,
+              :long => "--cert-path PATH",
+              :description => "SSL Certificate Path"
+
+            option :node_ssl_verify_mode,
+              :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"]
+                unless valid_values.include?(v)
+                  raise "Invalid value '#{v}' for --node-ssl-verify-mode. Valid values are: #{valid_values.join(", ")}"
+                end
+              }
+
+            option :node_verify_api_cert,
+              :long        => "--[no-]node-verify-api-cert",
+              :description => "Verify the SSL cert for HTTPS requests to the Chef server API.",
+              :boolean     => true
+
+            option :azure_extension_client_config,
+              :long => "--azure-extension-client-config CLIENT_PATH",
+              :description => "Optional. Path to a client.rb file for use by the bootstrapped node."
+
+            option :auto_update_client,
+              :long => "--auto-update-client",
+              :boolean => true,
+              :default => false,
+              :description => "Set this flag to enable auto chef client update in azure chef extension."
+
+            option :delete_chef_extension_config,
+              :long => "--delete-chef-extension-config",
+              :boolean => true,
+              :default => false,
+              :description => "Determines whether Chef configuration files removed when Azure removes the Chef resource extension from the VM. The default is false."
+
+            option :uninstall_chef_client,
+              :long => "--uninstall-chef-client",
+              :boolean => true,
+              :default => false,
+              :description => "Determines whether Chef Client will be un-installed from the VM or not. The default value is false."
+
+            option :secret,
+              :short => "-s SECRET",
+              :long  => "--secret ",
+              :description => "The secret key to use to encrypt data bag item values.  Can also be defaulted in your config with the key 'secret'"
+
+            option :secret_file,
+              :long => "--secret-file SECRET_FILE",
+              :description => "A file containing the secret key to use to encrypt data bag item values.  Can also be defaulted in your config with the key 'secret_file'"
+  	  	  end
+  	  	end
+  	  end
+  	end
+  end
+end
+

data/lib/chef/knife/bootstrap_azure.rb

@@ -0,0 +1,110 @@
+#
+# Author:: Aliasgar Batterywala (aliasgar.batterywala@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/azure_base'
+require 'chef/knife/bootstrap/common_bootstrap_options'
+require 'chef/knife/bootstrap/bootstrapper'
+
+class Chef
+  class Knife
+    class BootstrapAzure < Knife
+
+      include Knife::AzureBase
+      include Knife::Bootstrap::CommonBootstrapOptions
+      include Knife::Bootstrap::Bootstrapper
+
+      banner "knife bootstrap azure SERVER (options)"
+
+      option :azure_dns_name,
+        :short => "-d DNS_NAME",
+        :long => "--azure-dns-name DNS_NAME",
+        :description => "Optional. The DNS prefix name that is used to access the cloud service."
+
+      def run
+        ui.info "Validating..."
+        validate_asm_keys!
+
+        begin
+          if @name_args.length == 1
+            service.add_extension(@name_args[0], set_ext_params)
+          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
+          ui.error("#{error.message}")
+          Chef::Log.debug("#{error.backtrace.join("\n")}")
+          exit
+        end
+      end
+
+      def set_ext_params
+        begin
+          ui.info "Looking for the server #{@name_args[0]}..."
+          server = service.find_server({
+              name: @name_args[0],
+              azure_dns_name: locate_config_value(:azure_dns_name)
+            })
+
+          if !server.instance_of? Azure::Role
+            if server.nil?
+              if !locate_config_value(:azure_dns_name).nil?
+                raise "Hosted service #{locate_config_value(:azure_dns_name)} does not exist."
+              else
+                raise "Server #{@name_args[0]} does not exist."
+              end
+            else
+              raise "Server #{@name_args[0]} does not exist under the hosted service #{locate_config_value(:azure_dns_name)}."
+            end
+          end
+
+          ui.info "\nServer #{@name_args[0]} found."
+          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'
+            else
+              raise "OS version #{server.os_version} for OS type #{server.os_type} is not supported."
+            end
+          else
+            raise "OS type #{server.os_type} is not supported."
+          end
+
+          ext_params[:azure_dns_name] = server.hostedservicename || locate_config_value(:azure_dns_name)
+          ext_params[:deploy_name] = server.deployname
+          ext_params[:role_xml] = server.role_xml
+          ext_params[:azure_vm_name] = @name_args[0]
+          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
+        rescue => error
+          ui.error("#{error.message}")
+          Chef::Log.debug("#{error.backtrace.join("\n")}")
+          exit
+        end
+
+        ext_params
+      end
+    end
+  end
+end

data/lib/chef/knife/bootstrap_azurerm.rb

@@ -0,0 +1,116 @@
+#
+# 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'
+
+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: West US, East US, East Asia, Southeast Asia, North Europe, West Europe",
+        :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....")
+            vm_extension = service.create_vm_extension(set_ext_params)
+            if vm_extension
+              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
+          if error.class == MsRestAzure::AzureOperationError && error.body
+            if error.body['error']['code'] == 'DeploymentFailed'
+              ui.error("#{error.body['error']['message']}")
+            else
+              ui.error(error.body)
+            end
+          else
+            ui.error("#{error.message}")
+            Chef::Log.debug("#{error.backtrace.join("\n")}")
+          end
+          exit
+         end
+      end
+
+      def set_ext_params
+        begin
+          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.properties.storage_profile.os_disk.os_type.downcase
+              when 'windows'
+                ext_params[:chef_extension] = 'ChefClient'
+              when 'linux'
+                if ['ubuntu', 'debian', 'rhel', 'centos'].any? { |platform| server.properties.storage_profile.image_reference.offer.downcase.include? platform }
+                  ext_params[:chef_extension] = 'LinuxChefClient'
+                else
+                  raise "Offer #{server.properties.storage_profile.image_reference.offer} is not supported in the extension."
+                end
+              else
+                raise "OS type #{server.properties.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
+        rescue => error
+          ui.error("#{error.message}")
+          Chef::Log.debug("#{error.backtrace.join("\n")}")
+          exit
+        end
+
+        ext_params
+      end
+
+    end
+  end
+end

data/lib/knife-azure/version.rb

@@ -1,7 +1,6 @@
 module Knife
   module Azure
-    VERSION = "1.6.0.rc.0"
+    VERSION = "1.6.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.6.0.rc.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Barry Davis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-23 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -39,6 +39,90 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_resources
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_compute
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_storage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_network
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.0.6
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +143,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.2.1
+- !ruby/object:Gem::Dependency
+  name: github_changelog_generator
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
@@ -111,19 +209,27 @@ extra_rdoc_files:
 files:
 - LICENSE
 - README.md
-- lib/azure/ag.rb
-- lib/azure/certificate.rb
-- lib/azure/connection.rb
-- lib/azure/deploy.rb
-- lib/azure/disk.rb
-- lib/azure/host.rb
-- lib/azure/image.rb
-- lib/azure/loadbalancer.rb
-- lib/azure/rest.rb
-- lib/azure/role.rb
-- lib/azure/storageaccount.rb
-- lib/azure/utility.rb
-- lib/azure/vnet.rb
+- 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/windows_credentials.rb
+- lib/azure/service_management/ASM_interface.rb
+- lib/azure/service_management/ag.rb
+- lib/azure/service_management/certificate.rb
+- lib/azure/service_management/connection.rb
+- lib/azure/service_management/deploy.rb
+- lib/azure/service_management/disk.rb
+- lib/azure/service_management/host.rb
+- lib/azure/service_management/image.rb
+- lib/azure/service_management/loadbalancer.rb
+- lib/azure/service_management/rest.rb
+- lib/azure/service_management/role.rb
+- lib/azure/service_management/storageaccount.rb
+- lib/azure/service_management/utility.rb
+- lib/azure/service_management/vnet.rb
 - lib/chef/knife/azure_ag_create.rb
 - lib/chef/knife/azure_ag_list.rb
 - lib/chef/knife/azure_base.rb
@@ -136,6 +242,16 @@ files:
 - lib/chef/knife/azure_server_show.rb
 - lib/chef/knife/azure_vnet_create.rb
 - lib/chef/knife/azure_vnet_list.rb
+- lib/chef/knife/azurerm_base.rb
+- lib/chef/knife/azurerm_server_create.rb
+- lib/chef/knife/azurerm_server_delete.rb
+- lib/chef/knife/azurerm_server_list.rb
+- lib/chef/knife/azurerm_server_show.rb
+- lib/chef/knife/bootstrap/bootstrap_options.rb
+- lib/chef/knife/bootstrap/bootstrapper.rb
+- lib/chef/knife/bootstrap/common_bootstrap_options.rb
+- lib/chef/knife/bootstrap_azure.rb
+- lib/chef/knife/bootstrap_azurerm.rb
 - lib/knife-azure/version.rb
 homepage: https://github.com/chef/knife-azure
 licenses:
@@ -157,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A plugin to the Chef knife tool for creating instances on the Microsoft Azure