kitchen-azurerm 1.9.0 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c84e17ddc3ec1792384a9431551ee9cd4b52029de7f5ff4d0aecd3015f5fd11
-  data.tar.gz: f9f2d8785858adfb74d7f7ee972813e53a6586faf237b540c2d03b754ffbc8d1
+  metadata.gz: 56e6243375235af39c1d5c3c846c24743fcf036d57e7fe45efff927f04f2547a
+  data.tar.gz: 342c45ae59a07a3697c70e59a37d9c2e80c31928ddc20b3f56800df2ae635d2a
 SHA512:
-  metadata.gz: 9661160c16ff246a146d76fea20dd7adc5bdf8e150aa98df48f3aac93ed6987ba982fe4bdbe7271e31ddbd0c639460b0d7c88dd72c662ab057a34079bf6d8eb1
-  data.tar.gz: 60ef2893d64a6c778cc76de728bcc797abf5af734670d78bf62eeeb717704965aeb3fc49cd0e69cf4465aef1c729a25a80e7e6908fba1ab2a21b40fc7918ce90
+  metadata.gz: '030008776f4e7a872475d1dda346dc37a1416c775eacbefec38e4972fc01ed7b4f6bc7b7649df0bd2946e850aa0fbf54c8de9cccb07176aad66fce159fa4253f'
+  data.tar.gz: 2d6a8fab6b13b79944764560c15b9cc30fbe6e9045d26a7695d46be9f0bf9c2c2b8619908252bcc8ea20ed9e950056cd4177fdc6f808e3fa0fafa6f0f809901c

data/lib/kitchen/driver/azure_credentials.rb

@@ -60,7 +60,7 @@ module Kitchen
         @credentials ||= if File.file?(config_path)
                            IniFile.load(config_path)
                          else
-                           warn "#{config_path} was not found or not accessible."
+                           debug "#{config_path} was not found or not accessible."
                            {}
                          end
       end

data/lib/kitchen/driver/azurerm.rb

@@ -86,6 +86,8 @@ module Kitchen
 
       default_config :vm_name, nil
 
+      default_config :store_deployment_credentials_in_state, true
+
       default_config(:nic_name) do |_config|
         ""
       end
@@ -218,15 +220,10 @@ module Kitchen
         false
       end
 
-      default_config(:zone) do |_config|
-        "1"
-      end
-
       def create(state)
         state = validate_state(state)
         deployment_parameters = {
           location: config[:location],
-          zone: config[:zone],
           vmSize: config[:machine_size],
           storageAccountType: config[:storage_account_type],
           bootDiagnosticsEnabled: config[:boot_diagnostics_enabled],
@@ -324,8 +321,11 @@ module Kitchen
           info "Creating deployment: #{deployment_name}"
           create_deployment_async(state[:azure_resource_group_name], deployment_name, deployment(deployment_parameters)).value!
           follow_deployment_until_end_state(state[:azure_resource_group_name], deployment_name)
-          state[:username] = deployment_parameters[:adminUsername] unless existing_state_value?(state, :username)
-          state[:password] = deployment_parameters[:adminPassword] unless existing_state_value?(state, :password) && instance.transport[:ssh_key].nil?
+
+          if config[:store_deployment_credentials_in_state] == true
+            state[:username] = deployment_parameters[:adminUsername] unless existing_state_value?(state, :username)
+            state[:password] = deployment_parameters[:adminPassword] unless existing_state_value?(state, :password) && instance.transport[:ssh_key].nil?
+          end
 
           if File.file?(config[:post_deployment_template])
             post_deployment_name = "post-deploy-#{state[:uuid]}"
@@ -763,7 +763,7 @@ module Kitchen
       def virtual_machine_deployment_template_file(template_file, data = {})
         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, trim_mode: "-").result(render_binding.instance_eval { binding })
       end
 
       def resource_manager_endpoint_url(azure_environment)

data/templates/internal.erb

@@ -8,18 +8,6 @@
                 "description": "The location where the resources will be created."
             }
         },
-        "zone": {
-            "type": "string",
-            "defaultValue": "1",
-            "allowedValues": [
-                "1",
-                "2",
-                "3"
-            ],
-            "metadata": {
-                "description": "Zone number for the virtual machine"
-            }
-        },
         "vmSize": {
             "type": "string",
             "metadata": {
@@ -220,7 +208,6 @@
     },
     "variables": {
         "location": "[parameters('location')]",
-        "zone": "[parameters('zone')]",
         "OSDiskName": "osdisk",
         "nicName": "[parameters('nicName')]",
         "addressPrefix": "10.0.0.0/16",
@@ -272,9 +259,6 @@
             "type": "Microsoft.Network/publicIPAddresses",
             "name": "[variables('publicIPAddressName')]",
             "location": "[variables('location')]",
-            "zones": [
-                "[variables('zone')]"
-            ],
             "sku": {
               "name": "[parameters('publicIPSKU')]"
             },
@@ -326,9 +310,6 @@
             "type": "Microsoft.Compute/virtualMachines",
             "name": "[variables('vmName')]",
             "location": "[variables('location')]",
-            "zones": [
-                "[variables('zone')]"
-            ],
             "dependsOn": [
                 <%- unless use_managed_disks -%>
                 <%- if existing_storage_account_blob_url.empty? -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.2
 platform: ruby
 authors:
 - Stuart Preston
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.