kitchen-azurerm 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f6ce83df5d29088ef7ebaaa11a832be94a7ee9d
-  data.tar.gz: 994ba64b254a493acd245aa68b01a80ba76733d9
+  metadata.gz: 33d86c79946c5a652e0fd1603cdf14fdc179335e
+  data.tar.gz: 2e34e99b5bd2bbbe9cb92d87d4c42824469d0839
 SHA512:
-  metadata.gz: 52f3d5911c4c6982e777c9f6697245f701ceddc1475de7846c51327a563326bad9ddd2dc78556ba5ad8f5b95be33cf988e2faa3e474e9aa2a3f4c1579abe31ab
-  data.tar.gz: ef139a046982e8f0fb1d09c70a0e26f11720f145cff459703fea7c11c6e89ff6f4870abbe970639dd7351b5d3504d425772ed4a819448487112997a60858a275
+  metadata.gz: 1a380d0cbde90c599b7c233da84da7a241102126799b25e2f39db8f290954df8b8df9b4bf65e4a8e0dea004d9518dbb00eba5fb1832d0a5a87b0acb80cdb3db6
+  data.tar.gz: d7e753de49129469a15a9270a2ccb245516ff0b5347ead22f7e9aa130270c11e042c246cc401b02ce00ec0b4b68da85b9b6a4a93d24bb3dabd190c4b7865679b

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-# knife-azurerm Changelog
+# kitchen-azurerm Changelog
+
+## [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)

data/README.md

@@ -75,14 +75,16 @@ suites:
     attributes:
 ```
 
-### Parallel execution
-Parallel execution of create/converge/destroy is supported via the --parallel parameter. Each machine is created in it's own Azure Resource Group so has no shared lifecycle with the other machines in the test run. To take advantage of parallel execution use the following command:
+### Concurrent execution
+Concurrent execution of create/converge/destroy is supported via the --concurrency parameter. Each machine is created in it's own Azure Resource Group so has no shared lifecycle with the other machines in the test run. To take advantage of parallel execution use the following command:
 
-```kitchen test --parallel```
+```kitchen test --concurrency <n>```
+
+Where <n> is the number of threads to create. Note that any failure (e.g. an AzureOperationError) will cause the whole test to fail, though resources already in creation will continue to be created.
 
 ### .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:
+Here's a further example ```.kitchen.yml``` file that will provision a Windows Server 2012 R2 instance as well as a Windows Server 2008 R2 instance, using WinRM as the transport. The resource created in Azure will enable itself for remote access at deployment time:
 
 **Note: Test Kitchen currently uses WinRM over HTTP rather than HTTPS. This means the temporary machine credentials traverse the internet in the clear. This will be changed once Test Kitchen fully supports WinRM over a secure channel.**
 
@@ -114,7 +116,6 @@ platforms:
         winrm set winrm/config '@{MaxTimeoutms="1800000"}'
         winrm set winrm/config/service '@{AllowUnencrypted="true"}'
         winrm set winrm/config/service/auth '@{Basic="true"}'
-        netsh advfirewall firewall set rule name="Windows Remote Management (HTTP-In)" profile=public protocol=tcp localport=5985 remoteip=localsubnet new remoteip=any
     transport:
       name: winrm
 suites:
@@ -158,8 +159,10 @@ data:    Canonical  UbuntuServer  15.10-DAILY        15.10.201509220  westeurope
 info:    vm image list command OK
 ```
 
-### Additional information/notes
-- driver_config also takes a username and password parameter, the defaults if these are not specified are "azure" and "P2ssw0rd" respectively.
+### Additional parameters:
+- Note that the ```driver_config``` section also takes a ```username``` and ```password``` parameter, the defaults if these are not specified are "azure" and "P2ssw0rd" respectively.
+- The ```storage_account_type``` parameter defaults to 'Standard_LRS' and allows you to switch to premium storage (e.g. 'Premium_LRS')
+- The ```enable_boot_diagnostics``` parameter defaults to 'true' and allows you to switch off boot diagnostics in case you are using premium storage.
 
 ## Contributing
 

data/lib/kitchen/driver/azurerm.rb

@@ -33,6 +33,14 @@ module Kitchen
         'vm'
       end
 
+      default_config(:storage_account_type) do |_config|
+        'Standard_LRS'
+      end
+
+      default_config(:boot_diagnostics_enabled) do |_config|
+        'true'
+      end
+
       default_config(:winrm_powershell_script) do |_config|
         false
       end
@@ -48,6 +56,8 @@ module Kitchen
         deployment_parameters = {
           location: config[:location],
           vmSize: config[:machine_size],
+          storageAccountType: config[:storage_account_type],
+          bootDiagnosticsEnabled: config[:boot_diagnostics_enabled],
           newStorageAccountName: "storage#{state[:uuid]}",
           adminUsername: state[:username],
           adminPassword: state[:password],
@@ -78,7 +88,7 @@ module Kitchen
         begin
           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(template_for_transport_name, deployment_parameters)).value!
