azure 0.6.0 → 0.6.1

data/lib/azure/core/auth/signer.rb

@@ -1,48 +1,48 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require "openssl"
-require "base64"
-require "azure/core/configuration"
-
-module Azure
-  module Core
-    module Auth
-      # Public: Utility class to sign strings with HMAC-256 and then encode the
-      # signed string using Base64.
-      class Signer
-        # The access key for the account
-        attr :access_key
-
-        # Public: Initialize the Signer.
-        #
-        # access_key - The access_key encoded in Base64. Defaults to the one
-        #              in the global configuration.
-        def initialize(access_key=Azure.config.storage_access_key)
-          @access_key = Base64.strict_decode64(access_key)
-        end
-
-        # Public: Generate an HMAC signature.
-        #
-        # body - The string to sign.
-        #
-        # Returns a Base64 String signed with HMAC.
-        def sign(body)
-          signed = OpenSSL::HMAC.digest("sha256", access_key, body)
-          Base64.strict_encode64(signed)
-        end
-      end
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require "openssl"
+require "base64"
+require "azure/core/configuration"
+
+module Azure
+  module Core
+    module Auth
+      # Public: Utility class to sign strings with HMAC-256 and then encode the
+      # signed string using Base64.
+      class Signer
+        # The access key for the account
+        attr :access_key
+
+        # Public: Initialize the Signer.
+        #
+        # access_key - The access_key encoded in Base64. Defaults to the one
+        #              in the global configuration.
+        def initialize(access_key=Azure.config.storage_access_key)
+          @access_key = Base64.strict_decode64(access_key)
+        end
+
+        # Public: Generate an HMAC signature.
+        #
+        # body - The string to sign.
+        #
+        # Returns a Base64 String signed with HMAC.
+        def sign(body)
+          signed = OpenSSL::HMAC.digest("sha256", access_key, body)
+          Base64.strict_encode64(signed)
+        end
+      end
+    end
+  end
+end

data/lib/azure/core/configuration.rb

@@ -1,184 +1,211 @@
-#-------------------------------------------------------------------------
-# # Copyright (c) Microsoft and contributors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#--------------------------------------------------------------------------
-require "singleton"
-
-module Azure
-
-  # Proxy config method.
-  def self.config
-    Core.config
-  end
-
-  # Proxy configure method.
-  def self.configure
-    yield Core.config
-  end
-
-  module Core
-
-    # Public: Sugar to configure the services in a neatly wrapped DSL.
-    #
-    # Yields the Azure::Configuration instance.
-    #
-    # Example:
-    #
-    #   Azure.configure do |config|
-    #     config.storage_account_name = ENV["AZURE_STORAGE_ACCOUNT"]
-    #   end
-    #
-    # Returns nothing.
-    def self.configure
-      yield config
-    end
-
-    # Public: Access the service configuration.
-    #
-    # Returns the Azure::Configuration instance.
-    def self.config
-      Configuration.instance
-    end
-
-    # Singleton that keeps the configuration of the system.
-    class Configuration
-      include Singleton
-
-      # Public: Get/Set the Access Key for this service.
-      attr_accessor :storage_access_key
-
-      # Public: Get/Set the Account Name for this service.
-      attr_accessor :storage_account_name
-
-      # Public: Get/Set the Service Bus Access Key (Issuer Secret) for this service.
-      attr_accessor :sb_access_key
-
-      # Public: Set the Service Bus Issuer for this service.
-      attr_writer :sb_issuer
-
-      # Public: Get the issuer for the service bus. If you set something using #sb_issuer=,
-      # then we use that. Otherwise, we default to the default issuer: "owner"
-      def sb_issuer
-        @sb_issuer || "owner"
-      end
-
-      # Public: Get/Set the Service Bus Namespace for this service.
-      attr_accessor :sb_namespace
-
-      # Public: Set the host for the Table service. Only set this if you want
-      # something custom (like, for example, to point this to a LocalStorage
-      # emulator). This should be the complete host, including http:// at the
-      # start. When using the emulator, make sure to include your account name at
-      # the end.
-      #
-      # Example:
-      #
-      #   config.storage_table_host = "http://127.0.0.1:10002/devstoreaccount1"
-      attr_writer :storage_table_host
-
-      # Public: Get the host for this service. If you set something using #storage_table_host=,
-      # then we use that. Else we default to Azure's default hosts, based
-      # on your account name.
-      def storage_table_host
-        @storage_table_host || default_host(:table)
-      end
-
-      # Public: Set the host for the Blob service. Only set this if you want
-      # something custom (like, for example, to point this to a LocalStorage
-      # emulator). This should be the complete host, including http:// at the
-      # start. When using the emulator, make sure to include your account name at
-      # the end.
-      #
-      # Example:
-      #
-      #   config.storage_blob_host = "http://127.0.0.1:10000/devstoreaccount1"
-      attr_writer :storage_blob_host
-
-      # Public: Get the host for this service. If you set something using #storage_blob_host=,
-      # then we use that. Else we default to Azure's default hosts, based
-      # on your account name.
-      def storage_blob_host
-        @storage_blob_host || default_host(:blob)
-      end
-
-      # Public: Set the host for the Queue service. Only set this if you want
-      # something custom (like, for example, to point this to a LocalStorage
-      # emulator). This should be the complete host, including http:// at the
-      # start. When using the emulator, make sure to include your account name at
-      # the end.
-      #
-      # Example:
-      #
-      #   config.storage_queue_host = "http://127.0.0.1:10001/devstoreaccount1"
-      attr_writer :storage_queue_host
-
-      # Public: Get the host for this service. If you set something using #storage_queue_host=,
-      # then we use that. Else we default to Azure's default hosts, based
-      # on your account name.
-      def storage_queue_host
-        @storage_queue_host || default_host(:queue)
-      end
-
-      # Public: Get the host for the ACS service.
-      def acs_host
-        "https://#{sb_namespace}-sb.accesscontrol.windows.net"
-      end
-
-      # Public: Get the host for the Service Bus service.
-      def service_bus_host
-        "https://#{sb_namespace}.servicebus.windows.net"
-      end
-
-      # Calculate the default host for a given service in the cloud.
-      #
-      # service - One of :table, :blob, :queue, etc.
-      #
-      # Returns a String with the hostname, including your account name.
-      def default_host(service)
-        "http://#{storage_account_name}.#{service}.core.windows.net"
-      end
-
-      #===================================================================
-      #*******************Management API configuration********************
-      #===================================================================
-
-      # Public: Get the Subscription Id and certificate key for the management API.
-      attr_accessor :management_certificate
-
-      # Public: Get/Set the Subscription Id  for the management API.
-      attr_accessor :subscription_id
-
-      # Public: Set the host  for the management API.
-      attr_writer :management_endpoint
-
-      #Public: Set the  private key for SSL/HTTPS request with PEM certificate
-      attr_accessor :http_private_key
-
-      #Public: Set the  certificate key for SSL/HTTPS request with PEM certificate
-      attr_accessor :http_certificate_key
-
-      def management_endpoint
-        if @management_endpoint.nil? or @management_endpoint.empty?
-          "https://management.core.windows.net/"
-        elsif !@management_endpoint.end_with?('/')
-          @management_endpoint += '/'
-        elsif URI(@management_endpoint).scheme.nil?
-          "https://#{@management_endpoint}"
-        else
-          @management_endpoint
-        end
-      end
-
-    end
-  end
-end
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require "singleton"
+
+module Azure
+
+  # Proxy config method.
+  def self.config
+    Core.config
+  end
+
+  # Proxy configure method.
+  def self.configure
+    yield Core.config
+  end
+
+  module Core
+
+    # Public: Sugar to configure the services in a neatly wrapped DSL.
+    #
+    # Yields the Azure::Configuration instance.
+    #
+    # Example:
+    #
+    #   Azure.configure do |config|
+    #     config.storage_account_name = ENV["AZURE_STORAGE_ACCOUNT"]
+    #   end
+    #
+    # Returns nothing.
+    def self.configure
+      yield config
+    end
+
+    # Public: Access the service configuration.
+    #
+    # Returns the Azure::Configuration instance.
+    def self.config
+      Configuration.instance
+    end
+
+    # Singleton that keeps the configuration of the system.
+    class Configuration
+      include Singleton
+
+      # Public: Get/Set the Access Key for this service.
+      attr_accessor :storage_access_key
+
+      # Public: Get/Set the Account Name for this service.
+      attr_accessor :storage_account_name
+
+      # Public: Get/Set the Service Bus Access Key (Issuer Secret) for this service.
+      attr_accessor :sb_access_key
+
+      # Public: Set the Service Bus Issuer for this service.
+      attr_writer :sb_issuer
+
+      # Public: Get the issuer for the service bus. If you set something using #sb_issuer=,
+      # then we use that. Otherwise, we default to the default issuer: "owner"
+      def sb_issuer
+        @sb_issuer || "owner"
+      end
+
+      # Public: Get/Set the Service Bus Namespace for this service.
+      attr_accessor :sb_namespace
+
+      # Public: Set the host for the Table service. Only set this if you want
+      # something custom (like, for example, to point this to a LocalStorage
+      # emulator). This should be the complete host, including http:// at the
+      # start. When using the emulator, make sure to include your account name at
+      # the end.
+      #
+      # Example:
+      #
+      #   config.storage_table_host = "http://127.0.0.1:10002/devstoreaccount1"
+      attr_writer :storage_table_host
+
+      # Public: Get the host for this service. If you set something using #storage_table_host=,
+      # then we use that. Else we default to Azure's default hosts, based
+      # on your account name.
+      def storage_table_host
+        @storage_table_host || default_host(:table)
+      end
+
+      # Public: Set the host for the Blob service. Only set this if you want
+      # something custom (like, for example, to point this to a LocalStorage
+      # emulator). This should be the complete host, including http:// at the
+      # start. When using the emulator, make sure to include your account name at
+      # the end.
+      #
+      # Example:
+      #
+      #   config.storage_blob_host = "http://127.0.0.1:10000/devstoreaccount1"
+      attr_writer :storage_blob_host
+
+      # Public: Get the host for this service. If you set something using #storage_blob_host=,
+      # then we use that. Else we default to Azure's default hosts, based
+      # on your account name.
+      def storage_blob_host
+        @storage_blob_host || default_host(:blob)
+      end
+
+      # Public: Set the host for the Queue service. Only set this if you want
+      # something custom (like, for example, to point this to a LocalStorage
+      # emulator). This should be the complete host, including http:// at the
+      # start. When using the emulator, make sure to include your account name at
+      # the end.
+      #
+      # Example:
+      #
+      #   config.storage_queue_host = "http://127.0.0.1:10001/devstoreaccount1"
+      attr_writer :storage_queue_host
+
+      # Public: Get the host for this service. If you set something using #storage_queue_host=,
+      # then we use that. Else we default to Azure's default hosts, based
+      # on your account name.
+      def storage_queue_host
+        @storage_queue_host || default_host(:queue)
+      end
+
+      # Public: Get the host for the ACS service.
+      def acs_host
+        "https://#{sb_namespace}-sb.accesscontrol.windows.net"
+      end
+
+      # Public: Get the host for the Service Bus service.
+      def service_bus_host
+        "https://#{sb_namespace}.servicebus.windows.net"
+      end
+
+      # Calculate the default host for a given service in the cloud.
+      #
+      # service - One of :table, :blob, :queue, etc.
+      #
+      # Returns a String with the hostname, including your account name.
+      def default_host(service)
+        "http://#{storage_account_name}.#{service}.core.windows.net"
+      end
+
+      #===================================================================
+      #*******************Management API configuration********************
+      #===================================================================
+
+      # Public: Get the Subscription Id and certificate key for the management API.
+      attr_accessor :management_certificate
+
+      # Public: Get/Set the Subscription Id  for the management API.
+      attr_accessor :subscription_id
+
+      # Public: Set the host  for the management API.
+      attr_writer :management_endpoint
+
+      #Public: Set the  private key for SSL/HTTPS request with PEM certificate
+      attr_accessor :http_private_key
+
+      #Public: Set the  certificate key for SSL/HTTPS request with PEM certificate
+      attr_accessor :http_certificate_key
+
+      # Public: Set the host for SQL Management API (SQL Server authentication Endpoint)
+      attr_accessor :sql_database_management_endpoint
+
+      def management_endpoint
+        if @management_endpoint.nil? or @management_endpoint.empty?
+          "https://management.core.windows.net/"
+        elsif !@management_endpoint.end_with?('/')
+          @management_endpoint += '/'
+        elsif URI(@management_endpoint).scheme.nil?
+          "https://#{@management_endpoint}"
+        else
+          @management_endpoint
+        end
+      end
+
+      def sql_database_management_endpoint
+        if @sql_database_management_endpoint.nil? or @sql_database_management_endpoint.empty?
+          "https://management.database.windows.net:8443/"
+        elsif !@sql_database_management_endpoint.end_with?('/')
+          @sql_database_management_endpoint += '/'
+        elsif URI(@sql_database_management_endpoint).scheme.nil?
+          "https://#{@sql_database_management_endpoint}"
+        else
+          @management_endpoint
+        end
+      end
+
+      # Public: Set this to enable Management certificate authentication or SQL Server authentication
+      attr_accessor :sql_database_authentication_mode
+
+      def sql_database_authentication_mode
+        sdam = @sql_database_authentication_mode || :sql_server
+        if [:sql_server, :management_certificate].include? sdam.to_sym
+          sdam.to_sym
+        else
+          :sql_server
+        end
+      end
+      
+    end
+  end
+end