kitchen-azurerm 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 307c89905dfa66472753bbb6e2be46a63a8633a4b22cc9b94558a681ce8a9394
-  data.tar.gz: 79b0a3ef96c911c209179515950232b7bfb14b2971b32f11b1f3f644dd734178
+  metadata.gz: 167f2bd145bfcc198c78d11302f0fa2ca94a068f4a66a74137969664c4017249
+  data.tar.gz: b997820c2f205904e1c66e57cbefbd052314bddc309fc625c6619e511621804f
 SHA512:
-  metadata.gz: 6df983570c0d3ac89af2ae62ad68dce8ddbbe09fc535b119b8e758d0c8af177cfa140917b8926fb70cdf124cd466d6de65fa81b14a47c2b47fc1511d6a1cc25a
-  data.tar.gz: 0007aaa232ebfa119aff88eeafffc07b229aca5088e034312042799a29ab74bac6bb7ff9c8a1be2dae95b6ab25c74a5487427278ba543600874ab3a66f1df9f2
+  metadata.gz: 295cf6b29eefdded3df9f0211a40c70e3619eb34162bd261e828dce635ffcc9c653ca4b9a2931d701dc82cec134b71dc1035161860f5f905633303f71eb36ab4
+  data.tar.gz: 0215f092fb461968d8b678291ffab9ad58d30390276195f82d61b189a240818f7cc0f3e2b76774d5910ab27b24deb71a4c7acbfb09f5911d2e73bf14224cd9bc

data/lib/kitchen/driver/azure_credentials.rb

@@ -39,7 +39,7 @@ module Kitchen
       #
       def azure_options
         options = { tenant_id: tenant_id!,
-                    subscription_id: subscription_id,
+                    subscription_id:,
                     credentials: ::MsRest2::TokenCredentials.new(token_provider),
                     active_directory_settings: ad_settings,
                     base_url: endpoint_settings.resource_manager_endpoint_url }
@@ -104,7 +104,7 @@ module Kitchen
         #
         # MSI with client_id and tenant_id (aka User Assigned Identity).
         elsif client_id && tenant_id
-          ::MsRestAzure2::MSITokenProvider.new(50342, ad_settings, { client_id: client_id })
+          ::MsRestAzure2::MSITokenProvider.new(50342, ad_settings, { client_id: })
         # Default approach to inheriting existing object permissions (application or device this code is running on).
         #
         # Typically used when you want to inherit the permissions of the system you're running on that are in a tenant.

data/lib/kitchen/driver/azurerm.rb

@@ -84,6 +84,11 @@ module Kitchen
         SecureRandom.base64(25)
       end
 
+      # This prefix MUST be no longer than 3 characters
+      default_config(:vm_prefix) do |_config|
+        "tk-"
+      end
+
       default_config :vm_name, nil
 
       default_config :store_deployment_credentials_in_state, true
@@ -379,7 +384,7 @@ module Kitchen
       # @return [Hash] Updated Hash of state values.
       def validate_state(state = {})
         state[:uuid] = SecureRandom.hex(8) unless existing_state_value?(state, :uuid)
-        state[:vm_name] = config[:vm_name] || "tk-#{state[:uuid][0..11]}" unless existing_state_value?(state, :vm_name)
+        state[:vm_name] = config[:vm_name] || "#{config[:vm_prefix]}#{state[:uuid][0..11]}" unless existing_state_value?(state, :vm_name)
         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 azure_environment use_managed_disks}.each do |config_element|
@@ -741,10 +746,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], storage_account_type: config[:storage_account_type], 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("public.erb", vm_tags: vm_tag_string(config[:vm_tags]), use_managed_disks: config[:use_managed_disks], image_url: config[:image_url], storage_account_type: config[:storage_account_type], 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:, use_ephemeral_osdisk: config[:use_ephemeral_osdisk], ssh_key: instance.transport[:ssh_key], 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], storage_account_type: config[:storage_account_type], 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)
+          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], storage_account_type: config[:storage_account_type], 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:, use_ephemeral_osdisk: config[:use_ephemeral_osdisk], ssh_key: instance.transport[:ssh_key], public_ip_sku: config[:public_ip_sku], plan_json:)
         end
       end
 

data/lib/kitchen/driver/azurerm_version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Driver
-    AZURERM_VERSION = "1.12.0".freeze
+    AZURERM_VERSION = "1.13.0".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Stuart Preston
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-09 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network2
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Test Kitchen driver for Azure Resource Manager.