+          resource_management_client.deployments.create_or_update(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'
@@ -124,21 +134,25 @@ module Kitchen
 
       def template_for_transport_name
         template = JSON.parse(virtual_machine_deployment_template)
-        if instance.transport.name.downcase == 'winrm'
+        if instance.transport.name.casecmp('winrm')
+          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|
-            resource['properties']['osProfile']['customData'] = Base64.strict_encode64(enable_winrm_powershell_script)
+            resource['properties']['osProfile']['customData'] = encoded_command
           end
-          template['resources'] << JSON.parse(custom_script_extension_template)
+          template['resources'] << JSON.parse(custom_script_extension_template(command))
         end
         template.to_json
       end
 
-      def deployment(template, parameters)
+      def deployment(parameters)
+        template = template_for_transport_name
         deployment = ::Azure::ARM::Resources::Models::Deployment.new
         deployment.properties = ::Azure::ARM::Resources::Models::DeploymentProperties.new
         deployment.properties.mode = Azure::ARM::Resources::Models::DeploymentMode::Incremental
         deployment.properties.template = JSON.parse(template)
         deployment.properties.parameters = parameters_in_values_format(parameters)
+        debug(deployment.properties.template)
         deployment
       end
 
@@ -159,6 +173,15 @@ module Kitchen
           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)
+      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|
+          resource_code = val.properties.status_code
+          fail val.properties.status_message.inspect.to_s if resource_code != 'OK'
+        end
       end
 
       def list_outstanding_deployment_operations(resource_group, deployment_name)
@@ -201,7 +224,6 @@ module Kitchen
 
       def enable_winrm_powershell_script
         config[:winrm_powershell_script] || <<-PS1
-New-SelfSignedCertificate -DnsName $env:COMPUTERNAME -CertStoreLocation Cert:\\LocalMachine\\My
 $cert = New-SelfSignedCertificate -DnsName $env:COMPUTERNAME -CertStoreLocation Cert:\\LocalMachine\\My
 $config = '@{CertificateThumbprint="' + $cert.Thumbprint + '"}'
 winrm create winrm/config/listener?Address=*+Transport=HTTPS $config
@@ -212,7 +234,11 @@ New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Wi
         PS1
       end
 
-      def custom_script_extension_template
+      def command_to_execute
+        'copy /y c:\\\\azuredata\\\\customdata.bin c:\\\\azuredata\\\\customdata.ps1 && powershell.exe -ExecutionPolicy Unrestricted -Command \\"start-process powershell.exe -verb runas -argumentlist c:\\\\azuredata\\\\customdata.ps1\\"'
+      end
+
+      def custom_script_extension_template(command)
         <<-EOH
         {
             "type": "Microsoft.Compute/virtualMachines/extensions",
@@ -227,7 +253,7 @@ New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Wi
                 "type": "CustomScriptExtension",
                 "typeHandlerVersion": "1.4",
                 "settings": {
-                    "commandToExecute": "powershell.exe -ExecutionPolicy Unrestricted -Command \\"gc c:\\\\azuredata\\\\customdata.bin | iex\\""
+                    "commandToExecute": "#{command}"
                 }
             }
         }
@@ -310,6 +336,20 @@ New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Wi
             "metadata": {
                 "description": "The vm name created inside of the resource group."
             }
+        },
+        "storageAccountType": {
+            "type": "string",
+            "defaultValue": "Standard_LRS",
+            "metadata": {
+                "description": "The type of storage to use (e.g. Standard_LRS or Premium_LRS)."
+            }
+        },
+        "bootDiagnosticsEnabled": {
+            "type": "string",
+            "defaultValue": "true",
+            "metadata": {
+                "description": "Whether to enable (true) or disable (false) boot diagnostics. Default: true (requires Standard storage)."
+            }
         }
     },
     "variables": {
@@ -319,7 +359,7 @@ New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Wi
         "addressPrefix": "10.0.0.0/16",
         "subnetName": "Subnet",
         "subnetPrefix": "10.0.0.0/24",
-        "storageAccountType": "Standard_LRS",
+        "storageAccountType": "[parameters('storageAccountType')]",
         "publicIPAddressName": "publicip",
         "publicIPAddressType": "Dynamic",
         "vmStorageAccountContainerName": "vhds",
@@ -441,7 +481,7 @@ New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Wi
                 },
                 "diagnosticsProfile": {
                     "bootDiagnostics": {
-                        "enabled": "false",
+                        "enabled": "[parameters('bootDiagnosticsEnabled')]",
                         "storageUri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net')]"
                     }
                 }

data/lib/kitchen/driver/credentials.rb

@@ -6,7 +6,7 @@ module Kitchen
     # Credentials
     #
     class Credentials
-      CONFIG_PATH = "#{ENV['HOME']}/.azure/credentials"
+      CONFIG_PATH = "#{ENV['HOME']}/.azure/credentials".freeze
 
       #
       # Creates and initializes a new instance of the Credentials class.

metadata

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