azure-armrest 0.0.1 → 0.0.2

data/lib/azure/armrest/{virtual_network_manager.rb → virtual_network_service.rb}

@@ -3,16 +3,16 @@ module Azure
   # Armrest namespace
   module Armrest
     # Base class for managing virtual networks
-    class VirtualNetworkManager < ArmrestManager
+    class VirtualNetworkService < ArmrestService
 
-      # Create and return a new VirtualNetworkManager instance. Most
-      # methods for a VirtualNetworkManager instance will return one or
+      # Create and return a new VirtualNetworkService instance. Most
+      # methods for a VirtualNetworkService instance will return one or
       # more VirtualNetwork instances.
       #
-      def initialize(options = {})
+      def initialize(armrest_configuration, options = {})
         super
 
-        @base_url += "resourceGroups/#{@resource_group}/"
+        @base_url += "resourceGroups/#{armrest_configuration.resource_group}/"
         @base_url += "providers/Microsoft.Network/virtualNetworks"
       end
 
@@ -40,22 +40,22 @@ module Azure
       #         :id
       #--
       def create(network_name, options = {})
-        @uri += "/#{network_name}?api-version=#{api_version}"
+        @uri += "/#{network_name}?api-version=#{armrest_configuration.api_version}"
       end
 
       # Deletes the +network_name+ availability set.
       def delete(network_name)
-        @uri += "/#{network_name}?api-version=#{api_version}"
+        @uri += "/#{network_name}?api-version=#{armrest_configuration.api_version}"
       end
 
       # Retrieves the options of an availability set.
       def get(network_name)
-        @uri += "/#{network_name}?api-version=#{api_version}"
+        @uri += "/#{network_name}?api-version=#{armrest_configuration.api_version}"
       end
 
       # List availability sets.
       def list
-        @uri += "?api-version=#{api_version}"
+        @uri += "?api-version=#{armrest_configuration.api_version}"
       end
     end
   end

metadata

@@ -1,25 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel J. Berger
 - Bronagh Sorota
 - Greg Blomquist
+- Bill Wei
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2015-08-13 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -27,35 +28,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: cache_method
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: 0.2.7
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.2.7
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -69,13 +70,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -83,19 +84,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 description: |
   This is a Ruby interface for Azure using the newer REST API. This is
   different than the current azure gem, which uses the older (XML) interface
@@ -104,6 +133,7 @@ email:
 - dberger@redhat.com
 - bsorota@redhat.com
 - gblomqui@redhat.com
+- billwei@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -119,16 +149,20 @@ files:
 - azure-armrest.gemspec
 - lib/azure-armrest.rb
 - lib/azure/armrest.rb
-- lib/azure/armrest/armrest_manager.rb
-- lib/azure/armrest/availability_set_manager.rb
-- lib/azure/armrest/event_manager.rb
-- lib/azure/armrest/storage_account_manager.rb
-- lib/azure/armrest/subnet_manager.rb
+- lib/azure/armrest/armrest_service.rb
+- lib/azure/armrest/availability_set_service.rb
+- lib/azure/armrest/event_service.rb
+- lib/azure/armrest/resource_group_service.rb
+- lib/azure/armrest/resource_provider_service.rb
+- lib/azure/armrest/resource_service.rb
+- lib/azure/armrest/storage_account_service.rb
+- lib/azure/armrest/subnet_service.rb
+- lib/azure/armrest/template_deployment_service.rb
 - lib/azure/armrest/version.rb
-- lib/azure/armrest/virtual_machine_extension_manager.rb
-- lib/azure/armrest/virtual_machine_image_manager.rb
-- lib/azure/armrest/virtual_machine_manager.rb
-- lib/azure/armrest/virtual_network_manager.rb
+- lib/azure/armrest/virtual_machine_extension_service.rb
+- lib/azure/armrest/virtual_machine_image_service.rb
+- lib/azure/armrest/virtual_machine_service.rb
+- lib/azure/armrest/virtual_network_service.rb
 homepage: http://github.com/ManageIQ/azure-armrest
 licenses:
 - Apache 2.0
