chef-provisioning-azurerm 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bc8954f652b4e9e0c187af25e826b9697a481b9
-  data.tar.gz: 7d31389186510e55772e288295a3c49dd7db0c72
+  metadata.gz: 5ce684d583f8223fed12875b2a5c20f5d7d2469f
+  data.tar.gz: 03fa0cb67a11529b6e6283260cb1a10450b5cf5d
 SHA512:
-  metadata.gz: 7d75d0088713568db277278775e8266ac292361e283ec6f7c58cfa739615246819b31ac9f7a31c25c8511a2ad6a927a036fcb24913a37bf299dcd0f8c3a44db7
-  data.tar.gz: 2d620e0b6f9e95024ab99bb7b4902cfbbd0a349b9c5e16157f0f8e494808894244cf641304fb3f09898d29c84ce803d006dc8ad3a79ba4764caacbeb171618b4
+  metadata.gz: 649403838de5e0117c036b720285f9044c5b346dab7fc858f27c0f50c33cb7047e94f94e2afbb700eb53d576bde0e82bbcfcb62386c2186586ccdb6a73c1a04c
+  data.tar.gz: e5de378badabaf21b4c20868f48b7b9246674492b70b3768cc5c284445826962c9286eb7ff7e797643414c0cab187cb82e66f02481cd1af9343e611e986b5351

data/CHANGELOG.md

@@ -1,5 +1,10 @@
-# Change Log
-## [0.2.13] 2015-08-20
+# chef-provisioning-azurerm Changelog
+
+## [0.2.14] - 2015-08-21
+### Changed
+- Minimize logging to info, favour action_handler.report_progress
+
+## [0.2.13] - 2015-08-20
 ### Changed
 - chef_extension parameters are now required if the Chef VM Extension is to be added to compute resources.
 - Updated README to include explanation of valid chef_extension parameters
@@ -8,5 +13,3 @@
 ### Added
 - Updated examples and README
 - Rubocop compliance
-
-## [0.2.11] - 2015-08

data/lib/chef/provider/azure_resource_template.rb

@@ -21,7 +21,7 @@ class Chef
           if new_resource.chef_extension
             machines = template['resources'].select { |h| h['type'] == 'Microsoft.Compute/virtualMachines' }
             machines.each do |machine|
-              Chef::Log.info("[Azure] Found a compute resource with name value: #{machine['name']} and location #{machine['location']}, adding a Chef VM Extension to it.")
+              action_handler.report_progress "Found a compute resource with name: #{machine['name']} and location: #{machine['location']}, adding a Chef VM Extension to it."
               extension = chef_vm_extension(machine['name'], machine['location'])
               template['resources'] << JSON.parse(extension)
             end
@@ -48,7 +48,6 @@ class Chef
       end
 
       def chef_vm_extension(machine_name, location)
-        Chef::Log.debug("[Azure] Config: #{Chef::Config.inspect}")
         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])
@@ -85,7 +84,13 @@ class Chef
         url = "https://management.azure.com/subscriptions/#{new_resource.subscription_id}/resourcegroups/" \
               "#{new_resource.resource_group}/providers/microsoft.resources/deployments/#{new_resource.name}" \
               '?api-version=2015-01-01'
-        azure_call(:put, url, doc.to_json)
+        action_handler.report_progress "Posting Resource Template to #{url}.\n"
+        response = azure_call(:put, url, doc.to_json)
+        if response.code.to_i == 200 || response.code.to_i == 201
+          action_handler.report_progress "Accepted Resource Template #{new_resource.name} for deployment.\n"
+        else
+          fail "#{response.body}" if response.body
+        end
       end
 
       def validate_template_deployment(doc)
@@ -109,6 +114,7 @@ class Chef
 
         until end_provisioning_state_reached
           response = azure_call(:get, url, '')
+          Chef::Log.debug("Response body: #{response.body}") if response.body
           deployment_operations = JSON.parse(response.body)
           deployment_operations['value'].each do |val|
             resource_provisioning_state = val['properties']['provisioningState']
@@ -116,7 +122,7 @@ class Chef
             resource_type = val['properties']['targetResource']['resourceType']
             end_operation_state_reached = end_operation_states.split(',').include?(resource_provisioning_state)
             unless end_operation_state_reached
-              Chef::Log.info("[Azure] Resource #{resource_type} '#{resource_name}' provisioning status is #{resource_provisioning_state}")
+              action_handler.report_progress "Resource #{resource_type} '#{resource_name}' provisioning status is #{resource_provisioning_state}\n"
             end
           end
           sleep 5
@@ -124,7 +130,7 @@ class Chef
           Chef::Log.debug("[Azure] Resource Template deployment is in a state of '#{provisioning_state}'")
           end_provisioning_state_reached = end_provisioning_states.split(',').include?(provisioning_state)
         end
-        Chef::Log.info("[Azure] Resource Template deployment reached end state of '#{provisioning_state}'")
+        action_handler.report_progress "Resource Template deployment reached end state of '#{provisioning_state}'."
       end
 
       def retrieve_provisioning_state

data/lib/chef/provisioning/azurerm.rb

@@ -2,10 +2,8 @@ require 'chef/provisioning'
 require 'chef/provisioning/version'
 require 'chef/provisioning/azurerm/driver'
 require 'chef/provisioning/azurerm/version'
-Chef::Log.info('  __ _ _____   _ _ __ ___ ')
-Chef::Log.info(" / _` |_  / | | | '__/ _ \\ chef-client #{Chef::VERSION}")
-Chef::Log.info("| (_| |/ /| |_| | | |  __/ chef-provisioning-azurerm #{Chef::Provisioning::AzureRM::VERSION}")
-Chef::Log.info(" \\__,_/___|\\__,_|_|  \\___| chef-provisioning #{Chef::Provisioning::VERSION}")
+Chef::Log.info("chef-provisioning-azurerm #{Chef::Provisioning::AzureRM::VERSION}")
+Chef::Log.info("chef-provisioning #{Chef::Provisioning::VERSION}")
 
 resources = %w(resource_group resource_template storage_account)
 resources.each do |r|

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

@@ -37,7 +37,7 @@ class Chef
           end
           response
         end
-        
+
         # Wraps a call to the Azure REST API with retry and timeout capability.
         def azure_call_until_expected_response(method, url, data, success_codes, wait_time)
           time_elapsed = 0

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

@@ -1,7 +1,7 @@
 class Chef
   module Provisioning
     module AzureRM
-      VERSION = '0.2.13'
+      VERSION = '0.2.14'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-provisioning-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef