kitchen-azurerm 0.14.5 → 0.14.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48686c1b93c3d916cca41346cda4eb141a021d8d6308d148575253ad883cf248
-  data.tar.gz: 44a8318d01777d3b94d953981d80c189d5962493fdedf4a8b73b6d7b2750e135
+  metadata.gz: 117af76802af7dfe99cdbbd2dc8f04c2f604eb31ae84c13f0387f4d485d835a0
+  data.tar.gz: 81451cac13793b0e8e29c83ba9f3a9eafcc2e44db7cd39db7957fa7662497fd3
 SHA512:
-  metadata.gz: 9211a640370d4bd09dde5545dc115bd9844cbf09d25f4c5e01096141f5946163d8190182c04e6ad686328268ba5296881811ad61b452e052b8e76d89f35a2171
-  data.tar.gz: ef1d03c0850274e6cdebdfd980a13b030f36a3334f910113937c936b59036d9a9da59dcd71362b34bb9bfdf55fec496b08610c1fec49e893d4a7081456dd0b92
+  metadata.gz: ac2d7df5bbd0220e0a9b3d8b75c51c2c88e510fce94f8bf03a5f35e7f8e3b41a5e14755656668d1cd3c5532277c230a7c230650473a25bf5c6f22b0dfcd845d2
+  data.tar.gz: f2cac3f9976a1849fedfabbad3c50400b4a11858a988338eb72412258002b11d6d0c1717cb7a7814717412eaa5774da8e908daa3516eaf3e343bbcc95f9bed37

data/README.md

