azure 0.7.0.pre → 0.7.0.pre2

data/lib/azure/sql_database_management/sql_database_management_service.rb

@@ -12,189 +12,200 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
+
+require 'socket'
+require 'azure/sql_database_management/sql_server'
+require 'azure/sql_database_management/firewall_rule'
 require 'azure/sql_database_management/serialization'
+require 'azure/sql_database_management/errors'
 
 module Azure
   module SqlDatabaseManagement
+    # Service for managing SQL Azure servers and databases
     class SqlDatabaseManagementService < BaseManagement::BaseManagementService
 
-      def initialize
-        super()
-      end
-
-      # Public: Gets a list of database servers available under the
-      # current subscription.
+      # Gets a list of database servers available under the current subscription.
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715269.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715269.aspx
       #
-      # Returns an array of Azure::SqlDatabaseManagement::SqlDatabase objects
+      # @return Array<Azure::SqlDatabaseManagement::SqlServer>
       def list_servers
-        request_path = '/servers'
-        request = BaseManagement::SqlManagementHttpRequest.new(:get, request_path, nil)
-        response = request.call
-        Serialization.databases_from_xml(response)
+        response = client.sql_management_request(:get, servers_path).call
+        Serialization.servers_from_xml(response)
       end
 
-      # Public: Create a new database server in Microsoft Azure.
+      # Create a new sql server in Microsoft Azure.
       #
-      # ==== Attributes
+      # @param login      [String] The administrator login name.
+      # @param password   [String] The administrator login password.
+      # @param location   [String] The location where the database server will be created.
+      # @param version    [String|Integer] The version of the SQL server (default 12.0)
       #
-      # * +login+          - String. The administrator login name.
-      # * +password+       - String. The administrator login password.
-      # * +:location+      - String. The location where the database server will be created.
+      # @see https://msdn.microsoft.com/en-us/library/azure/dn505699.aspx
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715274.aspx
-      #
-      # Returns Azure::SqlDatabaseManagement::SqlDatabase object
-      def create_server(login, password, location)
-        body = Serialization.database_to_xml(login, password, location)
-        request_path = '/servers'
-        request = BaseManagement::SqlManagementHttpRequest.new(:post, request_path, body)
-        response = request.call
-        sql_server = Serialization.server_name_from_xml(response, login, location)
-        Azure::Loggerx.info "SQL database server #{sql_server.name} is created." if sql_server
-        sql_server
+      # @return [Azure::SqlDatabaseManagement::SqlServer]
+      def create_server(login, password, location, version = 12.0)
+        body = Serialization.server_to_xml(login, password, location, version)
+        server_names = list_servers.map(&:name)
+        created_server = nil
+
+        begin
+          response = client.sql_management_request(:post, servers_path, body: body, warn: true).call
+          created_server = Serialization.server_name_from_xml(response, login, location, version)
+        rescue RuntimeError => ex
+          if ex.message =~ /Please retry the request/
+            created_server = list_servers.reject{|server| server_names.include?(server.name)}.first
+            # sometimes the service returns 500, but it doesn't really mean it.
+            #
+            # If the operation returns success, the operation is complete and the server is created immediately. If the
+            # operation fails because of a user error, a server is not created. If there is a communication error or
+            # internal server error, you should check the status of the operation using List Servers.
+            #
+            raise unless created_server
+          else
+            raise
+          end
+        end
+        Azure::Loggerx.info "SQL database server #{created_server.name} is created." if created_server
+        created_server
       end
 
-      # Public: Deletes the specified database server of given
-      # subscription id from Microsoft Azure.
-      #
-      # ==== Attributes
+      # Deletes the specified database server of given subscription id from Microsoft Azure.
       #
-      # * +name+       - String. Database server name.
+      # @param name     [String] SqlServer name.
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715285.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715285.aspx
       #
-      # Returns:  None
+      # @return  [void]
       def delete_server(name)