@@ -149,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An interface for ARM/JSON Azure REST API

data/lib/azure/armrest/armrest_manager.rb

@@ -1,402 +0,0 @@
-module Azure
-  module Armrest
-    # Abstract base class for the other manager classes.
-    class ArmrestManager
-
-      # The subscription ID (billing unit) for your Azure services
-      attr_accessor :subscription_id
-
-      # The resource group within the subscription.
-      attr_accessor :resource_group
-
-      # The API version of the REST interface. The default is 2015-1-1.
-      attr_accessor :api_version
-
-      # Base url used for REST calls.
-      attr_accessor :base_url
-
-      # The bearer token set in the constructor.
-      attr_accessor :token
-
-      # The content-type used for http requests.
-      attr_reader :content_type
-
-      # The accept value used for http requests.
-      attr_reader :accept
-
-      # The oauth2 strategy used for gathering the authentication token.
-      # The default is 'client_credentials'.
-      attr_reader :grant_type
-
-      VALID_OPTIONS = %[
-        client_id
-        client_key
-        tenant_id
-        subscription_id
-        resource_group
-        api_version
-        grant_type
-        content_type
-        accept
-        token
-      ]
-
-      @@client_id = nil
-      @@client_key = nil
-      @@tenant_id = nil
-      @@subscription_id = nil
-      @@resource_group = nil
-      @@api_version = '2015-01-01'
-      @@grant_type = 'client_credentials'
-      @@content_type = 'application/json'
-      @@accept = 'application/json'
-      @@token = nil
-      @@providers = {} # Set in constructor
-
-      # Set configuration options globally. If set globally you do not need to
-      # pass configuration options to individual manager classes.
-      #
-      # Possible options are:
-      #
-      #   - client_id
-      #   - client_key
-      #   - tenant_id
-      #   - subscription_id
-      #   - resource_group
-      #   - api_version
-      #   - grant_type
-      #   - content_type
-      #   - accept
-      #   - token
-      #
-      # Of these, you should include a client_id, client_key and tenant_id.
-      # The resource_group can be specified here, but many methods allow you
-      # to specify a resource group if you prefer flexibility.
-      #
-      # If no subscription_id is provided then this method will attempt to find
-      # a list of associated subscriptions and use the first one it finds as
-      # the default. If no associated subscriptions are found, an ArgumentError
-      # is raised.
-      #
-      # The other options (grant_type, content_type, accept, token, and
-      # api_version) should generally NOT be set by you except in specific
-      # circumstances.  Setting them explicitly will likely cause breakage.
-      # The api_version will typically be overridden on a per-provider/resource
-      # basis within subclasses anyway.
-      #
-      # You may need to associate your application with a subscription using
-      # the new portal or the New-AzureRoleAssignment powershell command.
-      #
-      def self.configure(options)
-        options.each do |k,v|
-          raise ArgumentError, "Invalid key: '#{k}'" unless VALID_OPTIONS.include?(k.to_s)
-          eval("@@#{k} = v")
-        end
-
-        token_url = Azure::Armrest::AUTHORITY + @@tenant_id + "/oauth2/token"
-
-        response = RestClient.post(
-          token_url,
-          :grant_type    => @@grant_type,
-          :client_id     => @@client_id,
-          :client_secret => @@client_key,
-          :resource      => Azure::Armrest::RESOURCE
-        )
-
-        @@token = 'Bearer ' + JSON.parse(response)['access_token']
-
-        # Automatically set a subscription ID if one is not specified.
-        unless @@subscription_id
-          url = File.join(Azure::Armrest::RESOURCE, "subscriptions?api-version=#{@@api_version}")
-
-          response = RestClient.get(
-            url,
-            :content_type  => @@content_type,
-            :authorization => @@token,
-          )
-
-          hash = JSON.parse(response.body)["value"].first
-
-          if hash.empty?
-            raise ArgumentError, "No associated subscription found"
-          else
-            @@subscription_id = hash.fetch("subscriptionId")
-          end
-        end
-      end
-
-      # Do not instantiate directly. This is an abstract base class from which
-      # all other manager classes should subclass, and call super within their
-      # own constructors.
-      #
-      # The possible options to the constructor are:
-      #
-      # * subscription_id - Your Azure subscription ID. If no subscription
-      #     is specifified, then information for all subscriptions will be
-      #     collected.
-      #
-      # * resource_group - The resource group within the subscription. If no
-      #     resource group is specified, then information for all resource
-      #     groups will be gathered.
-      #
-      # * client_id - Your Azure client ID. Mandatory.
-      #
-      # * client_key - The key (secret) for your client ID. Mandatory.
-      #
-      # * tenant_id - Your Azure tenant ID. Mandatory.
-      #
-      # * api_version - The REST API version to use for internal REST calls.
-      #     The default is '2015-01-01'. In some cases this value is ignored
-      #     in order to get the most recently supported api-version string.
-      #
-      def initialize(options = {})
-        # Mandatory params
-        @client_id  = @@client_id || options.fetch(:client_id)
-        @client_key = @@client_key || options.fetch(:client_key)
-        @tenant_id  = @@tenant_id || options.fetch(:tenant_id)
-
-        # Optional params
-        @subscription_id = @@subscription_id || options[:subscription_id]
-        @resource_group  = @@resource_group || options[:resource_group]
-        @api_version     = @@api_version || options[:api_version] || '2015-01-01'
-        @grant_type      = @@grant_type || options[:grant_type] || 'client_credentials'
-
-        # The content-type used for all internal http requests
-        @content_type = @@content_type || 'application/json'
-        @accept = @@accept || 'application/json'
-
-        # Call the get_token method to set this.
-        @token = @@token || options[:token]
-
-        # Base URL used for REST calls. Modify within method calls as needed.
-        @base_url = Azure::Armrest::RESOURCE
-
-        set_providers_info
-      end
-
-      # Gets an authentication token, which is then used for all other methods.
-      # This will also set the subscription_id to the first subscription found
-      # if you did not set it in the constructor.
-      #
-      # If you did not call the the ArmrestManager.configure method then you
-      # must call this before calling any other methods.
-      #
-      def get_token
-        return self if @@token || @token
-
-        token_url = Azure::Armrest::AUTHORITY + @tenant_id + "/oauth2/token"
-
-        resp = RestClient.post(
-          token_url,
-          :grant_type    => @grant_type,
-          :client_id     => @client_id,
-          :client_secret => @client_key,
-          :resource      => Azure::Armrest::RESOURCE
-        )
-
-        @token = 'Bearer ' + JSON.parse(resp)['access_token']
-        @@token = @token
-
-        unless @subscription_id
-          @subscription_id = subscriptions.first['subscriptionId']
-        end
-
-        set_providers_info
-
-        self
-      end
-
-      # Returns a list of the available resource providers.
-      #
-      def providers
-        url = url_with_api_version(@@api_version, @base_url, 'providers')
-        resp = rest_get(url)
-        JSON.parse(resp.body)["value"]
-      end
-
-      # Returns information about the specific provider +namespace+.
-      #
-      def provider_info(provider)
-        url = url_with_api_version(@@api_version, @base_url, 'providers', provider)
-        response = rest_get(url)
-        JSON.parse(response.body)
-      end
-
-      alias geo_locations provider_info
-
-      # Returns a list of all locations for all resource types of the given
-      # +provider+. If you do not specify a provider, then the locations for
-      # all providers will be returned.
-      #
-      # If you need individual details on a per-provider basis, use the
-      # provider_info method instead.
-      #--
-      #
-      def locations(provider = nil)
-        array = []
-
-        if provider
-          @@providers[provider].each do |key, data|
-            array << data['locations']
-          end
-        else
-          @@providers.each do |provider, resource_types|
-            @@providers[provider].each do |resource_type, data|
-              array << data['locations']
-            end
-          end
-        end
-
-        array.flatten.uniq
-      end
-
-      # Returns a list of subscriptions for the tenant.
-      #
-      def subscriptions
-        url = url_with_api_version(@@api_version, @base_url, 'subscriptions')
-        resp = rest_get(url)
-        JSON.parse(resp.body)["value"]
-      end
-
-      # Return information for the specified subscription ID, or the
-      # subscription ID that was provided in the constructor if none is
-      # specified.
-      #
-      def subscription_info(subscription_id = @subscription_id)
-        url = url_with_api_version(@@api_version, @base_url, 'subscriptions', subscription_id)
-        resp = rest_get(url)
-        JSON.parse(resp.body)
-      end
-
-      # Returns a list of resources for the current subscription. If a
-      # +resource_group+ is provided, only list resources for that
-      # resource group.
-      #
-      def resources(resource_group = nil)
-        if resource_group
-          url = url_with_api_version(
-            @@api_version, @base_url, 'subscriptions', subscription_id,
-            'resourcegroups', resource_group, 'resources'
-          )
-        else
-          url = url_with_api_version(@base_url, 'subscriptions', subscription_id, 'resources')
-        end
-
-        response = rest_get(url)
-
-        JSON.parse(response.body)["value"]
-      end
-
-      # Returns a list of resource groups for the current subscription.
-      #
-      def resource_groups
-        url = url_with_api_version(
-          @@api_version, @base_url, 'subscriptions',
-          subscription_id, 'resourcegroups'
-        )
-        response = rest_get(url)
-        JSON.parse(response.body)["value"]
-      end
-
-      # Returns information on the specified +resource_group+ for the current
-      # subscription, or the resource group specified in the constructor if
-      # none is provided.
-      #
-      def resource_group_info(resource_group)
-        url = url_with_api_version(
-          @@api_version, @base_url, 'subscriptions',
-          subscription_id, 'resourcegroups', resource_group
-        )
-
-        resp = rest_get(url)
-        JSON.parse(resp.body)
-      end
-
-      # Returns a list of tags for the current subscription.
-      #
-      def tags
-        url = url_with_api_version(@@api_version, @base_url, 'subscriptions', subscription_id, 'tagNames')
-        resp = rest_get(url)
-        JSON.parse(resp.body)["value"]
-      end
-
-      # Returns a list of tenants that can be accessed.
-      #
-      def tenants
-        url = url_with_api_version(@@api_version, @base_url, 'tenants')
-        resp = rest_get(url)
-        JSON.parse(resp.body)
-      end
-
-      private
-
-      # REST verb methods
-
-      def rest_get(url)
-        RestClient.get(
-          url,
-          :accept        => @accept,
-          :content_type  => @content_type,
-          :authorization => @token,
-        )
-      end
-
-      def rest_put(url, body = '')
-        RestClient.put(
-          url,
-          body,
-          :accept        => @accept,
-          :content_type  => @content_type,
-          :authorization => @token,
-        )
-      end
-
-      def rest_post(url, body = '')
-        RestClient.post(
-          url,
-          body,
-          :accept        => @accept,
-          :content_type  => @content_type,
-          :authorization => @token,
-        )
-      end
-
-      def rest_delete(url)
-        RestClient.delete(
-          url,
-          :accept        => @accept,
-          :content_type  => @content_type,
-          :authorization => @token,
-        )
-      end
-
-      # Take an array of URI elements and join the together with the API version.
-      def url_with_api_version(api_version, *paths)
-        File.join(*paths) << "?api-version=#{api_version}"
-      end
-
-       # Build a one-time lookup table for each provider & resource. This
-        # lets subclasses set api-version strings properly for each method
-        # depending on whichever provider they're using.
-        #
-        # e.g. @@providers['Microsoft.Compute']['virtualMachines']['api_version']
-        #
-        # Note that for methods that don't depend on a resource type should use
-        # the @@api_version class variable instead or set it explicitly as needed.
-        #
-      def set_providers_info
-        if @@providers.empty? && @token
-          providers.each do |info|
-            @@providers[info['namespace']] = {}
-            info['resourceTypes'].each do |resource|
-              @@providers[info['namespace']][resource['resourceType']] = {
-                'api_version' => resource['apiVersions'].first,
-                'locations'   => resource['locations'] - [''] # Ignore empty elements
-              }
-            end
-          end
-        end
-      end
-    end # ArmrestManager
-  end # Armrest
-end # Azure