azure-armrest 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81c1664938977f85f9b79045d208233777851e8a
-  data.tar.gz: 4418b381009c2c0274e7fd45f217ca114a44ae8e
+  metadata.gz: ea7b40c1bcbf87f8a1a90bd6de8b3a8b91009319
+  data.tar.gz: 7c01a3f8b1e329c8897b7079bf776e2fa7f09633
 SHA512:
-  metadata.gz: b101ce1ef690827027dfd59ab2c509064afd8f488cc96b6879466ae29d9dca2b699a4fa6227022b5594e8f575f173f14e1a6c66805baa0d8cbdeee377c9ea236
-  data.tar.gz: 274f153ce11e6628d91bdf0bc21ef0dc15ad88c2bdf801705a5cdc14d159d3fff5ef1a61dbe370fb57d8a56b61facee9d67d89569fc9be0e6cc2a661bf1dd1a7
+  metadata.gz: f64da1aa17e62f474c429bca7ec0fa0923e0f80511f54209a6847402f3fb37aaa4ff1d22d5f8892d7d7525f422d89b7efebd44bde8e1fc86b95f6c224aec9956
+  data.tar.gz: ea7848938983ce162de715df0d8982b09dab459443861fa1aee3344c6aa127b53cff0133f23d38b104f3e99b437f7a036193419b84875539802112ccc9dbb486

data/CHANGES

@@ -1,3 +1,14 @@
+= 0.3.2 - 21-Jul-2016
+* The subscription ID is now automatically validated in the
+  Azure::Armrest::Configuration constructor.
+* Added a Hakiri badge to the README.
+* There have been some minor updates to the dependencies to enforce
+  more recent versions of external gems, as suggested by Hakiri,
+  for security reasons.
+* The ResourceGroupBasedService#list_all method (and all subclasses)
+  now supports an optional hash that can be used to automatically
+  filter result sets.
+
 = 0.3.1 - 14-Jul-2016
 * Now uses the parallel gem and thread pools for those few methods where
   we were using threaded methods internally in order to reduce errors

data/README.md

@@ -7,6 +7,7 @@ A Ruby interface for Azure using the new REST API.
 [![Code Climate](https://codeclimate.com/github/ManageIQ/azure-armrest/badges/gpa.svg)](https://codeclimate.com/github/ManageIQ/azure-armrest)
 [![Test Coverage](https://codeclimate.com/github/ManageIQ/azure-armrest/badges/coverage.svg)](https://codeclimate.com/github/ManageIQ/azure-armrest/coverage)
 [![Dependency Status](https://gemnasium.com/ManageIQ/azure-armrest.svg)](https://gemnasium.com/ManageIQ/azure-armrest)
+[![Security](https://hakiri.io/github/ManageIQ/azure-armrest/master.svg)](https://hakiri.io/github/ManageIQ/azure-armrest/master)
 
 ## Synopsis
 

data/azure-armrest.gemspec

@@ -19,12 +19,12 @@ different than the current azure gem, which uses the older (XML) interface
 behind the scenes.
   EOF
 
-  spec.add_dependency 'json'
+  spec.add_dependency 'json', '~> 2.0.1'
   spec.add_dependency 'rest-client', '~> 2.0.0'
   spec.add_dependency 'cache_method', '~> 0.2.7'
-  spec.add_dependency 'azure-signature', '~> 0.2.0'
-  spec.add_dependency 'activesupport', '>= 1.2.0'
-  spec.add_dependency 'nokogiri', '~> 1.6.0'
+  spec.add_dependency 'azure-signature', '~> 0.2.3'
+  spec.add_dependency 'activesupport', '>= 4.2.2'
+  spec.add_dependency 'nokogiri', '~> 1.6.8'
   spec.add_dependency 'addressable', '~> 2.4.0'
   spec.add_dependency 'parallel', '~> 1.9.0'
 

data/lib/azure/armrest/configuration.rb

@@ -80,6 +80,10 @@ module Azure
       # Although you can specify an :api_version, it is typically overridden
       # by individual service classes.
       #
+      # Note that while the constructor will fail if invalid credentials are
+      # supplied, it does not validate your subscription ID. If you want to
+      # validate your subscription ID as well, use the validate_subscription! method.
+      #
       def initialize(args)
         # Use defaults, and override with provided arguments
         options = {
@@ -100,6 +104,8 @@ module Azure
           raise ArgumentError, "client_id, client_key, tenant_id and subscription_id must all be specified"
         end
 
+        validate_subscription
+
         if user_token && user_token_expiration
           set_token(user_token, user_token_expiration)
         elsif user_token || user_token_expiration
@@ -170,6 +176,48 @@ module Azure
 
       private
 
+      # Validate the subscription ID for the given credentials.
+      #
+      # If the subscription ID that was provided in the constructor cannot
+      # be found within the list of valid subscriptions, then an error is
+      # raised.
+      #
+      # If the subscription ID that was provided is found but disabled
+      # then a warning will be issued, but no error will be raised.
+      #
+      def validate_subscription
+        url = File.join(Azure::Armrest::RESOURCE, 'subscriptions') + "?api-version=#{api_version}"
+
+        options = {
+          :url         => url,
+          :proxy       => proxy,
+          :ssl_version => ssl_version,
+          :ssl_verify  => ssl_verify,
+          :headers     => {
+            :accept        => accept,
+            :content_type  => content_type,
+            :authorization => token
+          }
+        }
+
+        response = Azure::Armrest::ArmrestService.send(:rest_get, options)
+        json = JSON.parse(response.body)['value']
+
+        subscriptions = json.map { |hash| [hash['subscriptionId'], hash['state']] }
+
+        found = subscriptions.find { |array| array.first == subscription_id }
+
+        unless found
+          raise ArgumentError, "Subscription ID '#{subscription_id}' not found"
+        end
+
+        if found.last.casecmp("enabled") != 0
+          warn "Subscription '#{found.first}' found but not enabled."
+        end
+
+        true
+      end
+
       def ensure_token
         @token, @token_expiration = self.class.retrieve_token(self) if @token.nil?
         fetch_token if @token.nil? || Time.now.utc > @token_expiration

data/lib/azure/armrest/resource_group_based_service.rb

@@ -23,11 +23,21 @@ module Azure
         JSON.parse(response)['value'].map { |hash| model_class.new(hash) }
       end
 
-      def list_all
+      # Use a single call to get all resources for the service. You may
+      # optionally provide a filter on various properties to limit the
+      # result set.
+      #
+      # Example:
+      #
+      #   vms = Azure::Armrest::VirtualMachineService.new(conf)
+      #   vms.list_all(:location => "eastus", :resource_group => "rg1")
+      #
+      def list_all(filter = {})
         url = build_url
         url = yield(url) || url if block_given?
         response = rest_get(url)
-        JSON.parse(response)['value'].map { |hash| model_class.new(hash) }
+        results = JSON.parse(response)['value'].map { |hash| model_class.new(hash) }
+        filter.empty? ? results : results.select { |obj| filter.all? { |k, v| obj.public_send(k) == v } }
       end
 
       def get(name, rgroup = configuration.resource_group)

data/lib/azure/armrest/version.rb

@@ -1,5 +1,5 @@
 module Azure
   module Armrest
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.3.2'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,22 +11,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-14 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -61,42 +61,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 4.2.2
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.8
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement