kitchen-azurerm 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d0eb72851f696b3ddaeb4a90b959d4a4319fa8711cafbae1c46c0abc5506fc5
-  data.tar.gz: 83d0b2a2604bd3cfedba07081f96ef39ac7bcc9d5170a4cc35f97656df4c02bc
+  metadata.gz: 83ff621acb68f00027da706be0a8cbcc9d1913ea0972a57596180d9d2cadc399
+  data.tar.gz: e32b5481b1ca6bec77dbe2f1da1f2be2d4c7236c8d35d6dd676e06979cdd69db
 SHA512:
-  metadata.gz: 9fc4b53f648b73a6e628c942ba01e56c9a7fa5f766d11a1ea6e2de4f553fa1f89a0b1058fca4d50e3ae8b8a48ec230141c3d2f116dd086585e8f4845945f0d5a
-  data.tar.gz: eb5db25247d145375fcd69050eaa9fdf9cf29262a06cb54443f21e85d2836c14e0e8d424279abde2375517d6b83c5c633480d864caff92d1d87224969b15decf
+  metadata.gz: 6dd5a780356dc995c62ebc6f8cd91038b8c02a670af1de28e43090011df9e48d2a96c59702353802b4f9719c3722dba9f83a30af0545305b966df4c7bc7f76c8
+  data.tar.gz: 5e69a4e0b62d614c4aab4d86e46a4ab18e4aba6366bdc0f92d6afa8e0e466c1ac57911b4cf1787b4f68294ab674916dbc6b5621a8603f3ab5a00a286f6d131d3

data/lib/kitchen/driver/azurerm.rb

@@ -740,7 +740,7 @@ module Kitchen
           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], ssh_key: instance.transport[:ssh_key], plan_json: plan_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, use_ephemeral_osdisk: config[:use_ephemeral_osdisk], ssh_key: instance.transport[:ssh_key], plan_json: plan_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], ssh_key: instance.transport[:ssh_key], public_ip_sku: config[:public_ip_sku], plan_json: plan_json)
         end
       end
 

data/templates/internal.erb

@@ -40,20 +40,22 @@
                 "description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
             }
         },
-	"publicIPSKU": {
-	    "type": "string",
-	    "defaultValue": "Standard",
-	    "metadata": {
-	        "description": "SKU name for the Public IP used to access the Virtual Machine."
-	    }
-	},
-	"publicIPAddressType": {
-	    "type": "string",
-	    "defaultValue": "Dynamic",
-	    "metadata": {
-	        "description": "SKU name for the Public IP used to access the Virtual Machine."
-	    }
-	},
+        <%- if public_ip_sku %>
+        "publicIPSKU": {
+            "type": "string",
+            "defaultValue": "Standard",
+            "metadata": {
+                "description": "SKU name for the Public IP used to access the Virtual Machine."
+            }
+        },
+        "publicIPAddressType": {
+            "type": "string",
+            "defaultValue": "Dynamic",
+            "metadata": {
+                "description": "SKU name for the Public IP used to access the Virtual Machine."
+            }
+        },
+        <%- end %>
         <%- unless os_disk_size_gb.to_s.empty?  -%>
         "osDiskSizeGb": {
             "type": "int",
@@ -359,12 +361,12 @@
                     },
                     <%- end -%>
                     <%- if use_ephemeral_osdisk -%>
-                    "osDisk": { 
-                        "diffDiskSettings": { 
-                             "option": "Local" 
-                        }, 
-                        "caching": "ReadOnly", 
-                        "createOption": "FromImage" 
+                    "osDisk": {
+                        "diffDiskSettings": {
+                             "option": "Local"
+                        },
+                        "caching": "ReadOnly",
+                        "createOption": "FromImage"
                     }
                     <%- elsif use_managed_disks -%>
                     "osDisk": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Stuart Preston
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-11 00:00:00.000000000 Z
+date: 2021-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network