kitchen-azurerm 0.14.2 → 0.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b5d83bda848c416fb5719df306a120193935e99ee53ab1401b906ebc88948fb
-  data.tar.gz: 626d44787351985d6c413ee0d8dafc277d66696d882fd69630a1b7044677c8fa
+  metadata.gz: 20c8d131072c10dd6b2da746cb7df6285b9e7a3f300f4303462a1682b197f8d6
+  data.tar.gz: 4da3a6903902607532808e46d7f45c0e47cb094d45b8c852d5023305fbc47778
 SHA512:
-  metadata.gz: ea0716bf38900ef503baee304edecab3f88dcfa9c4237f7eed908399c085a33889f85dd10879d81c1667976faf8fdb432bea00c27c5b87236bee51df7ae480d0
-  data.tar.gz: c848451adee29e84e3960676fdafdeef1a9248176e2cd48da7405edce1f2fe2a6322e4430a86885d7aa6dc2bb3f70afd099e69f99589abc26cf489b0aad30285
+  metadata.gz: 9e3871bf9ce63eb8a33cd4f412f65cdbb09ec5090c2f2431980e3c23e635116023d7c5af89b3f0b3829b897a789c62028033272182e49f2b247c89e1fe86f2a8
+  data.tar.gz: 6b9d8bde2f28fc672e23bb8e914dd06df9efb1e4a7dfe37e797e9392a91a7e73f562e46cf0528ce182dc867258123a5784d6c959c720a6d6822f550f5bb1ef24

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # kitchen-azurerm Changelog
 
