azure-armrest 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a888f86dfd49210ca1ce4232968d2449f8ee1a2
-  data.tar.gz: 8a19fb58fe560e115b0153e843f0eaaf8329c61d
+  metadata.gz: 172b9e9bbaf79e6ce3b794516c9d03871b1bbefd
+  data.tar.gz: 22f969732daa71dd7f072485ac5f491cd7649ff7
 SHA512:
-  metadata.gz: cc6c79041f6c46dcad609fd72e2e5c719c2b84cea7e0fc2cf10fd3da4bc789f92bfcdcddf69748fbfe1e9e837fc001ab607c1d6bc38d2ce0752639284f7acbb7
-  data.tar.gz: 55fd98f1b9af93b7e84b6eaef6b98d5814a31531518ceb00c5c617e2242c547d74ab40c3f4d073bab98d2feb0ca5e09cf1292f45a982bf49532f60817426cc90
+  metadata.gz: 389e975c413a315045b02edc52920f623df4df1fa576d9bc788b8653d342e2cbcab7008ff3a14828248df436f759df3181458c963c0a39b61c19c7ab4a3f7f26
+  data.tar.gz: a888720f50eefa4ab1ce91b23ae19beecd82cc2e6f670133af0d86d44d4f7f9daa00c7567a6b06458518d683c6551afa5b2ee696e507e88a8da60a53011082df

data/CHANGES

@@ -1,3 +1,7 @@
+= 0.4.2 - 19-Dec-2016
+* Added the delete_by_id method, so you can now delete by ID string.
+* Added the TemplateDeploymentService#delete_associated_resources method. 
+
 = 0.4.1 - 16-Dec-2016
 * The Configuration#environment accessor was added. As of this release you
   can specify 'usgov' as an option to the constructor, and the appropriate

data/lib/azure/armrest/resource_group_based_service.rb

@@ -90,7 +90,7 @@ module Azure
         filter.empty? ? results : results.select { |obj| filter.all? { |k, v| obj.public_send(k) == v } }
       end
 
-      # This method returns a model object based on an ID string for a Service.
+      # This method returns a model object based on an ID string for a resource.
       #
       # Example:
       #
@@ -98,21 +98,14 @@ module Azure
       #
       #   vm = vms.get('your_vm', 'your_group')
       #   nic_id = vm.properties.network_profile.network_interfaces[0].id
-      #   nic = vm.get_associated_resource(nic_id)
+      #   nic = vm.get_by_id(nic_id)
       #
-      def get_associated_resource(id_string)
+      def get_by_id(id_string)
         info = parse_id_string(id_string)
-
-        if info['subservice_name']
-          full_service_name = info['service_name'] + '/' + info['subservice_name']
-          api_version = configuration.provider_default_api_version(info['provider'], full_service_name)
-          api_version ||= configuration.provider_default_api_version(info['provider'], info['service_name'])
-        else
-          api_version = configuration.provider_default_api_version(info['provider'], info['service_name'])
-        end
-
-        api_version ||= configuration.api_version
-        service_name = info['subservice_name'] || info['service_name']
+        api_version = api_version_lookup(info['provider'],
+                                         info['service_name'],
+                                         info['subservice_name'])
+        service_name = info['subservice_name'] || info['service_name'] || 'resourceGroups'
 
         url = File.join(configuration.resource_url, id_string) + "?api-version=#{api_version}"
 
@@ -123,7 +116,17 @@ module Azure
         model_class.new(rest_get(url))
       end
 
-      alias get_by_id get_associated_resource
+      alias get_associated_resource get_by_id
+
+      def delete_by_id(id_string)
+        info = parse_id_string(id_string)
+        api_version = api_version_lookup(info['provider'],
+                                         info['service_name'],
+                                         info['subservice_name'])
+        url = File.join(configuration.resource_url, id_string) + "?api-version=#{api_version}"
+
+        delete_by_url(url, id_string)
+      end
 
       # Get information about a single resource +name+ within resource group
       # +rgroup+, or the resource group that was set in the configuration.
@@ -157,17 +160,8 @@ module Azure
 
         url = build_url(rgroup, name)
         url = yield(url) || url if block_given?
-        response = rest_delete(url)
-
-        if response.code == 204
-          msg = "#{self.class} resource #{rgroup}/#{name} not found"
-          raise Azure::Armrest::ResourceNotFoundException.new(response.code, msg, response)
-        end
 
-        headers = Azure::Armrest::ResponseHeaders.new(response.headers)
-        headers.response_code = response.code
-
-        headers
+        delete_by_url(url, "#{rgroup}/#{name}")
       end
 
       private
@@ -175,15 +169,11 @@ module Azure
       # Parse the provider and service name out of an ID string.
       def parse_id_string(id_string)
         regex = %r{
-          subscriptions/
-          (?<subscription_id>[^\/]+)?/
-          resourceGroups/
-          (?<resource_group>[^\/]+)?/
-          providers/
-          (?<provider>[^\/]+)?/
-          (?<service_name>[^\/]+)?/
-          (?<resource_name>[^\/]+)
-          (/(?<subservice_name>[^\/]+)?/(?<subservice_resource_name>[^\/]+))*
+          subscriptions/(?<subscription_id>[^\/]+)?
+          (/resourceGroups/(?<resource_group>[^\/]+)?)?
+          (/providers/(?<provider>[^\/]+)?)?
+          (/(?<service_name>[^\/]+)?/(?<resource_name>[^\/]+))?
+          (/(?<subservice_name>[^\/]+)?/(?<subservice_resource_name>[^\/]+))?
           \z
         }x
 
@@ -191,6 +181,30 @@ module Azure
         Hash[match.names.zip(match.captures)]
       end
 
+      def api_version_lookup(provider_name, service_name, subservice_name)
+        provider_name ||= 'Microsoft.Resources'
+        service_name  ||= 'resourceGroups'
+        if subservice_name
+          full_service_name = "#{service_name}/#{subservice_name}"
+          api_version = configuration.provider_default_api_version(provider_name, full_service_name)
+        end
+        api_version ||= configuration.provider_default_api_version(provider_name, service_name)
+        api_version ||= configuration.api_version
+      end
+
+      def delete_by_url(url, resource_name = '')
+        response = rest_delete(url)
+
+        if response.code == 204
+          msg = "resource #{resource_name} not found"
+          raise Azure::Armrest::ResourceNotFoundException.new(response.code, msg, response)
+        end
+
+        Azure::Armrest::ResponseHeaders.new(response.headers).tap do |headers|
+          headers.response_code = response.code
+        end
+      end
+
       def validate_resource_group(name)
         raise ArgumentError, "must specify resource group" unless name
       end
@@ -203,13 +217,18 @@ module Azure
       # arguments provided, and appends it with the api_version.
       #
       def build_url(resource_group = nil, *args)
-        url = base_url
-        url = File.join(url, 'resourceGroups', resource_group) if resource_group
-        url = File.join(url, 'providers', @provider, @service_name)
-        url = File.join(url, *args) unless args.empty?
+        url = File.join(configuration.resource_url, build_id_string(resource_group, *args))
         url << "?api-version=#{@api_version}"
       end
 
+      def build_id_string(resource_group = nil, *args)
+        id_string = File.join('', 'subscriptions', configuration.subscription_id)
+        id_string = File.join(id_string, 'resourceGroups', resource_group) if resource_group
+        id_string = File.join(id_string, 'providers', @provider, @service_name)
+        id_string = File.join(id_string, *args) unless args.empty?
+        id_string
+      end
+
       # Aggregate resources from all resource groups.
       #
       # To be used in the cases where the API does not support list_all with

data/lib/azure/armrest/template_deployment_service.rb

@@ -49,6 +49,54 @@ module Azure
         response = JSON.parse(rest_post(url))['template']
         DeploymentTemplate.new(response)
       end
+
+      # Delete a deployment and all associated resources that were generated by the
+      # deployment.
+      #
+      # This is a synchronous call. It waits until all deletions complete
+      def delete_associated_resources(deploy_name, resource_group = configuration.resource_group)
+        operations = list_deployment_operations(deploy_name, resource_group)
+        resource_ids = operations.collect do |op|
+          if op.properties.provisioning_operation =~ /^create$/i
+            op.properties.target_resource.id
+          end
+        end.compact
+        resource_ids << build_id_string(resource_group, deploy_name)
+
+        delete_resources(resource_ids, resource_ids.size)
+      end
+
+      private
+
+      def delete_resources(ids, retry_cnt)
+        if retry_cnt == 0
+          ids.each { |id| log("error", "Failed to delete #{id}") }
+          return
+        end
+
+        remaining_ids = ids.collect { |id| delete_resource(id) }.compact
+        delete_resources(remaining_ids, retry_cnt - 1) unless remaining_ids.empty?
+      end
+
+      def delete_resource(id_string)
+        log("Deleting #{id_string}")
+
+        wait(delete_by_id(id_string), 0)
+
+        log("Deleted #{id_string}")
+        nil
+      rescue Azure::Armrest::BadRequestException => err
+        log("debug", err.to_s)
+        log("Resource #{id_string} cannot be deleted because of BadRequestException. Will try again.")
+        id_string
+      rescue Azure::Armrest::PreconditionFailedException, Azure::Armrest::ConflictException => err
+        log("debug", err.to_s)
+        log("Resource #{id_string} cannot be deleted because it is used by others. Will try again.")
+        id_string
+      rescue Azure::Armrest::ResourceNotFoundException => err
+        log("debug", err.to_s)
+        nil
+      end
     end
   end
 end

data/lib/azure/armrest/version.rb

@@ -1,5 +1,6 @@
 module Azure
   module Armrest
-    VERSION = '0.4.1'.freeze
+    # The version of the azure-armrest library.
+    VERSION = '0.4.2'.freeze
   end
 end

data/lib/azure/armrest/virtual_machine_service.rb

@@ -189,19 +189,19 @@ module Azure
         end
 
         nics.each do |nic_id_string|
-          nic = get_associated_resource(nic_id_string)
+          nic = get_by_id(nic_id_string)
           delete_and_wait(nis, nic.name, nic.resource_group, options)
 
           if options[:ip_addresses]
             nic.properties.ip_configurations.each do |ip|
-              ip = get_associated_resource(ip.properties.public_ip_address.id)
+              ip = get_by_id(ip.properties.public_ip_address.id)
               delete_and_wait(ips, ip.name, ip.resource_group, options)
             end
           end
 
           if options[:network_security_groups]
             if nic.properties.respond_to?(:network_security_group)
-              nsg = get_associated_resource(nic.properties.network_security_group.id)
+              nsg = get_by_id(nic.properties.network_security_group.id)
               delete_and_wait(nsgs, nsg.name, nsg.resource_group, options)
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2016-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json