kitchen-azurerm 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d41d3dc84115d01efb811a9b47efadad76b3dbf
-  data.tar.gz: 0caf860272a7d70f7356889b2b1b013123541a53
+  metadata.gz: 5913806cea6adac232bb78ca36c28a3c5d5d8543
+  data.tar.gz: c6299ff17af05d0998a91ff49aacc8c46593e394
 SHA512:
-  metadata.gz: 48b2098a84cf1a4c68e6289578cfa94c2d9e7fc769ce7ff77691d0df6f86a4f642594497be6569a120afa3107ad747cef38a4ad8b808c9ddc70ad63065e485e1
-  data.tar.gz: 536e2e842cee0d13ec3b06819256608bb0f0c879e9417ce0ca66a6ed66b771061dcc8ad808facd85fc20210288eb6da866ba7ed1f0c6fe04a89c1b8866404870
+  metadata.gz: b2c2d28c4ef6d699aaf1f73d2f46c84314120feea1a21aee9d85b3315a3bb8f401a119302f21ec24585b96c0b602281240dd1637376c12b1b61b55eac3ab8cf0
+  data.tar.gz: 3cdea0e98ab8f30f6dc34b749e8697130a00074d4c84ff283007cfa1de3c10a6ce2ef9e55d926678a460d07f5a16f377ed1a4612bf8e45a5e17cfe070351b5ac

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # kitchen-azurerm Changelog
 
+## [0.6.0] - 2016-08-22
+- Supports latest autogenerated resources from Azure SDK for Ruby (0.5.0) (@stuartpreston)
+- Removes unnecessary direct depdendencies on older ms_rest libraries (@stuartpreston)
+- ssh_key will be used in preference to password if both are supplied (@stuartpreston) 
+
 ## [0.5.0] - 2016-08-07
 - Adding support for internal (e.g. ExpressRoute/VPN) access to created VM (@stuartpreston)
 

data/README.md

@@ -48,7 +48,7 @@ Note that the environment variables, if set, take preference over the values in
 
 ### .kitchen.yml example 1 - Linux/Ubuntu
 