-        if get_sql_server(name)
-          request_path = "/servers/#{name}"
-          request = BaseManagement::SqlManagementHttpRequest.new(:delete, request_path)
-          request.call
-          Azure::Loggerx.info "Deleted database server #{name}."
-        end
+        ensure_server_exists!(name)
+        client.sql_management_request(:delete, servers_path(name)).call
+        Azure::Loggerx.info "Deleted database server #{name}."
       end
 
-      # Public: Sets the administrative password of a SQL Database server
-      # for a subscription.
-      #
-      # ==== Attributes
+      # Sets the administrative password of a SQL Database server for a subscription. Will raise
+      # Azure::SqlManagement::Error if server does not exist.
       #
-      # * +name+           - String. Database server name.
-      # * +password+       - String. Database server new password.
+      # @param name       [String] SqlServer name.
+      # @param password   [String] SqlServer new password.
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715272.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715272.aspx
       #
-      # Returns:  None
+      # @return [void]
       def reset_password(name, password)
-        if get_sql_server(name)
-          body = Serialization.reset_password_to_xml(password)
-          request_path = "/servers/#{name}?op=ResetPassword"
-          request = BaseManagement::SqlManagementHttpRequest.new(:post, request_path, body)
-          request.call
-          Azure::Loggerx.info "Password for server #{name} changed successfully."
-        end
+        ensure_server_exists!(name)
+        body = Serialization.reset_password_to_xml(password)
+        request_path = servers_path + "#{name}?op=ResetPassword"
+        request = client.sql_management_request(:post, request_path, body)
+        request.call
+        Azure::Loggerx.info "Password for server #{name} changed successfully."
       end
 
-      # Public: The Set Server Firewall Rule operation for the given
-      # subscription adds a new server-level firewall or updates an
-      # existing server-level firewall rule for a SQL Database server.
-      #
-      # ==== Attributes
-      #
-      # * +server_name+    - String. Database server name.
-      # * +rule_name+      - String. Database server new password.
+      # Adds a new server-level firewall or updates an existing server-level firewall rule for a SQL Database server.
       #
-      #  ==== Options
+      # @param server_name    [String] SqlServer server name.
+      # @param rule_name      [String] Firewall rule name.
+      # @param start_ip       [String] The lowest IP address in the range of the server-level firewall setting.
+      #                                IP addresses equal to or greater than this can attempt to connect to the server.
+      #                                The lowest possible IP address is 0.0.0.0. (default: first local public ip)
+      # @param end_ip         [String] The highest IP address in the range of the server-level firewall setting. IP
+      #                                addresses equal to or less than this can attempt to connect to the server. The
+      #                                highest possible IP address is 255.255.255.255. (default: first local public ip)
       #
-      # Accepted key/value pairs are:
-      # * +:start_ip_address+     - String. Start of the IP Range
-      # * +:end_ip_address+       - String. End of the IP Range
-      # 
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715280.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715280.aspx
       #
-      # Returns:  None
-      def set_sql_server_firewall_rule(server_name, rule_name, options = {})
-        unless server_name.class == String && rule_name.class == String
-          raise "Missing parameter server_name or rule_name."
+      # @return  [void]
+      def set_sql_server_firewall_rule(server_name, rule_name, start_ip = public_ipv4, end_ip = public_ipv4)
+
+        if [server_name, rule_name, start_ip, end_ip].any? { |arg| arg.nil? || arg.empty? || !arg.kind_of?(String) }
+          raise ArgumentError.new('Missing or empty parameter server_name, rule_name, start_ip or end_ip')
         end
-        if get_sql_server(server_name)
-          if options[:start_ip_address] || options[:end_ip_address]
-            body = Serialization.firewall_rule_to_xml(options)
-            request_path = "/servers/#{server_name}/firewallrules/#{rule_name}"
-            method = :put
-          else
-            request_path = "/servers/#{server_name}/firewallrules/#{rule_name}?op=AutoDetectClientIP"
-            method = :post
-          end
-          request = BaseManagement::SqlManagementHttpRequest.new(method, request_path, body)
-          request.headers['x-ms-version'] = '1.0'
-          request.uri = URI.parse(Azure.config.sql_database_management_endpoint + Azure.config.subscription_id + request_path)
-          # Management certificate authentication Endpoint throws errors for this operation. Need to re-visit
-          # this once the Azure API is working.
-
-          request.call
-          Azure::Loggerx.info "Added server-level firewall rule #{rule_name}."
+
+        fw_rule = FirewallRule.new do |rule|
+          rule.name = rule_name
+          rule.start_ip_address = start_ip
+          rule.end_ip_address = end_ip
         end
+
+        body = Serialization.firewall_rule_to_xml(fw_rule)
+        method = if list_sql_server_firewall_rules(server_name).any? { |rule| rule.name == rule_name }
+                   # the rule exists, so we need to update the rule
+                   :put
+                 else
+                   # the rule doesn't exist, so we need to create the rule
+                   :post
+                 end
+        request_path = servers_path "#{server_name}/firewallrules/#{method == :put ? rule_name : ''}"
+        client.sql_management_request(method, request_path, body).call
+        Azure::Loggerx.info "Modified server-level firewall rule #{rule_name}."
       end
 
-      # Public: Gets a list of server-level firewall rules set for
-      # SQL database server.
-      #
-      # ==== Attributes
+      # Gets a list of server-level firewall rules set for SQL database servers. Will raise
+      # Azure::SqlManagement::Error if server does not exist.
       #
-      # * +server_name+    - String. Database server name.
+      # @param server_name   [String] Database server name.
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715278.aspx
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715278.aspx
       #
-      # Returns an array of firewall
+      # @return [Array<Azure::SqlDatabaseManagement::FirewallRule>]
       def list_sql_server_firewall_rules(server_name)
-        if get_sql_server(server_name)
-          request_path = "/servers/#{server_name}/firewallrules"
-          request = BaseManagement::SqlManagementHttpRequest.new(:get, request_path)
-          response = request.call
-          Serialization.database_firewall_from_xml(response)
-        end
+        ensure_server_exists!(server_name)
+        response = client.sql_management_request(:get, servers_path("#{server_name}/firewallrules")).call
+        Serialization.database_firewall_from_xml(response)
       end
 
-      # Public: Deletes a server-level firewall rule from a SQL Database server.
+      # Deletes a server-level firewall rule from a SQL Database server. Will raise
+      # Azure::SqlManagement::Error if server does not exist.
       #
-      # ==== Attributes
+      # @param server_name  [String] SQL database server name.
+      # @param rule_name    [String] SQL database server firewall rule name.
       #
-      # * +name+            - String. SQL database server name.
-      # * +rule_name+       - String. SQL database server firewall rule name.
+      # @see http://msdn.microsoft.com/en-us/library/azure/gg715277.aspx
       #
-      # See http://msdn.microsoft.com/en-us/library/azure/gg715277.aspx
-      #
-      # Returns:  None
+      # @return  [void]
       def delete_sql_server_firewall_rule(server_name, rule_name)
-        if !list_sql_server_firewall_rules(server_name).collect{|x| x[:rule]}.include?(rule_name)
-          error = "The specified firewall rule #{rule_name} does not exist."
-          raise error
-        elsif get_sql_server(server_name)
-          request_path = "/servers/#{server_name}/firewallrules/#{rule_name}"
-          request = BaseManagement::SqlManagementHttpRequest.new(:delete, request_path)
-          request.call
+        ensure_server_exists!(server_name)
+        if list_sql_server_firewall_rules(server_name).any? { |rule| rule.name == rule_name }
+          request_path = servers_path "#{server_name}/firewallrules/#{rule_name}"
+          client.sql_management_request(:delete, request_path).call
           Azure::Loggerx.info "Deleted server-level firewall rule #{rule_name}."
+        else
+          raise RuleDoesNotExist.new("Firewall rule named #{rule_name} does not exist for server named #{server_name}")
         end
       end
 
       private
 
-      def get_sql_server(server_name)
-        if server_name.empty?
-          error = Azure::Error::Error.new("DatabaseServerNotFound", 40645,  "Servername cannot be empty or null.")
-        else
-          sql_server = list_servers.collect(&:name).include?(server_name)
-          if sql_server
-            return sql_server
-          else
-            error = Azure::Error::Error.new("DatabaseServerNotFound", 40647,  "Subscription #{Azure.config.subscription_id} does not have server #{server_name}.")
-          end
-        end
-        raise error if error
+      def servers_path(end_path = '')
+        '/servers' + if end_path.start_with?('/')
+                       end_path
+                     elsif end_path.empty?
+                       ''
+                     else
+                       "/#{end_path}"
+                     end
+      end
+
+      # Ensures the a database server of a given name exists and raises Azure::SqlManagement::ServerDoesNotExist if it
+      # does not exist
+      #
+      # @param server_name [String] The name of the Azure SQL Server
+      # @return [void] Returns true if the server exists
+      def ensure_server_exists!(server_name)
+        raise ServerDoesNotExist.new("Server named #{server_name} does not exist.") unless server_exists?(server_name)
+      end
+
+      def server_exists?(server_name)
+        ArgumentError.new('Servername cannot be empty or null.') if server_name.empty?
+        list_servers.any? { |server| server.name == server_name }
+      end
+
+      def public_ipv4
+        @public_ip ||= `curl -s whatismyip.akamai.com`
       end
 
     end
   end
 end
+
+Azure::SqlDatabaseManagementService = Azure::SqlDatabaseManagement::SqlDatabaseManagementService

data/lib/azure/sql_database_management/{sql_database.rb → sql_server.rb}

@@ -14,7 +14,7 @@
 #--------------------------------------------------------------------------
 module Azure
   module SqlDatabaseManagement
-    class SqlDatabase
+    class SqlServer
 
       def initialize
         yield self if block_given?
@@ -23,8 +23,9 @@ module Azure
       attr_accessor :name
       attr_accessor :administrator_login
       attr_accessor :location
-      attr_accessor :feature_name
-      attr_accessor :feature_value
+      attr_accessor :fully_qualified_domain_name
+      attr_accessor :version
+      attr_accessor :state
 
     end
   end

data/lib/azure/storage_management/storage_management_service.rb

@@ -18,16 +18,13 @@ module Azure
   module StorageManagement
     # Provides Storage Management API
     class StorageManagementService < BaseManagement::BaseManagementService
-      def initialize
-        super()
-      end
       # Public: Gets a list of storage accounts available under the
       # current subscription.
       #
       # Returns an array of Azure::StorageManagement::StorageAccount objects
       def list_storage_accounts
         request_path = '/services/storageservices'
-        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
+        request = client.management_request(:get, request_path)
         response = request.call
         Serialization.storage_services_from_xml(response)
       end
@@ -54,7 +51,7 @@ module Azure
       # Returns the storage account
       def get_storage_account_properties(name)
         request_path = "/services/storageservices/#{name}"
-        request = Azure::BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
+        request = client.management_request(:get, request_path)
         response = request.call
         Serialization.storage_services_from_xml(response).first
       end
@@ -97,7 +94,7 @@ module Azure
           Azure::Loggerx.info "Creating Storage Account #{name}."
           body = Serialization.storage_services_to_xml(name, options)
           request_path = '/services/storageservices'
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:post, request_path, body)
+          request = client.management_request(:post, request_path, body: body)
           request.call
         end
       end
@@ -134,7 +131,7 @@ module Azure
           Azure::Loggerx.info "Account '#{name}' exists, updating..."
           body = Serialization.storage_update_to_xml options
           request_path = "/services/storageservices/#{name}"
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:put, request_path, body)
+          request = client.management_request(:put, request_path, body)
           request.call
         else
           Azure::Loggerx.warn "Storage Account '#{name}' does not exist. Skipped..."
@@ -154,7 +151,7 @@ module Azure
       def delete_storage_account(name)
         Azure::Loggerx.info "Deleting Storage Account #{name}."
         request_path = "/services/storageservices/#{name}"
-        request = Azure::BaseManagement::ManagementHttpRequest.new(:delete, request_path)
+        request = client.management_request(:delete, request_path)
         request.call
       rescue => e
         e.message
@@ -175,7 +172,7 @@ module Azure
         if get_storage_account name
           path = "/services/storageservices/#{name}/keys?action=regenerate"
           body = Serialization.regenerate_storage_account_keys_to_xml key_type
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:post, path, body)
+          request = client.management_request(:post, path, body)
           response = request.call
           Serialization.storage_account_keys_from_xml(response)
         else
@@ -196,7 +193,7 @@ module Azure
       def get_storage_account_keys(name)
         if get_storage_account name
           path = "/services/storageservices/#{name}/keys"
-          request = Azure::BaseManagement::ManagementHttpRequest.new(:get, path)
+          request = client.management_request(:get, path)
           response = request.call
           Serialization.storage_account_keys_from_xml(response)
         else
@@ -206,3 +203,5 @@ module Azure
     end
   end
 end
+
+Azure::StorageManagementService = Azure::StorageManagement::StorageManagementService

data/lib/azure/table/auth/shared_key.rb

@@ -12,80 +12,47 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "cgi"
-
-require "azure/core/configuration"
-require "azure/core/auth/signer"
+require 'cgi'
+require 'azure/core/auth/signer'
 
 module Azure
   module Table
     module Auth
-      class SharedKey < Azure::Core::Auth::Signer
+      class SharedKey < Azure::Core::Auth::SharedKey
         # The account name
         attr :account_name
 
-        # Public: Initialize the Signer.
-        #
-        # account_name - The account name. Defaults to the one in the
-        #                global configuration.
-        # access_key   - The access_key encoded in Base64. Defaults to the
-        #                one in the global configuration.
-        def initialize(account_name=Azure.config.storage_account_name, access_key=Azure.config.storage_access_key)
-          @account_name = account_name
-          super(access_key)
-        end
-
-        # Public: The name of the strategy.
-        #
-        # Returns a String.
-        def name
-          "SharedKey"
-        end
-
-        # Public: Generate a request signature.
-        #
-        # verb       - The HTTP request method.
-        # uri        - The URI of the request we're signing.
-        # headers    - A Hash of HTTP request headers.
-        #
-        # Returns a Base64 String signed with HMAC.
-        def sign(method, uri, headers)
-          signature = super(signable_string(method, uri, headers))
-          return "#{account_name}:#{signature}"
-        end
-
         # Generate the string to sign.
         #
-        # verb       - The HTTP request method.
-        # uri        - The URI of the request we're signing.
-        # headers    - A Hash of HTTP request headers.
+        # @param method   [Symbol]  The HTTP request method.
+        # @param uri      [URI]     The URI of the request we're signing.
+        # @param headers  [Hash]    The HTTP request headers.
         #
         # Returns a plain text string.
         def signable_string(method, uri, headers)
           [
-            method.to_s.upcase,
-            headers.fetch("Content-MD5", ""),
-            headers.fetch("Content-Type", ""),
-            headers.fetch("Date") { headers.fetch("x-ms-date") },
-            canonicalized_resource(uri)
+              method.to_s.upcase,
+              headers.fetch('Content-MD5', ''),
+              headers.fetch('Content-Type', ''),
+              headers.fetch('Date') { headers.fetch('x-ms-date') },
+              canonicalized_resource(uri)
           ].join("\n")
         end
 
         # Calculate the Canonicalized Resource string for a request.
         #
-        # uri - The request's URI.
+        # @param uri [URI] The request's URI.
         #
-        # Returns a String with the canonicalized resource.
+        # @return  [String] with the canonicalized resource.
         def canonicalized_resource(uri)
-          resource = "/%s%s" % [account_name, uri.path]
+          resource = "/#{account_name}#{uri.path}"
 
-          comp = CGI.parse(uri.query.to_s).fetch("comp", nil)
-          if (comp)
-            resource = [resource, "comp=" + comp[0]].join("?")
-          end
+          comp = CGI.parse(uri.query.to_s).fetch('comp', nil)
+          resource = [resource, 'comp=' + comp[0]].join('?') if comp
 
           resource
         end
+
       end
     end
   end