kitchen-azurerm 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29787238875126ef631e8c8ca2ca7ef3b4bc15a3
-  data.tar.gz: bbdbba0261c92a75c3ad7a8504cfb2f5f0af0c27
+  metadata.gz: 1f6ce83df5d29088ef7ebaaa11a832be94a7ee9d
+  data.tar.gz: 994ba64b254a493acd245aa68b01a80ba76733d9
 SHA512:
-  metadata.gz: dcfac8e444314e4b5129ba2d6ac6ff910ca32dc9d7c8838185be25b7d93946141027cbcd914a321a03633b9ece5349581486d5b98312bf8d0366edf9ec296660
-  data.tar.gz: 140e5bccad525b46067d5eaee07b8b2a97c24974ac8e3c5e3815cad06d10b3c4787bb7c7eef467999d41928ee0259fbe1bff4434855c8bfe196e4c7892ba0d31
+  metadata.gz: 52f3d5911c4c6982e777c9f6697245f701ceddc1475de7846c51327a563326bad9ddd2dc78556ba5ad8f5b95be33cf988e2faa3e474e9aa2a3f4c1579abe31ab
+  data.tar.gz: ef139a046982e8f0fb1d09c70a0e26f11720f145cff459703fea7c11c6e89ff6f4870abbe970639dd7351b5d3504d425772ed4a819448487112997a60858a275

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # knife-azurerm Changelog
 
+## [0.2.3] - 2015-12-17
+- ```kitchen create``` can now be executed multiple times, updating an existing deployment if an error occurs (@smurawski)
+
 ## [0.2.2] - 2015-12-10
 - Add an option for users to specify a custom script for WinRM (support Windows 2008 R2) (@andrewelizondo)
 - Add azure_management_url parameter for Azure Stack support (@andrewelizondo)

data/README.md

@@ -23,7 +23,7 @@ You will essentially need 4 parameters from the above article to configure kitch
 Using a text editor, open or create the file ```~/.azure/credentials``` and add the following section, noting there is one section per Subscription ID.  **Make sure you save the file with UTF-8 encoding** 
 
 ```ruby
-[abcd1234-YOUR-GUID-HERE-abcdef123456]
+[abcd1234-YOUR-SUBSCRIPTION-ID-HERE-abcdef123456]
 client_id = "48b9bba3-YOUR-GUID-HERE-90f0b68ce8ba"
 client_secret = "your-client-secret-here"
 tenant_id = "9c117323-YOUR-GUID-HERE-9ee430723ba3"

data/lib/kitchen/driver/azurerm.rb

@@ -42,15 +42,8 @@ module Kitchen
       end
 
       def create(state)
-        state[:uuid] = SecureRandom.hex(8)
-        formatted_time = Time.now.utc.strftime '%Y%m%dT%H%M%S'
-        state[:azure_resource_group_name] = "#{config[:azure_resource_group_name]}-#{formatted_time}"
-        state[:subscription_id] = config[:subscription_id]
-        state[:username] = config[:username]
-        state[:password] = config[:password]
-        state[:server_id] = "vm#{state[:uuid]}"
-        state[:vm_name] = config[:vm_name]
-        state[:azure_management_url] = config[:azure_management_url]
+        state = validate_state(state)
+
         image_publisher, image_offer, image_sku, image_version = config[:image_urn].split(':', 4)
         deployment_parameters = {
           location: config[:location],
@@ -87,8 +80,15 @@ module Kitchen
           info "Creating Deployment: #{deployment_name}"
           resource_management_client.deployments.create_or_update(state[:azure_resource_group_name], deployment_name, deployment(template_for_transport_name, deployment_parameters)).value!
         rescue ::MsRestAzure::AzureOperationError => operation_error
-          info operation_error.body['error']
-          raise operation_error
+          rest_error = operation_error.body['error']
+          deployment_active = rest_error['code'] == 'DeploymentActive'
+          if deployment_active
+            info "Deployment for resource group #{state[:azure_resource_group_name]} is ongoing."
+            info "If you need to change the deployment template you'll need to rerun `kitchen create` for this instance."
+          else
+            info rest_error
+            raise operation_error
+          end
         end
 
         # Monitor all operations until completion
@@ -102,6 +102,26 @@ module Kitchen
         state[:hostname] = result.body.properties.ip_address
       end
 
+      def existing_state_value?(state, property)
+        state.key?(property) && !state[property].nil?
+      end
+
+      def validate_state(state = {})
+        state[:uuid] = SecureRandom.hex(8) unless existing_state_value?(state, :uuid)
+        state[:server_id] = "vm#{state[:uuid]}" unless existing_state_value?(state, :server_id)
+        state[:azure_resource_group_name] = azure_resource_group_name unless existing_state_value?(state, :azure_resource_group_name)
+        [:subscription_id, :username, :password, :vm_name, :azure_management_url].each do |config_element|
+          state[config_element] = config[config_element] unless existing_state_value?(state, config_element)
+        end
+
+        state
+      end
+
+      def azure_resource_group_name
+        formatted_time = Time.now.utc.strftime '%Y%m%dT%H%M%S'
+        "#{config[:azure_resource_group_name]}-#{formatted_time}"
+      end
+
       def template_for_transport_name
         template = JSON.parse(virtual_machine_deployment_template)
         if instance.transport.name.downcase == 'winrm'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile