ms_rest_azure 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d14c95c8933931dff67eef6da2b22a6bbee03a8
-  data.tar.gz: 00d3d6bfce74a3eb61d9991fb06f14b600e90bd4
+  metadata.gz: 5457fba833750435c73dcd0e66ed4e69e9a4499b
+  data.tar.gz: 2f580ffcff1c2dae441e06ac7bf889cfc5669c2d
 SHA512:
-  metadata.gz: fe833a3a8333eb293af8a78b20ac9685f21bc03c17677b8ee39de1048220f02f81f39de8ee25b3111f6027a96c953d370a497fc6dab0dfad4c936e6a5c5a787f
-  data.tar.gz: 3a3c1d17168f1553eaf4d2295b7a8733a357b30def2dcbc357dd80c1e5eda4ecd2b550aecfd03aee7322c06b0bac1eb72d474f6a3ac47db13290fd3383142f77
+  metadata.gz: fea6e2850e1e7760dfdf6fb9fb67c0920d4cdd445c01826638cd194bd49a3e4aed1458f88ddca41da1c90b80601233c595f5e20019303af407d51f3661c34bce
+  data.tar.gz: ca590be6eb21343388abcbc25fcb57cdc61388e52b6379dd3b066ffbae81258e017263b79aa79cf91aaea28f850447bc995cd85f75d63cbeee6ee7fdba8beba7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+##2017.11.10 ms_rest_azure version 0.10.0
+* Modified portal URLs for Azure cloud environments. Refer [PR #1106](https://github.com/Azure/azure-sdk-for-ruby/pull/1106) for further details.
+* [Breaking Change] Removed Resource and SubResource classes. Refer [PR #1106](https://github.com/Azure/azure-sdk-for-ruby/pull/1106) for further details.
+* Added Configurable and Default classes to be used by the profile gems. Refer [PR #1111](https://github.com/Azure/azure-sdk-for-ruby/pull/1111) for further details.
+
 ##2017.09.11 ms_rest_azure version 0.9.0
 * [Breaking Change] Managed Service Identity authentication to acquire token does not require `tenant_id`.[Issue #930](https://github.com/Azure/azure-sdk-for-ruby/issues/930) [PR #931](https://github.com/Azure/azure-sdk-for-ruby/pull/931)
 

data/README.md

@@ -37,7 +37,7 @@ To start working on the gem the only additional dev dependecy is required - rspe
 Reference it in the gemfile and also add this line to your client's gemspec file:
 
 ```ruby
-spec.add_runtime_dependency 'ms_rest_azure', '~> 0.9.0'
+spec.add_runtime_dependency 'ms_rest_azure', '~> 0.10.0'
 ```
 Don't forget to correct the version.
 

data/lib/ms_rest_azure.rb

@@ -13,11 +13,14 @@ require 'ms_rest_azure/cloud_error_data.rb'
 require 'ms_rest_azure/credentials/application_token_provider.rb'
 require 'ms_rest_azure/credentials/msi_token_provider.rb'
 require 'ms_rest_azure/polling_state.rb'
-require 'ms_rest_azure/sub_resource.rb'
-require 'ms_rest_azure/resource.rb'
 require 'ms_rest_azure/serialization.rb'
 require 'ms_rest_azure/version'
+require 'ms_rest_azure/common/configurable'
+require 'ms_rest_azure/common/default'
 
 module MsRestAzure end
 module MsRestAzure::Serialization end
 module MsRestAzure::AzureEnvironments end
+module MsRestAzure::Common end
+module MsRestAzure::Common::Configurable end
+module MsRestAzure::Common::Default end

data/lib/ms_rest_azure/azure_environment.rb

@@ -86,7 +86,7 @@ module MsRestAzure
 
     AzureCloud = AzureEnvironments::AzureEnvironment.new({
                                                         :name => 'AzureCloud',
-                                                        :portal_url => 'http://go.microsoft.com/fwlink/?LinkId=254433',
+                                                        :portal_url => 'https://portal.azure.com',
                                                         :publishing_profile_url => 'http://go.microsoft.com/fwlink/?LinkId=254432',
                                                         :management_endpoint_url => 'https://management.core.windows.net',
                                                         :resource_manager_endpoint_url => 'https://management.azure.com/',
@@ -104,7 +104,7 @@ module MsRestAzure
                                                     })
     AzureChinaCloud = AzureEnvironments::AzureEnvironment.new({
                                                         :name => 'AzureChinaCloud',
-                                                        :portal_url => 'http://go.microsoft.com/fwlink/?LinkId=301902',
+                                                        :portal_url => 'https://portal.azure.cn',
                                                         :publishing_profile_url => 'http://go.microsoft.com/fwlink/?LinkID=301774',
                                                         :management_endpoint_url => 'https://management.core.chinacloudapi.cn',
                                                         :resource_manager_endpoint_url => 'https://management.chinacloudapi.cn',
@@ -123,14 +123,14 @@ module MsRestAzure
                                                     })
     AzureUSGovernment = AzureEnvironments::AzureEnvironment.new({
                                                         :name => 'AzureUSGovernment',
-                                                        :portal_url => 'https://manage.windowsazure.us',
+                                                        :portal_url => 'https://portal.azure.us',
                                                         :publishing_profile_url => 'https://manage.windowsazure.us/publishsettings/index',
                                                         :management_endpoint_url => 'https://management.core.usgovcloudapi.net',
                                                         :resource_manager_endpoint_url => 'https://management.usgovcloudapi.net',
                                                         :sql_management_endpoint_url => 'https://management.core.usgovcloudapi.net:8443/',
                                                         :sql_server_hostname_suffix => '.database.usgovcloudapi.net',
                                                         :gallery_endpoint_url => 'https://gallery.usgovcloudapi.net/',
-                                                        :active_directory_endpoint_url => 'https://login.microsoftonline.com/',
+                                                        :active_directory_endpoint_url => 'https://login-us.microsoftonline.com/',
                                                         :active_directory_resource_id => 'https://management.core.usgovcloudapi.net/',
                                                         :active_directory_graph_resource_id => 'https://graph.windows.net/',
                                                         :active_directory_graph_api_version => '2013-04-05',

data/lib/ms_rest_azure/common/configurable.rb

@@ -0,0 +1,86 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+
+module MsRestAzure::Common
+  # The Azure::Common::Configurable module provides basic configuration for Azure activities.
+  module Configurable
+    # @return [String] Azure tenant id (also known as domain).
+    attr_accessor :tenant_id
+
+    # @return [String] Azure client id.
+    attr_accessor :client_id
+
+    # @return [String] Azure secret key.
+    attr_accessor :client_secret
+
+    # @return [String] Azure subscription id.
+    attr_accessor :subscription_id
+
+    # @return [MsRestAzure::ActiveDirectoryServiceSettings] Azure active directory service settings.
+    attr_accessor :active_directory_settings
+
+    # @return [MsRest::ServiceClientCredentials] credentials to authorize HTTP requests made by the service client.
+    attr_accessor :credentials
+
+    class << self
+      #
+      # List of configurable keys for {Azure::Common::Client}.
+      # @return [Array] of option keys.
+      #
+      def keys
+        @keys ||= [:tenant_id, :client_id, :client_secret, :subscription_id, :active_directory_settings]
+      end
+    end
+
+    #
+    # Set configuration options using a block.
+    #
+    def configure
+      yield self
+    end
+
+    #
+    # Resets the configurable options to provided options or defaults.
+    # This will also creates MsRest::TokenCredentials to be used for subsequent Azure Resource Manager clients.
+    #
+    def reset!(options = {})
+      MsRestAzure::Common::Configurable.keys.each do |key|
+        default_value = MsRestAzure::Common::Default.options[key]
+        instance_variable_set(:"@#{key}", options.fetch(key, default_value))
+      end
+
+      fail ArgumentError, 'tenant_id is nil' if self.tenant_id.nil?
+      fail ArgumentError, 'client_id is nil' if self.client_id.nil?
+      fail ArgumentError, 'client_secret is nil' if self.client_secret.nil?
+      fail ArgumentError, 'subscription_id is nil' if self.subscription_id.nil?
+      fail ArgumentError, 'active_directory_settings is nil' if self.active_directory_settings.nil?
+
+      default_value = MsRest::TokenCredentials.new(
+        MsRestAzure::ApplicationTokenProvider.new(
+          self.tenant_id, self.client_id, self.client_secret, self.active_directory_settings))
+
+      instance_variable_set(:"@credentials", options.fetch(:credentials, default_value))
+
+      self
+    end
+
+    def config
+      self
+    end
+
+    private
+
+    #
+    # configures configurable options to default values
+    #
+    def setup_default_options
+      opts = {}
+      MsRestAzure::Common::Configurable.keys.map do |key|
+        opts[key] = MsRestAzure::Common::Default.options[key]
+      end
+
+      opts
+    end
+  end
+end

data/lib/ms_rest_azure/common/default.rb

@@ -0,0 +1,57 @@
+# encoding: utf-8
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+
+module MsRestAzure::Common
+  module Default
+    class << self
+      #
+      # Default Azure Tenant Id.
+      # @return [String] Azure Tenant Id.
+      #
+      def tenant_id
+        ENV['AZURE_TENANT_ID']
+      end
+
+      #
+      # Default Azure Client Id.
+      # @return [String] Azure Client Id.
+      #
+      def client_id
+        ENV['AZURE_CLIENT_ID']
+      end
+
+      #
+      # Default Azure Client Secret.
+      # @return [String] Azure Client Secret.
+      #
+      def client_secret
+        ENV['AZURE_CLIENT_SECRET']
+      end
+
+      #
+      # Default Azure Subscription Id.
+      # @return [String] Azure Subscription Id.
+      #
+      def subscription_id
+        ENV['AZURE_SUBSCRIPTION_ID']
+      end
+
+      #
+      # Default Azure Active Directory Service Settings.
+      # @return [MsRestAzure::ActiveDirectoryServiceSettings] Azure Active Directory Service Settings.
+      #
+      def active_directory_settings
+        MsRestAzure::ActiveDirectoryServiceSettings.get_azure_settings
+      end
+
+      #
+      # Configuration options.
+      # @return [Hash] Configuration options.
+      #
+      def options
+        Hash[MsRestAzure::Common::Configurable.keys.map { |key| [key, send(key)]}]
+      end
+    end
+  end
+end

data/lib/ms_rest_azure/version.rb

@@ -3,5 +3,5 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 
 module MsRestAzure
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ms_rest_azure
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Microsoft Corporation
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-11 00:00:00.000000000 Z
+date: 2017-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.2
 description: Azure Client Library for Ruby.
 email: azsdkteam@microsoft.com
 executables: []
@@ -125,12 +125,12 @@ files:
 - lib/ms_rest_azure/azure_operation_response.rb
 - lib/ms_rest_azure/azure_service_client.rb
 - lib/ms_rest_azure/cloud_error_data.rb
+- lib/ms_rest_azure/common/configurable.rb
+- lib/ms_rest_azure/common/default.rb
 - lib/ms_rest_azure/credentials/application_token_provider.rb
 - lib/ms_rest_azure/credentials/msi_token_provider.rb
 - lib/ms_rest_azure/polling_state.rb
-- lib/ms_rest_azure/resource.rb
 - lib/ms_rest_azure/serialization.rb
-- lib/ms_rest_azure/sub_resource.rb
 - lib/ms_rest_azure/version.rb
 homepage: https://aka.ms/ms_rest_azure
 licenses:

data/lib/ms_rest_azure/resource.rb

@@ -1,89 +0,0 @@
-# encoding: utf-8
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-
-
-module MsRestAzure
-  #
-  # Class which represents any Azure resource.
-  #
-  class Resource < SubResource
-
-    # @return [String] the name of the resource.
-    attr_accessor :name
-
-    # @return [String] the type of the resource.
-    attr_accessor :type
-
-    # @return [String] the location of the resource (required).
-    attr_accessor :location
-
-    # @return [Hash{String => String}] the tags attached to resources (optional).
-    attr_accessor :tags
-
-    # @return [String] the name of the resource group of the resource.
-    def resource_group
-      unless self.id.nil?
-        groups = self.id.match(/.+\/resourceGroups\/([^\/]+)\/.+/)
-        groups.captures[0].strip if groups
-      end
-    end
-
-    def self.mapper
-      {
-        required: false,
-        serialized_name: 'Resource',
-        type: {
-          name: 'Composite',
-          class_name: 'Resource',
-          model_properties: {
-              id: {
-                required: false,
-                serialized_name: 'id',
-                type: {
-                  name: 'String'
-                }
-              },
-              name: {
-                required: false,
-                read_only: true,
-                serialized_name: 'name',
-                type: {
-                  name: 'String'
-                }
-              },
-              type: {
-                required: false,
-                read_only: true,
-                serialized_name: 'type',
-                type: {
-                  name: 'String'
-                }
-              },
-              location: {
-                required: false,
-                serialized_name: 'location',
-                type: {
-                  name: 'String'
-                }
-              },
-              tags: {
-                required: false,
-                serialized_name: 'tags',
-                type: {
-                  name: 'Dictionary',
-                  value: {
-                      required: false,
-                      serialized_name: 'StringElementType',
-                      type: {
-                        name: 'String'
-                      }
-                  }
-                }
-              }
-          }
-        }
-      }
-    end
-  end
-end

data/lib/ms_rest_azure/sub_resource.rb

@@ -1,34 +0,0 @@
-# encoding: utf-8
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See License.txt in the project root for license information.
-
-module MsRestAzure
-  #
-  # Class which represents any Azure subresource.
-  #
-  class SubResource
-
-    # @return [String] the id of the subresource.
-    attr_accessor :id
-
-    def self.mapper
-      {
-        required: false,
-        serialized_name: 'SubResource',
-        type: {
-          name: 'Composite',
-          class_name: 'SubResource',
-          model_properties: {
-            id: {
-              required: false,
-              serialized_name: 'id',
-              type: {
-                name: 'String'
-              }
-            }
-          }
-        }
-      }
-    end
-  end
-end