azure-armrest 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b26339221636eee239e6934d67cf0c4ee3bbb9
-  data.tar.gz: 1a6c35bd8f5a4af7ec2bd68d3734978add667981
+  metadata.gz: bfd3dade5a1dad37a43cb98080c1509d58d9bd31
+  data.tar.gz: b3aeb02c6b2ee98cb38a4bda0f71f6e221c81789
 SHA512:
-  metadata.gz: 1a130d2af6d31ca1b55b40dbe528103b359022ac7a9b685d4954ea3144f1ec6bbc5be7247aaa9f2e23963819d308d322159f46d3390b74c81caf3ee8c3dec7fc
-  data.tar.gz: fe7a7347b7bd16877848d8125ff496504d2e96822487ba0a70f62fc157798373767b9852ba5b89d3a0314e797803493745c77697b2b373eea86716e6b4086e52
+  metadata.gz: b9268be1252d095820a642cf5c20adf895d67555ad4354f6ad78fc35b381c26b693efd3ec1802fbd8cbbb7e9f897889509b9cb28c8cdbb363752325d404bde17
+  data.tar.gz: cd67fb3c615bd1d8e83644152e28826b816b1f17586c4b84a314a976fde879ea76cb3b620bbb9fbe0bbbb755ad2dc3cf763bdea3c7e3ccbc4739b75a96a2861a

data/CHANGES

@@ -1,3 +1,8 @@
+= 0.1.0 - 26-Jan-2015
+* Refactored the ArmrestService class api_version and provider handling.
+* The ArmrestService class no longer uses "preview" api versions by default.
+* Added RBAC service classes.
+
 = 0.0.9 - 17-Dec-2015
 * Added AlertService and EventService classes.
 * Added tables, table_info and table_data methods to the StorageAccount model.

data/lib/azure/armrest.rb

@@ -41,6 +41,8 @@ require 'azure/armrest/network/network_security_group_service'
 require 'azure/armrest/network/network_security_rule_service'
 require 'azure/armrest/network/virtual_network_service'
 require 'azure/armrest/network/subnet_service'
+require 'azure/armrest/role/assignment_service'
+require 'azure/armrest/role/definition_service'
 
 # JSON wrapper classes. The service classes should require their own
 # wrappers from this point on.

data/lib/azure/armrest/armrest_service.rb

@@ -55,6 +55,12 @@ module Azure
       # Base url used for REST calls.
       attr_accessor :base_url
 
+      # provider for service specific API calls
+      attr_accessor :provider
+
+      # The api-version string used for each request.
+      attr_accessor :api_version
+
       @@providers_hash = {} # Set in constructor
 
       @@tokens = {} # token caches
@@ -143,13 +149,15 @@ module Azure
       # all other service classes should subclass, and call super within their
       # own constructors.
       #
-      def initialize(armrest_configuration, _options)
-        self.armrest_configuration = armrest_configuration
+      def initialize(armrest_configuration, service_name, default_provider, options)
+        @armrest_configuration = armrest_configuration
+        @service_name = service_name
+        @provider = options[:provider] || default_provider
 
         # Base URL used for REST calls. Modify within method calls as needed.
         @base_url = Azure::Armrest::RESOURCE
 
-        set_providers_info
+        set_service_api_version(options, service_name)
       end
 
       # Returns a list of the available resource providers.
@@ -410,8 +418,8 @@ module Azure
         providers.each do |info|
           provider_info = {}
           info.resource_types.each do |resource|
-            provider_info[resource.resource_type] = {
-              'api_version' => resource.api_versions.first,
+            provider_info[resource.resource_type.downcase] = {
+              'api_version' => resource.api_versions.reject{ |version| version =~ /preview/i }.first,
               'locations'   => resource.locations - [''] # Ignore empty elements
             }
           end
@@ -435,11 +443,12 @@ module Azure
       # Finally api_version in armrest_configuration is used if service specific version
       # cannot be determined
       def set_service_api_version(options, service)
+        set_providers_info
         @api_version =
           if options.has_key?('api_version')
             options['api_version']
-          elsif @@providers_hash.has_key?(@provider.downcase)
-            @@providers_hash[@provider.downcase][service]['api_version']
+          elsif @@providers_hash.has_key?(provider.downcase)
+            @@providers_hash[provider.downcase][service.downcase]['api_version']
           else
             armrest_configuration.api_version
           end

data/lib/azure/armrest/availability_set_service.rb

@@ -4,16 +4,10 @@ module Azure
   module Armrest
     # Base class for managing availability sets.
     class AvailabilitySetService < ResourceGroupBasedService
-      # The provider used in requests when gathering AvailabilitySet information.
-      attr_reader :provider
-
       # Create and return a new AvailabilitySetService instance.
       #
-      def initialize(_armrest_configuration, options = {})
-        super
-        @provider = options[:provider] || 'Microsoft.Compute'
-        set_service_api_version(options, 'availabilitySets')
-        @service_name = 'availabilitySets'
+      def initialize(armrest_configuration, options = {})
+        super(armrest_configuration, 'availabilitySets', 'Microsoft.Compute', options)
       end
 
       def list_all

data/lib/azure/armrest/insights/alert_service.rb

@@ -6,16 +6,10 @@ module Azure
     module Insights
       # Base class for managing alert rules.
       class AlertService < ResourceGroupBasedService
-        # The provider used in requests when gathering Alert information.
-        attr_reader :provider
-
         # Create and return a new AlertService instance.
         #
-        def initialize(_armrest_configuration, options = {})
-          super
-          @provider = options[:provider] || 'Microsoft.Insights'
-          set_service_api_version(options, 'alertrules')
-          @service_name = 'alertRules'
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'alertRules', 'Microsoft.Insights', options)
         end
       end # AlertService
     end # Insights

data/lib/azure/armrest/insights/event_service.rb

@@ -7,16 +7,10 @@ module Azure
 
       # Base class for managing events.
       class EventService < ArmrestService
-        # The provider used in requests when gathering Event information.
-        attr_reader :provider
-
         # Create and return a new EventService instance.
         #
-        def initialize(_armrest_configuration, options = {})
-          super
-          @provider = options[:provider] || 'Microsoft.Insights'
-          set_service_api_version(options, 'eventtypes')
-          @service_name = 'eventTypes'
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'eventTypes', 'Microsoft.Insights', options)
         end
 
         # Returns a list of management events for the current subscription.
@@ -53,15 +47,16 @@ module Azure
         def build_url(filter = nil, select = nil)
           sub_id = armrest_configuration.subscription_id
 
-          url = File.join(
-            Azure::Armrest::COMMON_URI,
-            sub_id,
-            'providers',
-            @provider,
-            'eventtypes',
-            'management',
-            'values'
-          ) 
+          url =
+            File.join(
+              Azure::Armrest::COMMON_URI,
+              sub_id,
+              'providers',
+              provider,
+              'eventtypes',
+              'management',
+              'values'
+            )
 
           url << "?api-version=#{@api_version}"
           url << "&$filter=#{filter}" if filter

data/lib/azure/armrest/model/base_model.rb

@@ -195,6 +195,11 @@ module Azure
       class VirtualNetwork < BaseModel; end
       class Subnet < VirtualNetwork; end
     end
+
+    module Role
+      class Assignment < BaseModel; end
+      class Definition < BaseModel; end
+    end
   end
 end
 

data/lib/azure/armrest/network/ip_address_service.rb

@@ -6,11 +6,8 @@ module Azure
 
         # Creates and returns a new IpAddressService instance.
         #
-        def initialize(_armrest_configuration, options = {})
-          super
-          @provider = options[:provider] || 'Microsoft.Network'
-          @service_name = 'publicIPAddresses'
-          set_service_api_version(options, @service_name)
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'publicIPAddresses', 'Microsoft.Network', options)
         end
 
         # Shortcut method that returns just the IP address for the given public

data/lib/azure/armrest/network/network_interface_service.rb

@@ -5,11 +5,8 @@ module Azure
       class NetworkInterfaceService < ResourceGroupBasedService
         # Creates and returns a new NetworkInterfaceService instance.
         #
-        def initialize(_armrest_configuration, options = {})
-          super
-          @provider = options[:provider] || 'Microsoft.Network'
-          @service_name = 'networkInterfaces'
-          set_service_api_version(options, @service_name)
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'networkInterfaces', 'Microsoft.Network', options)
         end
       end
     end # Network

data/lib/azure/armrest/network/network_security_group_service.rb

@@ -6,11 +6,8 @@ module Azure
 
         # Creates and returns a new NetworkSecurityGroupService instance.
         #
-        def initialize(_armrest_configuration, options = {})
-          super
-          @provider = options[:provider] || 'Microsoft.Network'
-          @service_name = 'networkSecurityGroups'
-          set_service_api_version(options, @service_name)
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'networkSecurityGroups', 'Microsoft.Network', options)
         end
       end
     end # Network

data/lib/azure/armrest/network/virtual_network_service.rb

@@ -6,11 +6,8 @@ module Azure
 
         # Creates and returns a new VirtualNetworkService instance.
         #
-        def initialize(_armrest_configuration, options = {})
-          super
-          @provider = options[:provider] || 'Microsoft.Network'
-          @service_name = 'virtualNetworks'
-          set_service_api_version(options, @service_name)
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'virtualNetworks', 'Microsoft.Network', options)
         end
       end
     end # Network

data/lib/azure/armrest/resource_group_service.rb

@@ -6,10 +6,8 @@ module Azure
 
       # Creates and returns a new ResourceGroupService object.
       #
-      def initialize(_armrest_configuration, options = {})
-        super
-        @provider = options[:provider] || 'Microsoft.Resources'
-        set_service_api_version(options, 'resourceGroups')
+      def initialize(armrest_configuration, options = {})
+        super(armrest_configuration, 'resourceGroups', 'Microsoft.Resources', options)
       end
 
       # List all the resources for the current subscription. You can optionally

data/lib/azure/armrest/resource_provider_service.rb

@@ -23,17 +23,13 @@ module Azure
       #
       # You can also set the provider. The default is 'Microsoft.Resources'.
       #
-      def initialize(_armrest_configuration, options = {})
-        super
-
-        @provider = options[:provider] || 'Microsoft.Resources'
+      def initialize(armrest_configuration, options = {})
+        super(armrest_configuration, 'resourceGroups', 'Microsoft.Resources', options)
 
         if options[:cache_time]
           @cache_time = options[:cache_time]
           self.class.send(:cache_time=, @cache_time)
         end
-
-        set_service_api_version(options, 'resourceGroups')
       end
 
       # List all the providers for the current subscription. The results of

data/lib/azure/armrest/resource_service.rb

@@ -6,10 +6,8 @@ module Azure
 
       # Creates and returns a new ResourceService object.
       #
-      def initialize(_armrest_configuration, options = {})
-        super
-        @provider = options[:provider] || 'Microsoft.Resources'
-        set_service_api_version(options, 'subscriptions')
+      def initialize(armrest_configuration, options = {})
+        super(armrest_configuration, 'subscriptions', 'Microsoft.Resources', options)
       end
 
       # List all the resources for the current subscription. You can optionally

data/lib/azure/armrest/role/assignment_service.rb

@@ -0,0 +1,17 @@
+# Azure namespace
+module Azure
+  # Armrest namespace
+  module Armrest
+    # Role namespace
+    module Role
+      # Base class for managing Role Assignments
+      class AssignmentService < ResourceGroupBasedService
+        # Create and return a new AssignmentService instance.
+        #
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'roleAssignments', 'Microsoft.Authorization', options)
+        end
+      end # AssignmentService
+    end # Role
+  end # Armrest
+end # Azure

data/lib/azure/armrest/role/definition_service.rb

@@ -0,0 +1,17 @@
+# Azure namespace
+module Azure
+  # Armrest namespace
+  module Armrest
+    # Role namespace
+    module Role
+      # Base class for managing Role Definitions
+      class DefinitionService < ResourceGroupBasedService
+        # Create and return a new DefinitionService instance.
+        #
+        def initialize(armrest_configuration, options = {})
+          super(armrest_configuration, 'roleDefinitions', 'Microsoft.Authorization', options)
+        end
+      end # DefinitionService
+    end # Role
+  end # Armrest
+end # Azure

data/lib/azure/armrest/storage_account_service.rb

@@ -15,12 +15,9 @@ module Azure
 
       # Creates and returns a new StorageAccountService (SAS) instance.
       #
-      def initialize(_armrest_configuration, options = {})
-        super
-        @provider = options[:provider] || 'Microsoft.Storage'
-        #set_service_api_version(options, 'storageAccounts')
-        @api_version = '2015-05-01-preview' # Must hard code for now
-        @service_name = 'storageAccounts'
+      def initialize(armrest_configuration, options = {})
+        options = {'api_version' => '2015-05-01-preview'}.merge(options) # Must hard code for now
+        super(armrest_configuration, 'storageAccounts', 'Microsoft.Storage', options)
       end
 
       # Creates a new storage account, or updates an existing account with the

data/lib/azure/armrest/template_deployment_service.rb

@@ -2,12 +2,10 @@ module Azure::Armrest
   # Base class for managing templates and deployments
   class TemplateDeploymentService < ResourceGroupBasedService
 
-    def initialize(_armrest_configuration, options = {})
-      super
-      @provider = options[:provider] || 'Microsoft.Resources'
+    def initialize(armrest_configuration, options = {})
       # Has to be hard coded for now
-      set_service_api_version({'api_version' => '2014-04-01-preview'}, '')
-      @service_name = 'deployments'
+      options = {'api_version' => '2014-04-01-preview'}.merge(options)
+      super(armrest_configuration, 'deployments', 'Microsoft.Resources', options)
     end
 
     # Get names of all deployments in a resource group

data/lib/azure/armrest/version.rb

@@ -1,5 +1,5 @@
 module Azure
   module Armrest
-    VERSION = "0.0.9"
+    VERSION = "0.1.0"
   end
 end

data/lib/azure/armrest/virtual_machine_extension_service.rb

@@ -9,7 +9,6 @@ module Azure
       #
       def initialize(_armrest_configuration, options = {})
         super
-        @provider = options[:provider] || 'Microsoft.Compute'
         set_service_api_version(options, 'virtualMachines/extensions')
       end
 

data/lib/azure/armrest/virtual_machine_image_service.rb

@@ -7,9 +7,6 @@ module Azure
       # The location used in requests when gathering VM image information.
       attr_accessor :location
 
-      # The provider used in requests when gathering VM image information.
-      attr_reader :provider
-
       # The publisher used in requests when gathering VM image information.
       attr_accessor :publisher
 
@@ -19,25 +16,15 @@ module Azure
       # :publisher options as well. The default provider is set to
       # 'Microsoft.Compute'.
       #
-      def initialize(_armrest_configuration, options = {})
-        super
+      def initialize(armrest_configuration, options = {})
+        super(armrest_configuration, nil, 'Microsoft.Compute', options)
 
         @location  = options[:location]
-        @provider  = options[:provider] || 'Microsoft.Compute'
         @publisher = options[:publisher]
 
         set_service_api_version(options, 'locations/publishers')
       end
 
-      # Set a new provider to use the default for other methods. This may alter
-      # the api_version used for future requests. In practice, only
-      # 'Microsoft.Compute' or 'Microsoft.ClassicCompute' should be used.
-      #
-      def provider=(name)
-        @provider = name
-        set_service_api_version({}, 'locations/publishers')
-      end
-
       # Return a list of VM image offers from the given +publisher+ and +location+.
       #
       # Example:

data/lib/azure/armrest/virtual_machine_service.rb

@@ -4,10 +4,6 @@ module Azure
   module Armrest
     # Base class for managing virtual machines
     class VirtualMachineService < ResourceGroupBasedService
-
-      # The provider used in requests when gathering VM information.
-      attr_reader :provider
-
       # Create and return a new VirtualMachineService (VMM) instance. Most
       # methods for a VMM instance will return one or more VirtualMachine
       # instances.
@@ -16,31 +12,19 @@ module Azure
       # default is 'Microsoft.ClassicCompute'. You may need to set this to
       # 'Microsoft.Compute' for your purposes.
       #
-      def initialize(_armrest_configuration, options = {})
-        super
-        @provider = options[:provider] || 'Microsoft.Compute'
-        @service_name = 'virtualMachines'
-        set_service_api_version(options, @service_name)
-      end
-
-      # Set a new provider to use the default for other methods. This may alter
-      # the api_version used for future requests. In practice, only
-      # 'Microsoft.Compute' or 'Microsoft.ClassicCompute' should be used.
-      #
-      def provider=(name, options = {})
-        @provider = name
-        set_service_api_version(options, 'virtualMachines')
+      def initialize(armrest_configuration, options = {})
+        super(armrest_configuration, 'virtualMachines', 'Microsoft.Compute', options)
       end
 
       # Return a list of available VM series (aka sizes, flavors, etc), such
       # as "Basic_A1", though information is included as well.
       #
       def series(location)
-        unless @@providers_hash[@provider.downcase] && @@providers_hash[@provider.downcase]['locations/vmSizes']
+        unless @@providers_hash[provider.downcase] && @@providers_hash[provider.downcase]['locations/vmsizes']
           raise ArgumentError, "Invalid provider '#{provider}'"
         end
 
-        version = @@providers_hash[@provider.downcase]['locations/vmSizes']['api_version']
+        version = @@providers_hash[provider.downcase]['locations/vmsizes']['api_version']
 
         url = url_with_api_version(
           version, @base_url, 'subscriptions', armrest_configuration.subscription_id,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure-armrest
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-17 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -208,6 +208,8 @@ files:
 - lib/azure/armrest/resource_group_service.rb
 - lib/azure/armrest/resource_provider_service.rb
 - lib/azure/armrest/resource_service.rb
+- lib/azure/armrest/role/assignment_service.rb
+- lib/azure/armrest/role/definition_service.rb
 - lib/azure/armrest/storage_account_service.rb
 - lib/azure/armrest/template_deployment_service.rb
 - lib/azure/armrest/version.rb