+## [0.14.3] - 2018-07-16
+- Add `destroy_resource_group_contents` (default: false) property to allow contents of Azure Resource Group to be deleted rather than entire Resource Group, fixes [#90](https://github.com/test-kitchen/kitchen-azurerm/issues/85)
+
 ## [0.14.2] - 2018-07-09
 - Add `destroy_explicit_resource_group` (default: false) property to allow reuse of specific Azure RG, fixes [#85](https://github.com/test-kitchen/kitchen-azurerm/issues/85)
 

data/README.md

@@ -474,6 +474,14 @@ info:    vm image list command OK
 - The ```os_disk_size_gb``` parameter can be used to specify a custom os disk size.
 - 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.
+```
+---
+driver:
+  explicit_resource_group_name: stuart-rg-demo-001
+  destroy_explicit_resource_group: false
+  destroy_resource_group_contents: true
+```
 
 ## Contributing
 

data/lib/kitchen/driver/azurerm.rb

@@ -138,6 +138,10 @@ module Kitchen
         true
       end
 
+      default_config(:destroy_resource_group_contents) do |_config|
+        false
+      end
+
       def create(state)
         state = validate_state(state)
         deployment_parameters = {
@@ -351,6 +355,16 @@ module Kitchen
         deployment
       end
 
+      def empty_deployment
+        template = virtual_machine_deployment_template_file('empty.erb', nil)
+        empty_deployment = ::Azure::Resources::Profiles::Latest::Mgmt::Models::Deployment.new
+        empty_deployment.properties = ::Azure::Resources::Profiles::Latest::Mgmt::Models::DeploymentProperties.new
+        empty_deployment.properties.mode = ::Azure::Resources::Profiles::Latest::Mgmt::Models::DeploymentMode::Complete
+        empty_deployment.properties.template = JSON.parse(template)
+        debug(JSON.pretty_generate(empty_deployment.properties.template))
+        empty_deployment
+      end
+
       def vm_tag_string(vm_tags_in)
         tag_string = ''
         unless vm_tags_in.empty?
@@ -415,14 +429,26 @@ module Kitchen
 
       def destroy(state)
         return if state[:server_id].nil?
+        options = Kitchen::Driver::Credentials.new.azure_options_for_subscription(state[:subscription_id], state[:azure_environment])
+        @resource_management_client = ::Azure::Resources::Profiles::Latest::Mgmt::Client.new(options)
+        if config[:destroy_resource_group_contents] == true
+          info 'Destroying individual resources within the Resource Group.'
+          empty_deployment_name = "empty-deploy-#{state[:uuid]}"
+          begin
+            info "Creating deployment: #{empty_deployment_name}"
+            resource_management_client.deployments.begin_create_or_update_async(state[:azure_resource_group_name], empty_deployment_name, empty_deployment).value!
+            follow_deployment_until_end_state(state[:azure_resource_group_name], empty_deployment_name)
+          rescue ::MsRestAzure::AzureOperationError => operation_error
+            error operation_error.body
+            raise operation_error
+          end
+        end
         if config[:destroy_explicit_resource_group] == false && !config[:explicit_resource_group_name].nil?
-          warn 'The :destroy_explicit_resource_group setting value is set to "false" so no resources will be destroyed.'
-          warn 'Remember to manually destroy resources to save costs!'
+          warn 'The "destroy_explicit_resource_group" setting value is set to "false". The resource group will not be deleted.'
+          warn 'Remember to manually destroy resources, or set "destroy_resource_group_contents: true" to save costs!' unless config[:destroy_resource_group_contents] == true
           return
         end
-        options = Kitchen::Driver::Credentials.new.azure_options_for_subscription(state[:subscription_id], state[:azure_environment])
         info "Azure environment: #{state[:azure_environment]}"
-        resource_management_client = ::Azure::Resources::Profiles::Latest::Mgmt::Client.new(options)
         begin
           info "Destroying Resource Group: #{state[:azure_resource_group_name]}"
           resource_management_client.resource_groups.begin_delete(state[:azure_resource_group_name])
@@ -438,7 +464,8 @@ module Kitchen
       end
 
       def enable_winrm_powershell_script
-        config[:winrm_powershell_script] || <<-PS1
+        config[:winrm_powershell_script] ||
+          <<-PS1
   $cert = New-SelfSignedCertificate -DnsName $env:COMPUTERNAME -CertStoreLocation Cert:\\LocalMachine\\My
   $config = '@{CertificateThumbprint="' + $cert.Thumbprint + '"}'
   winrm create winrm/config/listener?Address=*+Transport=HTTPS $config
@@ -446,13 +473,14 @@ module Kitchen
   New-NetFirewallRule -DisplayName "Windows Remote Management (HTTPS-In)" -Name "Windows Remote Management (HTTPS-In)" -Profile Any -LocalPort 5986 -Protocol TCP
   winrm set winrm/config/service '@{AllowUnencrypted="true"}'
   New-NetFirewallRule -DisplayName "Windows Remote Management (HTTP-In)" -Name "Windows Remote Management (HTTP-In)" -Profile Any -LocalPort 5985 -Protocol TCP
-        PS1
+          PS1
       end
 
       def format_data_disks_powershell_script
         return unless config[:format_data_disks]
         info 'Data disks will be initialized and formatted NTFS automatically.' unless config[:data_disks].nil?
-        config[:format_data_disks_powershell_script] || <<-PS1
+        config[:format_data_disks_powershell_script] ||
+          <<-PS1
   Write-Host "Initializing and formatting raw disks"
   $disks = Get-Disk | where partitionstyle -eq 'raw'
   $letters = New-Object System.Collections.ArrayList
@@ -475,7 +503,7 @@ module Kitchen
     Start-Sleep 1
     Format-Volume -FileSystem NTFS -NewFileSystemLabel "datadisk" -DriveLetter $driveLetter -Confirm:$false
   }
-        PS1
+          PS1
       end
 
       def custom_data_script_windows

data/templates/empty.erb

@@ -0,0 +1,7 @@
+{
+    "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+    "contentVersion": "1.0.0.0",
+    "parameters": {},
+    "variables": {},
+    "resources": []
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-azurerm
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.3
 platform: ruby
 authors:
 - Stuart Preston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure_mgmt_network
@@ -124,14 +124,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: '0.58'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.58.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.57.2
+        version: '0.58'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.58.1
 description: Test Kitchen driver for the Microsoft Azure Resource Manager (ARM) API
 email:
 - stuart@chef.io
@@ -144,6 +150,7 @@ files:
 - README.md
 - lib/kitchen/driver/azurerm.rb
 - lib/kitchen/driver/credentials.rb
+- templates/empty.erb
 - templates/internal.erb
 - templates/public.erb
 homepage: https://github.com/test-kitchen/kitchen-azurerm