-Here's an example ```.kitchen.yml``` file that provisions an Ubuntu Server, using Chef Zero as the provisioner and SSH as the transport. Note that if the key does not exist at the specified location, it will be created.
+Here's an example ```.kitchen.yml``` file that provisions an Ubuntu Server, using Chef Zero as the provisioner and SSH as the transport. Note that if the key does not exist at the specified location, it will be created. Also note that if ```ssh_key``` is supplied, Test Kitchen will use this in preference to any default/configured passwords that are supplied.
 
 ```yaml
 ---

data/lib/kitchen/driver/azurerm.rb

@@ -77,7 +77,7 @@ module Kitchen
           bootDiagnosticsEnabled: config[:boot_diagnostics_enabled],
           newStorageAccountName: "storage#{state[:uuid]}",
           adminUsername: state[:username],
-          adminPassword: state[:password],
+          adminPassword: state[:password] || 'P2ssw0rd',
           dnsNameForPublicIP: "kitchen-#{state[:uuid]}",
           imagePublisher: image_publisher,
           imageOffer: image_offer,
@@ -95,15 +95,10 @@ module Kitchen
         resource_group.location = config[:location]
         begin
           info "Creating Resource Group: #{state[:azure_resource_group_name]}"
-          resource_management_client.resource_groups.create_or_update(state[:azure_resource_group_name], resource_group).value!
+          resource_management_client.resource_groups.create_or_update(state[:azure_resource_group_name], resource_group)
         rescue ::MsRestAzure::AzureOperationError => operation_error
-          error_message = if operation_error.body.nil? == true
-                            operation_error.inspect
-                          else
-                            operation_error.body['error']
-                          end
-          info error_message
-          raise error_message
+          error operation_error.body
+          raise operation_error
         end
 
         # Execute deployment steps
@@ -111,12 +106,12 @@ module Kitchen
           if File.file?(config[:pre_deployment_template])
             pre_deployment_name = "pre-deploy-#{state[:uuid]}"
             info "Creating deployment: #{pre_deployment_name}"
-            resource_management_client.deployments.create_or_update(state[:azure_resource_group_name], pre_deployment_name, pre_deployment(config[:pre_deployment_template], config[:pre_deployment_parameters])).value!
+            resource_management_client.deployments.begin_create_or_update_async(state[:azure_resource_group_name], pre_deployment_name, pre_deployment(config[:pre_deployment_template], config[:pre_deployment_parameters])).value!
             follow_deployment_until_end_state(state[:azure_resource_group_name], pre_deployment_name)
           end
           deployment_name = "deploy-#{state[:uuid]}"
           info "Creating deployment: #{deployment_name}"
-          resource_management_client.deployments.create_or_update(state[:azure_resource_group_name], deployment_name, deployment(deployment_parameters)).value!
+          resource_management_client.deployments.begin_create_or_update_async(state[:azure_resource_group_name], deployment_name, deployment(deployment_parameters)).value!
         rescue ::MsRestAzure::AzureOperationError => operation_error
           rest_error = operation_error.body['error']
           deployment_active = rest_error['code'] == 'DeploymentActive'
@@ -134,19 +129,19 @@ module Kitchen
 
         if config[:vnet_id] == ''
           # Retrieve the public IP from the resource group:
-          network_management_client = ::Azure::ARM::Network::NetworkResourceProviderClient.new(credentials)
+          network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
           network_management_client.subscription_id = config[:subscription_id]
-          result = network_management_client.public_ip_addresses.get(state[:azure_resource_group_name], 'publicip').value!
-          info "IP Address is: #{result.body.properties.ip_address} [#{result.body.properties.dns_settings.fqdn}]"
-          state[:hostname] = result.body.properties.ip_address
+          result = network_management_client.public_ipaddresses.get(state[:azure_resource_group_name], 'publicip')
+          info "IP Address is: #{result.ip_address} [#{result.dns_settings.fqdn}]"
+          state[:hostname] = result.ip_address
         else
           # Retrieve the internal IP from the resource group:
-          network_management_client = ::Azure::ARM::Network::NetworkResourceProviderClient.new(credentials)
+          network_management_client = ::Azure::ARM::Network::NetworkManagementClient.new(credentials)
           network_management_client.subscription_id = config[:subscription_id]
           network_interfaces = ::Azure::ARM::Network::NetworkInterfaces.new(network_management_client)
-          result = network_interfaces.get(state[:azure_resource_group_name], 'nic').value!
-          info "IP Address is: #{result.body.properties.ip_configurations[0].properties.private_ipaddress}"
-          state[:hostname] = result.body.properties.ip_configurations[0].properties.private_ipaddress
+          result = network_interfaces.get(state[:azure_resource_group_name], 'nic')
+          info "IP Address is: #{result.ip_configurations[0].private_ipaddress}"
+          state[:hostname] = result.ip_configurations[0].private_ipaddress
         end
       end
 
@@ -161,7 +156,7 @@ module Kitchen
         [: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.delete(:password) unless instance.transport[:ssh_key].nil?
         state
       end
 
@@ -172,7 +167,7 @@ module Kitchen
 
       def template_for_transport_name
         template = JSON.parse(virtual_machine_deployment_template)
-        if instance.transport.name.casecmp('winrm') == 0
+        if instance.transport.name.casecmp('winrm').zero?
           encoded_command = Base64.strict_encode64(enable_winrm_powershell_script)
           command = command_to_execute
           template['resources'].select { |h| h['type'] == 'Microsoft.Compute/virtualMachines' }.each do |resource|
@@ -257,8 +252,8 @@ module Kitchen
       end
 
       def show_failed_operations(resource_group, deployment_name)
-        failed_operations = resource_management_client.deployment_operations.list(resource_group, deployment_name).value!
-        failed_operations.body.value.each do |val|
+        failed_operations = resource_management_client.deployment_operations.list(resource_group, deployment_name)
+        failed_operations.each do |val|
           resource_code = val.properties.status_code
           raise val.properties.status_message.inspect.to_s if resource_code != 'OK'
         end
@@ -266,9 +261,10 @@ module Kitchen
 
       def list_outstanding_deployment_operations(resource_group, deployment_name)
         end_operation_states = 'Failed,Succeeded'
-        deployment_operations = resource_management_client.deployment_operations.list(resource_group, deployment_name).value!
-        deployment_operations.body.value.each do |val|
+        deployment_operations = resource_management_client.deployment_operations.list(resource_group, deployment_name)
+        deployment_operations.each do |val|
           resource_provisioning_state = val.properties.provisioning_state
+
           resource_name = val.properties.target_resource.resource_name
           resource_type = val.properties.target_resource.resource_type
           end_operation_state_reached = end_operation_states.split(',').include?(resource_provisioning_state)
@@ -279,8 +275,8 @@ module Kitchen
       end
 
       def deployment_state(resource_group, deployment_name)
-        deployments = resource_management_client.deployments.get(resource_group, deployment_name).value!
-        deployments.body.properties.provisioning_state
+        deployments = resource_management_client.deployments.get(resource_group, deployment_name)
+        deployments.properties.provisioning_state
       end
 
       def destroy(state)
@@ -290,10 +286,10 @@ module Kitchen
         resource_management_client.subscription_id = state[:subscription_id]
         begin
           info "Destroying Resource Group: #{state[:azure_resource_group_name]}"
-          resource_management_client.resource_groups.begin_delete(state[:azure_resource_group_name]).value!
+          resource_management_client.resource_groups.begin_delete(state[:azure_resource_group_name])
           info 'Destroy operation accepted and will continue in the background.'
         rescue ::MsRestAzure::AzureOperationError => operation_error
-          info operation_error.body['error']
+          error operation_error.body
           raise operation_error
         end
         state.delete(:server_id)

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
@@ -28,58 +34,42 @@ dependencies:
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
-- !ruby/object:Gem::Dependency
-  name: ms_rest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+        version: '0.5'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-- !ruby/object:Gem::Dependency
-  name: ms_rest_azure
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+        version: '0.5'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
@@ -87,6 +77,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,20 +87,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-- !ruby/object:Gem::Dependency
-  name: concurrent-ruby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -201,4 +183,3 @@ signing_key:
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.
 test_files: []
-has_rdoc: