chef-provisioning-azurerm 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e622074ff9caf91886b46f9ed52ea099edbe0a6a
-  data.tar.gz: 6a1295a76fda9698d7c7ee3a42c8b1492e621d8c
+  metadata.gz: 1697bfb9e31a3888825aee530b6134658ff7d339
+  data.tar.gz: 14b14b09738db36a036bc8533cc812a7740368a2
 SHA512:
-  metadata.gz: af8e73f71ed1882a3c760101a55a4ed4cb91b5985edc7d60be0ede524c25a5d2afcef7e699b20059e67029e3cdc780221f6007ef98c2f84f9d4434db55c98fdd
-  data.tar.gz: a7ca2425c44dcf520bd37a564a5d015a7ac7e2e36c4d058138f3b11ae1fa06384c899a05a53176312383d7f47d7d73c03e37a3939ae4ad70a5e07d776541d006
+  metadata.gz: f1085bcb5393a4fc41624ff15d6846012e10ef15d3faf834730d92642ec55c6d2a53b500857e46a3500f7eca38f187b5d64f040e12d506438435cc0ab8d49025
+  data.tar.gz: 5f785c089b359b3fb7306886d091b23831fa60d5920eb3a25ce88a90a2dbe5cd298d2bf8f2274dc3333e32e64787d7296cc61896c7b55e07d3476fd310bb9162

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # chef-provisioning-azurerm Changelog
 
+## [0.3.3] - 2016-01-25
+- Raise AzureOperationError into log (@stuartpreston) 
+- Fix#6 VM extension JSON not formatted correctly (@andrewelizondo)
+
 ## [0.3.2] - 2015-10-07
 ### Changed
 - References to Azure SDK updated, supports Linux

data/README.md

@@ -52,7 +52,6 @@ Note that the environment variables, if set, take preference over the values in
 Unlike a fully-featured **chef-provisioning** driver that fully utilises the **machine**, **machine_batch**, **machine_image** and **load_balancer** resources, the **chef-provisioning-azurerm** driver offers a lightweight way to interact with resources and providers in the Azure Resource Manager framework directly.
 
 To work around the issue of storing chef-provisioning driver info in the Chef server:  
-- Any Azure Resource Manager (ARM) templates sent for deployment that contain a resource of type 'Microsoft.Compute/virtualMachine' or 'Microsoft.ClassicCompute/virtualMachine' will automatically have the Chef VM extension added (unless overridden with **install_vm_extension: false**)
 - The Chef VM extension will automatically be configured to point at the same Chef server as the provisioning node.  This can be overridden in a recipe by using the following line: ```with_chef_server 'http://your.chef.server.url/yourorg'```
 
 The following resources are provided: 

data/lib/chef/provider/azure_network_interface.rb

@@ -101,7 +101,7 @@ class Chef
 
         nic_properties.dns_settings = create_network_interface_dns_settings(dns_servers) if dns_servers
 
-        ip_config =  create_network_interface_ip_configuration("#{interface_name}-ipconfig", private_ip_type, private_ip, subnet_ref, public_ip_ref)
+        ip_config = create_network_interface_ip_configuration("#{interface_name}-ipconfig", private_ip_type, private_ip, subnet_ref, public_ip_ref)
         nic_properties.ip_configurations = [ip_config]
 
         nic_properties
@@ -117,7 +117,7 @@ class Chef
         ip_config = Azure::ARM::Network::Models::NetworkInterfaceIpConfiguration.new
         ip_config.name = ipconfig_name
         ip_config.properties = Azure::ARM::Network::Models::NetworkInterfaceIpConfigurationPropertiesFormat.new
-        ip_config.properties.private_ipallocation_method = private_ip_type if  private_ip_type
+        ip_config.properties.private_ipallocation_method = private_ip_type if private_ip_type
         ip_config.properties.private_ipaddress = private_ip if private_ip
 
         if subnet_ref
@@ -127,14 +127,14 @@ class Chef
 
         if public_ip_ref
           ip_config.properties.public_ipaddress = Azure::ARM::Network::Models::PublicIpAddress.new
-          ip_config.properties.public_ipaddress.id =  public_ip_ref
+          ip_config.properties.public_ipaddress.id = public_ip_ref
         end
 
         ip_config
       end
 
       def get_public_ip(resource_group, resource_name)
-        result =  try_azure_operation('getting public IP') do
+        result = try_azure_operation('getting public IP') do
           network_management_client.public_ip_addresses.get(resource_group, resource_name).value!
         end
 
@@ -147,7 +147,7 @@ class Chef
           return nil if v.nil? || v.empty?
         end
 
-        result =  try_azure_operation('getting subnet') do
+        result = try_azure_operation('getting subnet') do
           network_management_client.subnets.get(resource_group_name, vnet_name, subnet_name).value!
         end
         subnet = result.body

data/lib/chef/provider/azure_resource_group.rb

@@ -11,11 +11,16 @@ class Chef
 
       action :create do
         converge_by("create or update Resource Group #{new_resource.name}") do
-          resource_group = Azure::ARM::Resources::Models::ResourceGroup.new
-          resource_group.location = new_resource.location
-          resource_group.tags = new_resource.tags
-          result = resource_management_client.resource_groups.create_or_update(new_resource.name, resource_group).value!
-          Chef::Log.debug("result: #{result.body.inspect}")
+          begin
+            resource_group = Azure::ARM::Resources::Models::ResourceGroup.new
+            resource_group.location = new_resource.location
+            resource_group.tags = new_resource.tags
+            result = resource_management_client.resource_groups.create_or_update(new_resource.name, resource_group).value!
+            Chef::Log.debug("result: #{result.body.inspect}")
+          rescue ::MsRestAzure::AzureOperationError => operation_error
+            Chef::Log.error operation_error.body['error']
+            raise "#{operation_error.body['error']['code']}: #{operation_error.body['error']['message']}"
+          end
         end
       end
 

data/lib/chef/provider/azure_resource_template.rb

@@ -11,10 +11,15 @@ class Chef
 
       action :deploy do
         converge_by("deploy or re-deploy Resource Manager template '#{new_resource.name}'") do
-          result = resource_management_client.deployments.create_or_update(new_resource.resource_group, new_resource.name, deployment).value!
-          action_handler.report_progress "Result: #{result.body.properties.provisioning_state}"
-          Chef::Log.debug("result: #{result.body.inspect}")
-          follow_deployment_until_end_state
+          begin
+            result = resource_management_client.deployments.create_or_update(new_resource.resource_group, new_resource.name, deployment).value!
+            action_handler.report_progress "Result: #{result.body.properties.provisioning_state}"
+            Chef::Log.debug("result: #{result.body.inspect}")
+            follow_deployment_until_end_state
+          rescue ::MsRestAzure::AzureOperationError => operation_error
+            Chef::Log.error operation_error.body['error']
+            raise "#{operation_error.body['error']['code']}: #{operation_error.body['error']['message']}"
+          end
         end
       end
 
@@ -53,6 +58,7 @@ class Chef
         chef_server_url = Chef::Config[:chef_server_url]
         validation_client_name = Chef::Config[:validation_client_name]
         validation_key_content = ::File.read(Chef::Config[:validation_key])
+        machine_name = "\'#{machine_name}\'" unless machine_name[0] == '['
         <<-EOH
           {
             "type": "Microsoft.Compute/virtualMachines/extensions",

data/lib/chef/provisioning/azurerm/version.rb

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module AzureRM
-      VERSION = '0.3.2'
+      VERSION = '0.3.3'
     end
   end
 end

data/lib/chef/resource/azure_network_interface.rb

@@ -30,7 +30,7 @@ class Chef
       attr_reader :public_ip_resource
 
       def public_ip(resource_name, &resource_block)
-        @public_ip_resource =  Chef::Resource::AzurePublicIPAddress.new(resource_name.to_s, run_context)
+        @public_ip_resource = Chef::Resource::AzurePublicIPAddress.new(resource_name.to_s, run_context)
         @public_ip_resource.action :nothing
         @public_ip_resource.instance_eval(&resource_block)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef