azure 0.6.4 → 0.7.0.pre

data/lib/azure/service/storage_service.rb

@@ -29,13 +29,13 @@ module Azure
 
       # Public: Get Storage Service properties
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452239
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452243
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452239
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452243
       #
       # Returns a Hash with the service properties or nil if the operation failed
       def get_service_properties
         uri = service_properties_uri
-        response = call(:get, uri)
+        response = call(:get, uri, nil, service_properties_headers)
         Serialization.service_properties_from_xml response.body
       end
 
@@ -43,15 +43,15 @@ module Azure
       #
       # service_properties - An instance of Azure::Entity::Service::StorageServiceProperties
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452235
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452232
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452235
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452232
       #
       # Returns boolean indicating success.
       def set_service_properties(service_properties)
         body = Serialization.service_properties_to_xml service_properties
 
         uri = service_properties_uri
-        call(:put, uri, body)
+        call(:put, uri, body, service_properties_headers)
         nil
       end
 
@@ -74,6 +74,10 @@ module Azure
           headers["x-ms-meta-#{key}"] = value
         end
       end
+
+      def service_properties_headers
+        {"x-ms-version" => "2013-08-15"}
+      end
     end
   end
 end

data/lib/azure/service/storage_service_properties.rb

@@ -14,19 +14,24 @@
 #--------------------------------------------------------------------------
 require 'azure/service/logging'
 require 'azure/service/metrics'
+require 'azure/service/cors'
 
 module Azure
   module Service
     class StorageServiceProperties
       def initialize
         @logging = Logging.new
-        @metrics = Metrics.new
+        @hour_metrics = Metrics.new
+        @minute_metrics = Metrics.new
+        @cors = Cors.new
         yield self if block_given?
       end
 
       attr_accessor :logging
-      attr_accessor :metrics
+      attr_accessor :hour_metrics
+      attr_accessor :minute_metrics
+      attr_accessor :cors
       attr_accessor :default_service_version
     end
   end
-end
+end

data/lib/azure/service_bus/brokered_message.rb

@@ -16,7 +16,7 @@ module Azure
   module ServiceBus
     class BrokeredMessage
 
-      # Please read http://msdn.microsoft.com/en-us/library/windowsazure/hh780742
+      # Please read http://msdn.microsoft.com/en-us/library/azure/hh780742
       # for more information on brokered message properties
 
       # Public: Get/Set the ContentType of the message

data/lib/azure/service_bus/relay.rb

@@ -0,0 +1,88 @@
+#-------------------------------------------------------------------------
+# # 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 'azure/service_bus/resource'
+
+module Azure
+  module ServiceBus
+    class Relay < Resource
+      # Public: Initialize the relay endpoint.
+      #
+      # ==== Attributes
+      #
+      # * +name+      - A String with the name of the relay endpoint.
+      # * +options+   - The resource options Hash
+      #
+      # ==== Options
+      #
+      # Accepted key/value pairs in options parameter are:
+      # * +:relay_type+                                  - String. Determines the type of the relay endpoint. This is required.
+      # * +:requires_client_authorization+               - Boolean. Determines whether or not clients need to authenticate when making calls.
+      # * +:requires_transport_security+                 - Boolean. Determines whether or not the endpoint uses transport security. 
+      #
+      def initialize(name, options = {})
+        normalized_options = {}
+        normalized_options["RelayType"] = options[:relay_type].to_s
+        normalized_options["RequiresClientAuthorization"] = options[:requires_client_authorization].to_s if options.has_key?(:requires_client_authorization)
+        normalized_options["RequiresTransportSecurity"] = options[:requires_transport_security].to_s if options.has_key?(:requires_transport_security)
+        super(name, normalized_options)
+      end
+
+      # RelayType: String
+      #
+      # Displays the relay type of the endpoint.
+      def relay_type
+        description['RelayType']
+      end
+
+      def relay_type=(val)
+        _set 'RelayType', val
+      end
+      
+      # RequiresClientAuthorization: Boolean
+      #
+      # Determines whether or not clients need to authenticate when making calls. 
+      #
+      # Default: true
+      def requires_client_authorization
+        to_bool description['RequiresClientAuthorization']
+      end
+
+      def requires_client_authorization=(val)
+        _set 'RequiresClientAuthorization', val
+      end
+
+      # RequiresTransportSecurity: Boolean
+      #
+      # Determines whether or not the endpoint uses transport security. 
+      #
+      # Default: true
+      def requires_transport_security
+        to_bool description['RequiresTransportSecurity']
+      end
+
+      def requires_transport_security=(val)
+        _set 'RequiresTransportSecurity', val
+      end
+
+      def ordered_props
+        [
+          'RelayType',
+          'RequiresClientAuthorization',
+          'RequiresTransportSecurity'
+        ]
+      end
+    end
+  end
+end

data/lib/azure/service_bus/serialization.rb

@@ -18,6 +18,7 @@ require "azure/service_bus/queue"
 require "azure/service_bus/topic"
 require "azure/service_bus/subscription"
 require "azure/service_bus/rule"
+require "azure/service_bus/relay"
 
 require "azure/service/enumeration_results"
 

data/lib/azure/service_bus/service_bus_service.rb

@@ -34,10 +34,67 @@ module Azure
             req.headers.delete "x-ms-version"
             req.headers.delete "DataServiceVersion"
             req.headers.delete "MaxDataServiceVersion"
+            req.headers["X-Process-At"] = "servicebus"
             res.call
           end
       end
 
+      # Creates a new relay endpoint. Once created, this relay endpoint resource manifest is immutable. 
+      # 
+      # ==== Attributes
+      #
+      # * +relay+        - Azure::ServiceBus::Relay instance to create on server, or a string of the relay endpoint name
+      # * +options+      - Hash. The relay endpoint properties. 
+      #
+      # ==== Options
+      #
+      # Accepted key/value pairs in options parameter are:
+      # * +:relay_type+                                  - String. Determines the type of the relay endpoint.
+      # * +:requires_client_authorization+               - Boolean. Determines whether or not clients need to authenticate when making calls.
+      # * +:requires_transport_security+                 - Boolean. Determines whether or not the endpoint uses transport security. 
+      #
+      def create_relay(relay, options={})
+        relay = _new_or_existing(Azure::ServiceBus::Relay, relay, options ? options : {})
+        create_resource_entry(:relay, relay, relay.name)
+      end
+
+      # Deletes an existing relay endpoint. 
+      # 
+      # ==== Attributes
+      #
+      # * +relay+ - Azure::ServiceBus::Relay instance to delete or a string of the relay endpoint name
+      def delete_relay(relay)
+        delete_resource_entry(:relay, _name_for(relay))
+      end
+
+      # Retrieves the description for the specified relay endpoint.
+      # 
+      # ==== Attributes
+      #
+      # * +relay+ - Azure::ServiceBus::Relay instance to retrieve or a string of the relay endpoint name
+      def get_relay(relay)
+        resource_entry(:relay, _name_for(relay))
+      end
+
+      # Enumerates the relay endpoints in the service namespace.
+      #
+      # ==== Attributes
+      #
+      # * +options+    - Hash. Optional parameters.
+      #
+      # ==== Options
+      #
+      # Accepted key/value pairs in options parameter are:
+      # * +:skip+      - Integer. Number of queues to skip.
+      # * +:top+       - Integer. Number of queues to list.
+      def list_relays(options={})
+        query = {}
+        query["$skip"] = options[:skip].to_i.to_s if options[:skip]
+        query["$top"] = options[:top].to_i.to_s if options[:top]
+
+        resource_list(:relay, query)
+      end
+
       # Creates a new queue. Once created, this queue's resource manifest is immutable. 
       # 
       # ==== Attributes
@@ -510,8 +567,7 @@ module Azure
       # * +:timeout+     - Integer. Timeout for the REST call.
       #
       def receive_queue_message(queue, options={})
-        peek_lock = true
-        peek_lock = options[:peek_lock] if options[:peek_lock]
+        peek_lock = options.fetch(:peek_lock, true)
 
         options[:timeout] = options[:timeout] ? options[:timeout] : DEFAULT_TIMEOUT
         if peek_lock
@@ -535,8 +591,7 @@ module Azure
       # * +:timeout+     - Integer. Timeout for the REST call.
       #
       def receive_subscription_message(topic, subscription, options={})
-        peek_lock = true
-        peek_lock = options[:peek_lock] if options[:peek_lock]
+        peek_lock = options.fetch(:peek_lock, true)
 
         options[:timeout] = options[:timeout] ? options[:timeout] : DEFAULT_TIMEOUT
         if peek_lock
@@ -782,6 +837,12 @@ module Azure
         generate_uri(subscriptions_path(topic, subscription), query)
       end
 
+      protected
+      def relay_uri(relay, query={})
+        query["api-version"] = "2013-10"
+        generate_uri(relay, query)
+      end
+
       protected
       def queue_uri(topic, query={})
         generate_uri(topic, query)
@@ -804,6 +865,11 @@ module Azure
         resource_list_uri(:subscription, query, topic)
       end
 
+      protected
+      def relay_list_uri(query={})
+        resource_list_uri(:relay, query)
+      end
+
       protected
       def queue_list_uri(query={})
         resource_list_uri(:queue, query)

data/lib/azure/sql_database_management/serialization.rb

@@ -17,6 +17,7 @@ require 'azure/sql_database_management/sql_database'
 module Azure
   module SqlDatabaseManagement
     module Serialization
+      extend Azure::Core::Utility
 
       def self.database_to_xml(login, password, location)
         builder = Nokogiri::XML::Builder.new do |xml|

data/lib/azure/sql_database_management/sql_database_management_service.rb

@@ -16,7 +16,7 @@ require 'azure/sql_database_management/serialization'
 
 module Azure
   module SqlDatabaseManagement
-    class SqlDatabaseManagementService < BaseManagementService
+    class SqlDatabaseManagementService < BaseManagement::BaseManagementService
 
       def initialize
         super()
@@ -25,17 +25,17 @@ module Azure
       # Public: Gets a list of database servers available under the
       # current subscription.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715269.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715269.aspx
       #
       # Returns an array of Azure::SqlDatabaseManagement::SqlDatabase objects
       def list_servers
         request_path = '/servers'
-        request = SqlManagementHttpRequest.new(:get, request_path, nil)
+        request = BaseManagement::SqlManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.databases_from_xml(response)
       end
 
-      # Public: Create a new database server in Windows Azure.
+      # Public: Create a new database server in Microsoft Azure.
       #
       # ==== Attributes
       #
@@ -43,35 +43,35 @@ module Azure
       # * +password+       - String. The administrator login password.
       # * +:location+      - String. The location where the database server will be created.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715274.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 = SqlManagementHttpRequest.new(:post, request_path, body)
+        request = BaseManagement::SqlManagementHttpRequest.new(:post, request_path, body)
         response = request.call
         sql_server = Serialization.server_name_from_xml(response, login, location)
-        Loggerx.info "SQL database server #{sql_server.name} is created." if sql_server
+        Azure::Loggerx.info "SQL database server #{sql_server.name} is created." if sql_server
         sql_server
       end
 
       # Public: Deletes the specified database server of given
-      # subscription id from Windows Azure.
+      # subscription id from Microsoft Azure.
       #
       # ==== Attributes
       #
       # * +name+       - String. Database server name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715285.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715285.aspx
       #
       # Returns:  None
       def delete_server(name)
         if get_sql_server(name)
           request_path = "/servers/#{name}"
-          request = SqlManagementHttpRequest.new(:delete, request_path)
+          request = BaseManagement::SqlManagementHttpRequest.new(:delete, request_path)
           request.call
-          Loggerx.info "Deleted database server #{name}."
+          Azure::Loggerx.info "Deleted database server #{name}."
         end
       end
 
@@ -83,16 +83,16 @@ module Azure
       # * +name+           - String. Database server name.
       # * +password+       - String. Database server new password.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715272.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715272.aspx
       #
       # Returns:  None
       def reset_password(name, password)
         if get_sql_server(name)
           body = Serialization.reset_password_to_xml(password)
           request_path = "/servers/#{name}?op=ResetPassword"
-          request = SqlManagementHttpRequest.new(:post, request_path, body)
+          request = BaseManagement::SqlManagementHttpRequest.new(:post, request_path, body)
           request.call
-          Loggerx.info "Password for server #{name} changed successfully."
+          Azure::Loggerx.info "Password for server #{name} changed successfully."
         end
       end
 
@@ -111,7 +111,7 @@ module Azure
       # * +: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/windowsazure/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 = {})
@@ -127,14 +127,14 @@ module Azure
             request_path = "/servers/#{server_name}/firewallrules/#{rule_name}?op=AutoDetectClientIP"
             method = :post
           end
-          request = SqlManagementHttpRequest.new(method, request_path, body)
+          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
-          Loggerx.info "Added server-level firewall rule #{rule_name}."
+          Azure::Loggerx.info "Added server-level firewall rule #{rule_name}."
         end
       end
 
@@ -145,13 +145,13 @@ module Azure
       #
       # * +server_name+    - String. Database server name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715278.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715278.aspx
       #
       # Returns an array of firewall
       def list_sql_server_firewall_rules(server_name)
         if get_sql_server(server_name)
           request_path = "/servers/#{server_name}/firewallrules"
-          request = SqlManagementHttpRequest.new(:get, request_path)
+          request = BaseManagement::SqlManagementHttpRequest.new(:get, request_path)
           response = request.call
           Serialization.database_firewall_from_xml(response)
         end
@@ -164,7 +164,7 @@ module Azure
       # * +name+            - String. SQL database server name.
       # * +rule_name+       - String. SQL database server firewall rule name.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg715277.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg715277.aspx
       #
       # Returns:  None
       def delete_sql_server_firewall_rule(server_name, rule_name)
@@ -173,9 +173,9 @@ module Azure
           raise error
         elsif get_sql_server(server_name)
           request_path = "/servers/#{server_name}/firewallrules/#{rule_name}"
-          request = SqlManagementHttpRequest.new(:delete, request_path)
+          request = BaseManagement::SqlManagementHttpRequest.new(:delete, request_path)
           request.call
-          Loggerx.info "Deleted server-level firewall rule #{rule_name}."
+          Azure::Loggerx.info "Deleted server-level firewall rule #{rule_name}."
         end
       end