kitchen-azurerm 0.14.8 → 0.14.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97bbd49be5ec263bf62071763c58b4c5e1fcf9fd43032182e4129ab648d480eb
-  data.tar.gz: 61b500b1cea1e867b23380aa4768aa1a48d301dd5ecd299b80508d54af5ce214
+  metadata.gz: 0ffc284510dde72d7b781d6069cdd68b7d52b3c5877f5826b99da3e0aa765397
+  data.tar.gz: 38d52dc77c023a9d38dd39857f5f467c053b029d906858f987bcd73b3d2d4d0b
 SHA512:
-  metadata.gz: 0f99b8ab2793552a5bf34d4264250d313284463ca409c26fd7fc899c8c9c44519a8dd1d102b3027fbe463b16ab1a4a7ed2a702005f45595ca045e45ec8dddb34
-  data.tar.gz: 824de194c5bc3ca87388acbf861d3aceef3db00adc9e66c5b1eedf7faa79836f7e113e722a838c36cef54ec2a7d213e825ddc2cf34ac77665a3ef4cca2e09281
+  metadata.gz: ae129c262879fe31efa2fae2c09177d85ca9b42901f5eb23077547f8cea1864c792490ce5ec76a04427304a74a8a7912333d33ee951b2ce31f35e2b0b02a5bf9
+  data.tar.gz: cec65b9e6683a321ecab5e86b82f0df8b90f51feb8488efc270a0b6e8ce30e02ad517f83e99f8b0b32d0443e860dd75b2ffe00a8a0b28b244c6655a8422b0710

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) 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:
+Here's a further example ```.kitchen.yml``` file that will provision a Windows Server 2019 [smalldisk] instance, using WinRM as the transport. An [ephemeral os disk](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/ephemeral-os-disks) is used. 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
 ---
@@ -99,15 +99,16 @@ driver:
   name: azurerm
   subscription_id: '4801fa9d-YOUR-GUID-HERE-b265ff49ce21'
   location: 'West Europe'
-  machine_size: 'Standard_D1'
+  machine_size: 'Standard_DS2_v2'
 
 provisioner:
   name: chef_zero
 
 platforms:
-  - name: windows2012-r2
+  - name: windows2019
     driver:
-      image_urn: MicrosoftWindowsServer:WindowsServer:2012-R2-Datacenter:latest
+      image_urn: MicrosoftWindowsServer:WindowsServer:2019-Datacenter-smalldisk:latest
+      use_ephemeral_osdisk: true
       resource_group_tags:
         project: 'My Cool Project'
         contact: 'me@somewhere.com'
@@ -601,6 +602,8 @@ info:    vm image list command OK
 - The ```azure_resource_group_prefix``` and ```azure_resource_group_suffix``` can be used to further disambiguate Azure resource group names created by the driver.
 - The ```explicit_resource_group_name``` and ```destroy_explicit_resource_group``` (default: "true") parameters can be used in scenarios where you are provided a pre-created Resource Group.  Example usage: ```explicit_resource_group_name: kitchen-<%= ENV["USERNAME"] %>```
 - The ```destroy_resource_group_contents``` (default: "false") parameter can be used when you want to destroy the resources within a resource group without destroying the resource group itself. For example, the following configuration options used in combination would use an existing resource group (or create one if it doesn't exist) and will destroy the contents of the resource group in the ```kitchen destroy``` phase.
+- The ```use_ephemeral_osdisk``` (default: false) parameter can be used if you wish to use [ephemeral OS disk functionality](https://docs.microsoft.com/en-us/azure/virtual-machines/linux/ephemeral-os-disks).
+
 ```
 ---
 driver:

data/lib/kitchen/driver/azurerm.rb

@@ -50,6 +50,10 @@ module Kitchen
         ""
       end
 
+      default_config(:use_ephemeral_osdisk) do |_config|
+        false
+      end
+
       default_config(:os_disk_size_gb) do |_config|
         ""
       end
@@ -162,6 +166,10 @@ module Kitchen
         false
       end
 
+      default_config(:deployment_sleep) do |_config|
+        10
+      end
+
       def create(state)
         state = validate_state(state)
         deployment_parameters = {
@@ -357,7 +365,11 @@ module Kitchen
 
           output = k.ssh_public_key
         else
-          output = File.read("#{private_key_filename}.pub")
+          output = if instance.transport[:ssh_public_key].nil?
+                     File.read("#{private_key_filename}.pub")
+                   else
+                     File.read(instance.transport[:ssh_public_key])
+                   end
         end
         output.strip
       end
@@ -430,7 +442,7 @@ module Kitchen
         end_provisioning_state_reached = false
         until end_provisioning_state_reached
           list_outstanding_deployment_operations(resource_group, deployment_name)
-          sleep 10
+          sleep config[:deployment_sleep]
           deployment_provisioning_state = deployment_state(resource_group, deployment_name)
           end_provisioning_state_reached = end_provisioning_states.split(",").include?(deployment_provisioning_state)
         end
@@ -591,10 +603,10 @@ module Kitchen
 
       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)
+          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, use_ephemeral_osdisk: config[:use_ephemeral_osdisk])
         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, use_ephemeral_osdisk: config[:use_ephemeral_osdisk])
         end
       end
 

data/templates/internal.erb

@@ -263,7 +263,7 @@
             }
         },
         {
-            "apiVersion": "2018-04-01",
+            "apiVersion": "2018-06-01",
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
@@ -300,7 +300,15 @@
                         "id": "[parameters('imageId')]"
                     },
                     <%- end -%>
-                    <%- if use_managed_disks -%>
+                    <%- if use_ephemeral_osdisk -%>
+                    "osDisk": { 
+                        "diffDiskSettings": { 
+                             "option": "Local" 
+                        }, 
+                        "caching": "ReadOnly", 
+                        "createOption": "FromImage" 
+                    }
+                    <%- elsif use_managed_disks -%>
                     "osDisk": {
                         "name": "osdisk",
                         <%- unless os_disk_size_gb.to_s.empty? -%>

data/templates/public.erb

@@ -282,7 +282,7 @@
             }
         },
         {
-            "apiVersion": "2018-04-01",
+            "apiVersion": "2018-06-01",
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
@@ -319,7 +319,15 @@
                         "id": "[parameters('imageId')]"
                     },
                     <%- end -%>
-                    <%- if use_managed_disks -%>
+                    <%- if use_ephemeral_osdisk -%>
+                    "osDisk": { 
+                        "diffDiskSettings": { 
+                             "option": "Local" 
+                        }, 
+                        "caching": "ReadOnly", 
+                        "createOption": "FromImage" 
+                    }
+                    <%- elsif use_managed_disks -%>
                     "osDisk": {
                         "name": "osdisk",
                         <%- unless os_disk_size_gb.to_s.empty? -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.14.8
+  version: 0.14.9
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
@@ -94,16 +94,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.