@@ -91,7 +91,7 @@ Where <n> is the number of threads to create. Note that any failure (e.g. an Azu
 
 ### .kitchen.yml example 2 - Windows
 
-Here's a further example ```.kitchen.yml``` file that will provision a Windows Server 2012 R2 instance, using WinRM as the transport. The resource created in Azure will enable itself for remote access at deployment time (it does this by customizing the machine at provisioning time):
+Here's a further example ```.kitchen.yml``` file that will provision a Windows Server 2012 R2 instance, using WinRM as the transport. The resource created in Azure will enable itself for remote access at deployment time (it does this by customizing the machine at provisioning time) and tags the Azure Resource Group with metadata using the ```resource_group_tags``` property. Notice that the ```vm_tags``` and ```resource_group_tags``` properties use a simple ```key : value``` structure per line:
 
 ```yaml
 ---
@@ -108,6 +108,9 @@ platforms:
   - name: windows2012-r2
     driver:
       image_urn: MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest
+      resource_group_tags:
+        project: 'My Cool Project'
+        contact: 'me@somewhere.com'
     transport:
       name: winrm
 suites:

data/lib/kitchen/driver/azurerm.rb

@@ -1,14 +1,14 @@
-require 'kitchen'
-require 'kitchen/driver/credentials'
-require 'securerandom'
-require 'azure_mgmt_resources'
-require 'azure_mgmt_network'
-require 'base64'
-require 'sshkey'
-require 'fileutils'
-require 'erb'
-require 'ostruct'
-require 'json'
+require "kitchen"
+require "kitchen/driver/credentials"
+require "securerandom"
+require "azure_mgmt_resources"
+require "azure_mgmt_network"
+require "base64"
+require "sshkey"
+require "fileutils"
+require "erb"
+require "ostruct"
+require "json"
 
 module Kitchen
   module Driver
@@ -19,11 +19,11 @@ module Kitchen
       attr_accessor :resource_management_client
 
       default_config(:azure_resource_group_prefix) do |_config|
-        'kitchen-'
+        "kitchen-"
       end
 
       default_config(:azure_resource_group_suffix) do |_config|
-        ''
+        ""
       end
 
       default_config(:azure_resource_group_name) do |config|
@@ -34,64 +34,68 @@ module Kitchen
         nil
       end
 
+      default_config(:resource_group_tags) do |_config|
+        {}
+      end
+
       default_config(:image_urn) do |_config|
-        'Canonical:UbuntuServer:14.04.3-LTS:latest'
+        "Canonical:UbuntuServer:14.04.3-LTS:latest"
       end
 
       default_config(:image_url) do |_config|
-        ''
+        ""
       end
 
       default_config(:image_id) do |_config|
-        ''
+        ""
       end
 
       default_config(:os_disk_size_gb) do |_config|
-        ''
+        ""
       end
 
       default_config(:os_type) do |_config|
-        'linux'
+        "linux"
       end
 
       default_config(:custom_data) do |_config|
-        ''
+        ""
       end
 
       default_config(:username) do |_config|
-        'azure'
+        "azure"
       end
 
       default_config(:password) do |_config|
-        'P2ssw0rd'
+        "P2ssw0rd"
       end
 
       default_config(:vm_name) do |_config|
-        'vm'
+        "vm"
       end
 
       default_config(:vnet_id) do |_config|
-        ''
+        ""
       end
 
       default_config(:subnet_id) do |_config|
-        ''
+        ""
       end
 
       default_config(:storage_account_type) do |_config|
-        'Standard_LRS'
+        "Standard_LRS"
       end
 
       default_config(:existing_storage_account_blob_url) do |_config|
-        ''
+        ""
       end
 
       default_config(:existing_storage_account_container) do |_config|
-        'vhds'
+        "vhds"
       end
 
       default_config(:boot_diagnostics_enabled) do |_config|
-        'true'
+        "true"
       end
 
       default_config(:winrm_powershell_script) do |_config|
@@ -99,11 +103,11 @@ module Kitchen
       end
 
       default_config(:azure_environment) do |_config|
-        'Azure'
+        "Azure"
       end
 
       default_config(:pre_deployment_template) do |_config|
-        ''
+        ""
       end
 
       default_config(:pre_deployment_parameters) do |_config|
@@ -111,7 +115,7 @@ module Kitchen
       end
 
       default_config(:post_deployment_template) do |_config|
-        ''
+        ""
       end
 
       default_config(:post_deployment_parameters) do |_config|
@@ -159,48 +163,48 @@ module Kitchen
           bootDiagnosticsEnabled: config[:boot_diagnostics_enabled],
           newStorageAccountName: "storage#{state[:uuid]}",
           adminUsername: state[:username],
-          adminPassword: state[:password] || 'P2ssw0rd',
+          adminPassword: state[:password] || "P2ssw0rd",
           dnsNameForPublicIP: "kitchen-#{state[:uuid]}",
-          vmName: state[:vm_name]
+          vmName: state[:vm_name],
         }
 
-        if config[:subscription_id].to_s == ''
-          raise 'A subscription_id config value was not detected and kitchen-azurerm cannot continue. Please check your .kitchen.yml configuration. Exiting.'
+        if config[:subscription_id].to_s == ""
+          raise "A subscription_id config value was not detected and kitchen-azurerm cannot continue. Please check your .kitchen.yml configuration. Exiting."
         end
 
-        if config[:custom_data].to_s != ''
-          deployment_parameters['customData'] = prepared_custom_data
+        if config[:custom_data].to_s != ""
+          deployment_parameters["customData"] = prepared_custom_data
         end
         # When deploying in a shared storage account, we needs to add
         # a unique suffix to support multiple kitchen instances
-        if config[:existing_storage_account_blob_url].to_s != ''
-          deployment_parameters['osDiskNameSuffix'] = "-#{state[:azure_resource_group_name]}"
+        if config[:existing_storage_account_blob_url].to_s != ""
+          deployment_parameters["osDiskNameSuffix"] = "-#{state[:azure_resource_group_name]}"
         end
-        if config[:existing_storage_account_blob_url].to_s != ''
-          deployment_parameters['existingStorageAccountBlobURL'] = config[:existing_storage_account_blob_url]
+        if config[:existing_storage_account_blob_url].to_s != ""
+          deployment_parameters["existingStorageAccountBlobURL"] = config[:existing_storage_account_blob_url]
         end
-        if config[:existing_storage_account_container].to_s != ''
-          deployment_parameters['existingStorageAccountBlobContainer'] = config[:existing_storage_account_container]
+        if config[:existing_storage_account_container].to_s != ""
+          deployment_parameters["existingStorageAccountBlobContainer"] = config[:existing_storage_account_container]
         end
-        if config[:os_disk_size_gb].to_s != ''
-          deployment_parameters['osDiskSizeGb'] = config[:os_disk_size_gb]
+        if config[:os_disk_size_gb].to_s != ""
+          deployment_parameters["osDiskSizeGb"] = config[:os_disk_size_gb]
         end
 
         # The three deployment modes
         #  a) Private Image: Managed VM Image (by id)
         #  b) Private Image: Using a VHD URL (note: we must use existing_storage_account_blob_url due to azure limitations)
         #  c) Public Image: Using a marketplace image (urn)
-        if config[:image_id].to_s != ''
-          deployment_parameters['imageId'] = config[:image_id]
-        elsif config[:image_url].to_s != ''
-          deployment_parameters['imageUrl'] = config[:image_url]
-          deployment_parameters['osType'] = config[:os_type]
+        if config[:image_id].to_s != ""
+          deployment_parameters["imageId"] = config[:image_id]
+        elsif config[:image_url].to_s != ""
+          deployment_parameters["imageUrl"] = config[:image_url]
+          deployment_parameters["osType"] = config[:os_type]
         else
-          image_publisher, image_offer, image_sku, image_version = config[:image_urn].split(':', 4)
-          deployment_parameters['imagePublisher'] = image_publisher
-          deployment_parameters['imageOffer'] = image_offer
-          deployment_parameters['imageSku'] = image_sku
-          deployment_parameters['imageVersion'] = image_version
+          image_publisher, image_offer, image_sku, image_version = config[:image_urn].split(":", 4)
+          deployment_parameters["imagePublisher"] = image_publisher
+          deployment_parameters["imageOffer"] = image_offer
+          deployment_parameters["imageSku"] = image_sku
+          deployment_parameters["imageVersion"] = image_version
         end
 
         options = Kitchen::Driver::Credentials.new.azure_options_for_subscription(config[:subscription_id], config[:azure_environment])
@@ -211,6 +215,7 @@ module Kitchen
         # Create Resource Group
         resource_group = ::Azure::Resources::Profiles::Latest::Mgmt::Models::ResourceGroup.new
         resource_group.location = config[:location]
+        resource_group.tags = config[:resource_group_tags]
         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)
@@ -238,8 +243,8 @@ module Kitchen
             follow_deployment_until_end_state(state[:azure_resource_group_name], post_deployment_name)
           end
         rescue ::MsRestAzure::AzureOperationError => operation_error
-          rest_error = operation_error.body['error']
-          deployment_active = rest_error['code'] == 'DeploymentActive'
+          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."
@@ -251,15 +256,15 @@ module Kitchen
 
         network_management_client = ::Azure::Network::Profiles::Latest::Mgmt::Client.new(options)
 
-        if config[:vnet_id] == '' || config[:public_ip]
+        if config[:vnet_id] == "" || config[:public_ip]
           # Retrieve the public IP from the resource group:
-          result = network_management_client.public_ipaddresses.get(state[:azure_resource_group_name], 'publicip')
+          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_interfaces = ::Azure::Network::Profiles::Latest::Mgmt::NetworkInterfaces.new(network_management_client)
-          result = network_interfaces.get(state[:azure_resource_group_name], 'nic')
+          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
@@ -273,7 +278,7 @@ module Kitchen
         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)
-        %i[subscription_id username password vm_name azure_environment use_managed_disks].each do |config_element|
+        %i{subscription_id username password vm_name azure_environment use_managed_disks}.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?
@@ -281,7 +286,7 @@ module Kitchen
       end
 
       def azure_resource_group_name
-        formatted_time = Time.now.utc.strftime '%Y%m%dT%H%M%S'
+        formatted_time = Time.now.utc.strftime "%Y%m%dT%H%M%S"
         return "#{config[:azure_resource_group_prefix]}#{config[:azure_resource_group_name]}-#{formatted_time}#{config[:azure_resource_group_suffix]}" unless config[:explicit_resource_group_name]
         config[:explicit_resource_group_name]
       end
@@ -292,7 +297,7 @@ module Kitchen
 
         if config[:use_managed_disks]
           config[:data_disks].each do |data_disk|
-            disks << { name: "datadisk#{data_disk[:lun]}", lun: data_disk[:lun], diskSizeGB: data_disk[:disk_size_gb], createOption: 'Empty' }
+            disks << { name: "datadisk#{data_disk[:lun]}", lun: data_disk[:lun], diskSizeGB: data_disk[:disk_size_gb], createOption: "Empty" }
           end
           debug "Additional disks being added to configuration: #{disks.inspect}"
         else
@@ -303,13 +308,13 @@ module Kitchen
 
       def template_for_transport_name
         template = JSON.parse(virtual_machine_deployment_template)
-        if instance.transport.name.casecmp('winrm').zero?
-          if instance.platform.name.index('nano').nil?
-            info 'Adding WinRM configuration to provisioning profile.'
+        if instance.transport.name.casecmp("winrm") == 0
+          if instance.platform.name.index("nano").nil?
+            info "Adding WinRM configuration to provisioning profile."
             encoded_command = Base64.strict_encode64(custom_data_script_windows)
-            template['resources'].select { |h| h['type'] == 'Microsoft.Compute/virtualMachines' }.each do |resource|
-              resource['properties']['osProfile']['customData'] = encoded_command
-              resource['properties']['osProfile']['windowsConfiguration'] = windows_unattend_content
+            template["resources"].select { |h| h["type"] == "Microsoft.Compute/virtualMachines" }.each do |resource|
+              resource["properties"]["osProfile"]["customData"] = encoded_command
+              resource["properties"]["osProfile"]["windowsConfiguration"] = windows_unattend_content
             end
           end
         end
@@ -317,8 +322,8 @@ module Kitchen
         unless instance.transport[:ssh_key].nil?
           info "Adding public key from #{File.expand_path(instance.transport[:ssh_key])}.pub to the deployment."
           public_key = public_key_for_deployment(File.expand_path(instance.transport[:ssh_key]))
-          template['resources'].select { |h| h['type'] == 'Microsoft.Compute/virtualMachines' }.each do |resource|
-            resource['properties']['osProfile']['linuxConfiguration'] = JSON.parse(custom_linux_configuration(public_key))
+          template["resources"].select { |h| h["type"] == "Microsoft.Compute/virtualMachines" }.each do |resource|
+            resource["properties"]["osProfile"]["linuxConfiguration"] = JSON.parse(custom_linux_configuration(public_key))
           end
         end
         template.to_json
@@ -330,12 +335,12 @@ module Kitchen
 
           ::FileUtils.mkdir_p(File.dirname(private_key_filename))
 
-          private_key_file = File.new(private_key_filename, 'w')
+          private_key_file = File.new(private_key_filename, "w")
           private_key_file.syswrite(k.private_key)
           private_key_file.chmod(0600)
           private_key_file.close
 
-          public_key_file = File.new("#{private_key_filename}.pub", 'w')
+          public_key_file = File.new("#{private_key_filename}.pub", "w")
           public_key_file.syswrite(k.ssh_public_key)
           public_key_file.chmod(0600)
           public_key_file.close
@@ -381,7 +386,7 @@ module Kitchen
       end
 
       def empty_deployment
-        template = virtual_machine_deployment_template_file('empty.erb', nil)
+        template = virtual_machine_deployment_template_file("empty.erb", nil)
         empty_deployment = ::Azure::Resources::Profiles::Latest::Mgmt::Models::Deployment.new
         empty_deployment.properties = ::Azure::Resources::Profiles::Latest::Mgmt::Models::DeploymentProperties.new
         empty_deployment.properties.mode = ::Azure::Resources::Profiles::Latest::Mgmt::Models::DeploymentMode::Complete
@@ -391,7 +396,7 @@ module Kitchen
       end
 
       def vm_tag_string(vm_tags_in)
-        tag_string = ''
+        tag_string = ""
         unless vm_tags_in.empty?
           tag_array = vm_tags_in.map do |key, value|
             "\"#{key}\": \"#{value}\",\n"
@@ -405,34 +410,34 @@ module Kitchen
 
       def parameters_in_values_format(parameters_in)
         parameters = parameters_in.map do |key, value|
-          { key.to_sym => { 'value' => value } }
+          { key.to_sym => { "value" => value } }
         end
         parameters.reduce(:merge!)
       end
 
       def follow_deployment_until_end_state(resource_group, deployment_name)
-        end_provisioning_states = 'Canceled,Failed,Deleted,Succeeded'
+        end_provisioning_states = "Canceled,Failed,Deleted,Succeeded"
         end_provisioning_state_reached = false
         until end_provisioning_state_reached
           list_outstanding_deployment_operations(resource_group, deployment_name)
           sleep 10
           deployment_provisioning_state = deployment_state(resource_group, deployment_name)
-          end_provisioning_state_reached = end_provisioning_states.split(',').include?(deployment_provisioning_state)
+          end_provisioning_state_reached = end_provisioning_states.split(",").include?(deployment_provisioning_state)
         end
         info "Resource Template deployment reached end state of '#{deployment_provisioning_state}'."
-        show_failed_operations(resource_group, deployment_name) if deployment_provisioning_state == 'Failed'
+        show_failed_operations(resource_group, deployment_name) if deployment_provisioning_state == "Failed"
       end
 
       def show_failed_operations(resource_group, deployment_name)
         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'
+          raise val.properties.status_message.inspect.to_s if resource_code != "OK"
         end
       end
 
       def list_outstanding_deployment_operations(resource_group, deployment_name)
-        end_operation_states = 'Failed,Succeeded'
+        end_operation_states = "Failed,Succeeded"
         deployment_operations = resource_management_client.deployment_operations.list(resource_group, deployment_name)
         deployment_operations.each do |val|
           resource_provisioning_state = val.properties.provisioning_state
@@ -440,7 +445,7 @@ module Kitchen
             resource_name = val.properties.target_resource.resource_name
             resource_type = val.properties.target_resource.resource_type
           end
-          end_operation_state_reached = end_operation_states.split(',').include?(resource_provisioning_state)
+          end_operation_state_reached = end_operation_states.split(",").include?(resource_provisioning_state)
           unless end_operation_state_reached
             info "Resource #{resource_type} '#{resource_name}' provisioning status is #{resource_provisioning_state}"
           end
@@ -457,7 +462,7 @@ module Kitchen
         options = Kitchen::Driver::Credentials.new.azure_options_for_subscription(state[:subscription_id], state[:azure_environment])
         @resource_management_client = ::Azure::Resources::Profiles::Latest::Mgmt::Client.new(options)
         if config[:destroy_resource_group_contents] == true
-          info 'Destroying individual resources within the Resource Group.'
+          info "Destroying individual resources within the Resource Group."
           empty_deployment_name = "empty-deploy-#{state[:uuid]}"
           begin
             info "Creating deployment: #{empty_deployment_name}"
@@ -477,7 +482,7 @@ module Kitchen
         begin
           info "Destroying Resource Group: #{state[:azure_resource_group_name]}"
           resource_management_client.resource_groups.begin_delete(state[:azure_resource_group_name])
-          info 'Destroy operation accepted and will continue in the background.'
+          info "Destroy operation accepted and will continue in the background."
         rescue ::MsRestAzure::AzureOperationError => operation_error
           error operation_error.body
           raise operation_error
@@ -503,7 +508,7 @@ module Kitchen
 
       def format_data_disks_powershell_script
         return unless config[:format_data_disks]
-        info 'Data disks will be initialized and formatted NTFS automatically.' unless config[:data_disks].nil?
+        info "Data disks will be initialized and formatted NTFS automatically." unless config[:data_disks].nil?
         config[:format_data_disks_powershell_script] ||
           <<-PS1
   Write-Host "Initializing and formatting raw disks"
@@ -559,45 +564,45 @@ module Kitchen
         {
           additionalUnattendContent: [
             {
-              passName: 'oobeSystem',
-              componentName: 'Microsoft-Windows-Shell-Setup',
-              settingName: 'FirstLogonCommands',
-              content: '<FirstLogonCommands><SynchronousCommand><CommandLine>cmd /c "copy C:\\AzureData\\CustomData.bin C:\\Config.ps1"</CommandLine><Description>copy</Description><Order>1</Order></SynchronousCommand><SynchronousCommand><CommandLine>%windir%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe -NoProfile -ExecutionPolicy Bypass -file C:\\Config.ps1</CommandLine><Description>script</Description><Order>2</Order></SynchronousCommand></FirstLogonCommands>'
+              passName: "oobeSystem",
+              componentName: "Microsoft-Windows-Shell-Setup",
+              settingName: "FirstLogonCommands",
+              content: '<FirstLogonCommands><SynchronousCommand><CommandLine>cmd /c "copy C:\\AzureData\\CustomData.bin C:\\Config.ps1"</CommandLine><Description>copy</Description><Order>1</Order></SynchronousCommand><SynchronousCommand><CommandLine>%windir%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe -NoProfile -ExecutionPolicy Bypass -file C:\\Config.ps1</CommandLine><Description>script</Description><Order>2</Order></SynchronousCommand></FirstLogonCommands>',
             },
             {
-              passName: 'oobeSystem',
-              componentName: 'Microsoft-Windows-Shell-Setup',
-              settingName: 'AutoLogon',
-              content: "[concat('<AutoLogon><Password><Value>', parameters('adminPassword'), '</Value></Password><Enabled>true</Enabled><LogonCount>1</LogonCount><Username>', parameters('adminUserName'), '</Username></AutoLogon>')]"
+              passName: "oobeSystem",
+              componentName: "Microsoft-Windows-Shell-Setup",
+              settingName: "AutoLogon",
+              content: "[concat('<AutoLogon><Password><Value>', parameters('adminPassword'), '</Value></Password><Enabled>true</Enabled><LogonCount>1</LogonCount><Username>', parameters('adminUserName'), '</Username></AutoLogon>')]",
             }
-          ]
+          ],
         }
       end
 
       def virtual_machine_deployment_template
-        if config[:vnet_id] == ''
-          virtual_machine_deployment_template_file('public.erb', vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json)
+        if config[:vnet_id] == ""
+          virtual_machine_deployment_template_file("public.erb", vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json)
         else
           info "Using custom vnet: #{config[:vnet_id]}"
-          virtual_machine_deployment_template_file('internal.erb', vnet_id: config[:vnet_id], subnet_id: config[:subnet_id], public_ip: config[:public_ip], vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json)
+          virtual_machine_deployment_template_file("internal.erb", vnet_id: config[:vnet_id], subnet_id: config[:subnet_id], public_ip: config[:public_ip], vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], existing_storage_account_blob_url: config[:existing_storage_account_blob_url], image_id: config[:image_id], existing_storage_account_container: config[:existing_storage_account_container], custom_data: config[:custom_data], os_disk_size_gb: config[:os_disk_size_gb], data_disks_for_vm_json: data_disks_for_vm_json)
         end
       end
 
       def virtual_machine_deployment_template_file(template_file, data = {})
-        template = File.read(File.expand_path(File.join(__dir__, '../../../templates', template_file)))
+        template = File.read(File.expand_path(File.join(__dir__, "../../../templates", template_file)))
         render_binding = OpenStruct.new(data)
-        ERB.new(template, nil, '-').result(render_binding.instance_eval { binding })
+        ERB.new(template, nil, "-").result(render_binding.instance_eval { binding })
       end
 
       def resource_manager_endpoint_url(azure_environment)
         case azure_environment.downcase
-        when 'azureusgovernment'
+        when "azureusgovernment"
           MsRestAzure::AzureEnvironments::AzureUSGovernment.resource_manager_endpoint_url
-        when 'azurechina'
+        when "azurechina"
           MsRestAzure::AzureEnvironments::AzureChinaCloud.resource_manager_endpoint_url
-        when 'azuregermancloud'
+        when "azuregermancloud"
           MsRestAzure::AzureEnvironments::AzureGermanCloud.resource_manager_endpoint_url
-        when 'azure'
+        when "azure"
           MsRestAzure::AzureEnvironments::AzureCloud.resource_manager_endpoint_url
         end
       end

data/lib/kitchen/driver/credentials.rb

@@ -1,4 +1,4 @@
-require 'inifile'
+require "inifile"
 
 module Kitchen
   module Driver
@@ -12,7 +12,7 @@ module Kitchen
       # Creates and initializes a new instance of the Credentials class.
       #
       def initialize
-        config_file = ENV['AZURE_CONFIG_FILE'] || File.expand_path(CONFIG_PATH)
+        config_file = ENV["AZURE_CONFIG_FILE"] || File.expand_path(CONFIG_PATH)
         if File.file?(config_file)
           @credentials = IniFile.load(File.expand_path(config_file))
         else
@@ -29,10 +29,10 @@ module Kitchen
       #
       # @return [Object] Object that can be supplied along with all Azure client requests.
       #
-      def azure_options_for_subscription(subscription_id, azure_environment = 'Azure')
-        tenant_id = ENV['AZURE_TENANT_ID'] || @credentials[subscription_id]['tenant_id']
-        client_id = ENV['AZURE_CLIENT_ID'] || @credentials[subscription_id]['client_id']
-        client_secret = ENV['AZURE_CLIENT_SECRET'] || @credentials[subscription_id]['client_secret']
+      def azure_options_for_subscription(subscription_id, azure_environment = "Azure")
+        tenant_id = ENV["AZURE_TENANT_ID"] || @credentials[subscription_id]["tenant_id"]
+        client_id = ENV["AZURE_CLIENT_ID"] || @credentials[subscription_id]["client_id"]
+        client_secret = ENV["AZURE_CLIENT_SECRET"] || @credentials[subscription_id]["client_secret"]
         token_provider = ::MsRestAzure::ApplicationTokenProvider.new(tenant_id, client_id, client_secret, ad_settings_for_azure_environment(azure_environment))
         options = { tenant_id: tenant_id,
                     client_id: client_id,
@@ -52,13 +52,13 @@ module Kitchen
       #
       def ad_settings_for_azure_environment(azure_environment)
         case azure_environment.downcase
-        when 'azureusgovernment'
+        when "azureusgovernment"
           ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_us_government_settings
-        when 'azurechina'
+        when "azurechina"
           ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_china_settings
-        when 'azuregermancloud'
+        when "azuregermancloud"
           ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_german_settings
-        when 'azure'
+        when "azure"
           ::MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
         end
       end
@@ -71,13 +71,13 @@ module Kitchen
       #
       def endpoint_settings_for_azure_environment(azure_environment)
         case azure_environment.downcase
-        when 'azureusgovernment'
+        when "azureusgovernment"
           ::MsRestAzure::AzureEnvironments::AzureUSGovernment
-        when 'azurechina'
+        when "azurechina"
           ::MsRestAzure::AzureEnvironments::AzureChinaCloud
-        when 'azuregermancloud'
+        when "azuregermancloud"
           ::MsRestAzure::AzureEnvironments::AzureGermanCloud
-        when 'azure'
+        when "azure"
           ::MsRestAzure::AzureEnvironments::AzureCloud
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.14.5
+  version: 0.14.6
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-30 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
+        version: '0.18'
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
+        version: '0.18'
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
+        version: '0.17'
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.17.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
-    - - ">="
+        version: '0.17'
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.15.0
+        version: 0.17.2
 - !ruby/object:Gem::Dependency
   name: inifile
   requirement: !ruby/object:Gem::Requirement
@@ -108,36 +108,30 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: chefstyle
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.58'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.58'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.58.1
+        version: '0'
 description: Test Kitchen driver for the Microsoft Azure Resource Manager (ARM) API
 email:
 - stuart@chef.io
@@ -145,7 +139,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE
 - README.md
 - lib/kitchen/driver/azurerm.rb

data/CHANGELOG.md

@@ -1,129 +0,0 @@
-# kitchen-azurerm Changelog
-
-## [0.14.5] - 2018-09-30
-- Support Shared Image Gallery (preview Azure feature) (@zanecodes)
-
-## [0.14.4] - 2018-08-10
-- Adding capability to execute ARM template after VM deployment, ```post_deployment_template``` and ```post_deployment_parameters``` added (@sebastiankasprzak)
-
-## [0.14.3] - 2018-07-16
-- Add `destroy_resource_group_contents` (default: false) property to allow contents of Azure Resource Group to be deleted rather than entire Resource Group, fixes [#90](https://github.com/test-kitchen/kitchen-azurerm/issues/85)
-
-## [0.14.2] - 2018-07-09
-- Add `destroy_explicit_resource_group` (default: false) property to allow reuse of specific Azure RG, fixes [#85](https://github.com/test-kitchen/kitchen-azurerm/issues/85)
-
-## [0.14.1] - 2018-05-10
-- Support for soverign clouds with latest Azure SDK for Ruby, fixes [#79](https://github.com/test-kitchen/kitchen-azurerm/issues/79)
-- Raise error when subscription_id is not available, fixes [#74](https://github.com/test-kitchen/kitchen-azurerm/issues/74)
-
-## [0.14.0] - 2018-04-10
-- Update Azure SDK to latest version, upgrade to latest build tools
-
-## [0.13.0] - 2017-12-26
-- Switch to new Microsoft telemetry system [#73](https://github.com/test-kitchen/kitchen-azurerm/issues/73)
-
-## [0.12.4] - 2017-11-17
-- Adding `explicit_resource_group_name` property to driver configuration
-
-## [0.12.3] - 2017-10-18
-- Pinning to version 0.14.0 of Microsoft Azure SDK for Ruby, avoid namespace changes
-
-## [0.12.2] - 2017-09-20
-- Fix issue with location of data_disks in internal.erb [#67](https://github.com/test-kitchen/kitchen-azurerm/pull/67https://github.com/test-kitchen/kitchen-azurerm/pull/67) (@ehanlon)
-
-## [0.12.1] - 2017-09-10
-- Fix for undefined local variable when using pre_deployment_template [#65](https://github.com/test-kitchen/kitchen-azurerm/issue/65)
-
-## [0.12.0] - 2017-09-01
-- Additional managed disks can be specified in configuration and left unformatted or formatted on Windows(@stuartpreston)
-- Added `azure_resource_group_prefix` and `azure_resource_group_suffix` parameter (@stuartpreston)
-
-## [0.11.0] - 2017-07-20
-- Pin to latest ARM SDK and constants [#59](https://github.com/test-kitchen/kitchen-azurerm/pull/59) (@smurawski)
-
-## [0.10.0] - 2017-07-03
-- Support for custom images (@elconas)
-- Support for custom-data (Linux only) (@elconas)
-- Support for custom OS sizes (@elconas)
-
-## [0.9.1] - 2017-05-25
-- Support for Managed Disks enabled by default (@stuartpreston)
-- Add ```use_managed_disks``` driver_config parameter (@stuartpreston)
-
-## [0.9.0] - 2017-04-28
-- Support for AzureUSGovernment, AzureChina and AzureGermanCloud environments
-- Add ```azure_environment``` driver_config parameter (@stuartpreston)
-
-## [0.8.1] - 2017-02-28
-- Adding provider identifier tag to all created resources (@stuartpreston)
-
-## [0.8.0] - 2017-01-16
-- [Unattend.xml used instead of Custom Script Extension to inject WinRM configuration/AKA support proxy server configurations](https://github.com/pendrica/kitchen-azurerm/pull/44) (@hbuckle)
-- [Public IP addresses can now be used to connect even if the VM is connected to an existing subnet](https://github.com/pendrica/kitchen-azurerm/pull/42) (@vlesierse)
-- [Resource Tags can now be applied to the created VMsPR](https://github.com/pendrica/kitchen-azurerm/pull/38)  (@liamkirwan)
-
-## [0.7.2] - 2016-11-03
-- Bug: When repeating a completed deployment, deployment would fail with a nil error on resource_name (@stuartpreston)
-
-## [0.7.1] - 2016-09-17
-- Bug: WinRM is not enabled where the platform name does not contain 'nano' (@stuartpreston)
-
-## [0.7.0] - 2016-09-15
-- Support creation of Windows Nano Server (ignoring automatic WinRM setting application) (@stuartpreston)
-
-## [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)
-
-## [0.4.1] - 2016-07-01
-- Adding explicit depdendency on concurrent-ruby gem (@stuartpreston)
-
-## [0.4.0] - 2016-06-26
-- Adding capability to execute ARM template prior to VM deployment, ```pre_deployment_template``` and ```pre_deployment_parameters``` added (@stuartpreston)
-
-## [0.3.6] - 2016-05-10
-- Remove version pin on inifile gem dependency, compatible with newer ChefDK (@stuartpreston)
-
-## [0.3.5] - 2016-03-21
-- Remove transport name restriction on SSH key upload (allow rsync support) (@stuartpreston)
-- Support SSH public keys with newlines as generated by ssh-keygen (@stuartpreston) 
-
-## [0.3.4] - 2016-03-19
-- Additional diagnostics when Azure Resource Group fails to create successfully (@stuartpreston)
-
-## [0.3.3] - 2016-03-07
-- Pinning ms_rest_azure dependencies to avoid errors when using latest ms_rest_azure library (@stuartpreston)
-
-## [0.3.2] - 2016-03-07
-- Breaking: Linux machines are now created using a temporary sshkey (~/.ssh/id_kitchen-azurerm) instead of password (@stuartpreston)
-- Real error message shown if credentials are incorrect (@stuartpreston)
-
-## [0.2.4] - 2016-01-26
-- Support Premium Storage and Boot Diagnostics (@stuartpreston)
-- If deployment fails, show the message from the failing operation (@stuartpreston)
-- Updated Windows 2008 R2 example (@stuartpreston)
-
-## [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)
-
-## [0.2.1] - 2015-10-06
-- Pointing to updated Azure SDK for Ruby, supports Linux
-
-## [0.2.0] - 2015-09-29
-- Logs should be sent to info, not stdout (@stuartpreston)
-- Added WinRM support, enables WinRM and WinRM/s and configures server for Basic/Negotiate authentication (@stuartpreston) 
-- Store server_id earlier so it can be retrieved if resources fail to create in Azure (@stuartpreston)
-
-## [0.1.3] - 2015-09-23
-- Support *nix by changing the driver name to lowercase 'azurerm', remove Chef references (@gadgetmg)
-
-## [0.1.2] - 2015-09-23
-- Initial release, supports provision of all public image types in Azure (@stuartpreston)