azure 0.6.4 → 0.7.0.pre

data/lib/azure/cloud_service_management/cloud_service_management_service.rb

@@ -16,12 +16,14 @@ require 'azure/cloud_service_management/serialization'
 
 module Azure
   module CloudServiceManagement
-    class CloudServiceManagementService < BaseManagementService
+    class CloudServiceManagementService < BaseManagement::BaseManagementService
+      include Azure::Core::Utility
+
       def initialize
         super()
       end
 
-      # Public: Creates a new cloud service in Windows Azure.
+      # Public: Creates a new cloud service in Microsoft Azure.
       #
       # ==== Attributes
       #
@@ -43,18 +45,18 @@ module Azure
       # properties to add to the cloud service. The key is used as the
       # property name and the value as its value. (optional)
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/gg441304.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/gg441304.aspx
       #
       # Returns None
       def create_cloud_service(name, options = {})
-        Loggerx.error_with_exit 'Cloud service name is not valid ' unless name
+        Azure::Loggerx.error_with_exit 'Cloud service name is not valid ' unless name
         if get_cloud_service(name)
-          Loggerx.warn "Cloud service #{name} already exists. Skipped..."
+          Azure::Loggerx.warn "Cloud service #{name} already exists. Skipped..."
         else
-          Loggerx.info "Creating cloud service #{name}."
+          Azure::Loggerx.info "Creating cloud service #{name}."
           request_path = '/services/hostedservices'
           body = Serialization.cloud_services_to_xml(name, options)
-          request = ManagementHttpRequest.new(:post, request_path, body)
+          request = BaseManagement::ManagementHttpRequest.new(:post, request_path, body)
           request.call
         end
       end
@@ -64,7 +66,7 @@ module Azure
       # Returns an array of Azure::CloudServiceManagement::CloudService objects
       def list_cloud_services
         request_path = '/services/hostedservices'
-        request = ManagementHttpRequest.new(:get, request_path, nil)
+        request = BaseManagement::ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
         Serialization.cloud_services_from_xml(response)
       end
@@ -79,25 +81,17 @@ module Azure
       # If true, the cloud service is available. If false, the cloud service
       # does not exist.
       def get_cloud_service(name)
-        return false if name.nil?
-        flag = false
-        list_cloud_services.each do |cloud_service|
-          if cloud_service.name == name
-            flag = true
-            break
-          end
-        end
-        flag
+        list_cloud_services.select { |x| x.name.casecmp(name) == 0 }.first
       end
 
       def get_cloud_service_properties(name)
         request_path = "/services/hostedservices/#{name}?embed-detail=true"
-        request = ManagementHttpRequest.new(:get, request_path)
+        request = BaseManagement::ManagementHttpRequest.new(:get, request_path)
         response = request.call
         Serialization.cloud_services_from_xml(response).first
       end
 
-      # Public: Deletes the specified cloud service of given subscription id from Windows Azure.
+      # Public: Deletes the specified cloud service of given subscription id from Microsoft Azure.
       #
       # ==== Attributes
       #
@@ -105,9 +99,9 @@ module Azure
       #
       # Returns:  None
       def delete_cloud_service(cloud_service_name)
-        request_path = "/services/hostedservices/#{cloud_service_name}"
-        request = ManagementHttpRequest.new(:delete, request_path)
-        Loggerx.info "Deleting cloud service #{cloud_service_name}. \n"
+        request_path= "/services/hostedservices/#{cloud_service_name}"
+        request = BaseManagement::ManagementHttpRequest.new(:delete, request_path)
+        Azure::Loggerx.info "Deleting cloud service #{cloud_service_name}. \n"
         request.call
       end
 
@@ -116,23 +110,26 @@ module Azure
       # ==== Attributes
       #
       # * +cloud_service_name+  - String. Cloud service name.
+      # * +slot+                - String. 'production' or 'staging'. Optional parameters.
+      #                           Default if not specified is 'production'
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/ee460815.aspx
+      # See http://msdn.microsoft.com/en-us/library/azure/ee460815.aspx
       #
       # Returns NONE
-      def delete_cloud_service_deployment(cloud_service_name)
-        request_path = "/services/hostedservices/#{cloud_service_name}/deploymentslots/production"
-        request = ManagementHttpRequest.new(:delete, request_path)
-        Loggerx.info "Deleting deployment of cloud service \"#{cloud_service_name}\" ..."
+      def delete_cloud_service_deployment(cloud_service_name, slot='production')
+        slot = 'production' unless slot
+        request_path= "/services/hostedservices/#{cloud_service_name}/deploymentslots/#{slot}"
+        request = BaseManagement::ManagementHttpRequest.new(:delete, request_path)
+        Azure::Loggerx.info "Deleting deployment of cloud service \"#{cloud_service_name}\" ..."
         request.call
       end
 
       def upload_certificate(cloud_service_name, ssh)
         data = export_der(ssh[:cert], ssh[:key])
-        request_path = "/services/hostedservices/#{cloud_service_name}/certificates"
+        request_path= "/services/hostedservices/#{cloud_service_name}/certificates"
         body = Serialization.add_certificate_to_xml(data)
-        Loggerx.info "Uploading certificate to cloud service #{cloud_service_name}..."
-        request = ManagementHttpRequest.new(:post, request_path, body)
+        Azure::Loggerx.info "Uploading certificate to cloud service #{cloud_service_name}..."
+        request = BaseManagement::ManagementHttpRequest.new(:post, request_path, body)
         request.call
       end
     end

data/lib/azure/cloud_service_management/serialization.rb

@@ -19,6 +19,7 @@ require 'azure/virtual_machine_management/serialization'
 module Azure
   module CloudServiceManagement
     module Serialization
+      extend Azure::Core::Utility
       def self.cloud_services_to_xml(name, options = {})
         options[:label] = options[:label] || name
 

data/lib/azure/core.rb

@@ -15,25 +15,27 @@
 
 module Azure::Core; end
 
-require "azure/core/error"
-require "azure/core/configuration"
+require 'azure/core/error'
+require 'azure/core/configuration'
 
 # load default configuration from environment variables
 # (user can always override this later)
 Azure.configure do |config|
-  config.storage_access_key     = ENV["AZURE_STORAGE_ACCESS_KEY"]
-  config.storage_account_name   = ENV["AZURE_STORAGE_ACCOUNT"]
-  config.storage_table_host     = ENV["AZURE_STORAGE_TABLE_HOST"]
-  config.storage_blob_host      = ENV["AZURE_STORAGE_BLOB_HOST"]
-  config.storage_queue_host     = ENV["AZURE_STORAGE_QUEUE_HOST"]
+  config.storage_access_key     = ENV['AZURE_STORAGE_ACCESS_KEY']
+  config.storage_account_name   = ENV['AZURE_STORAGE_ACCOUNT']
+  config.storage_table_host     = ENV['AZURE_STORAGE_TABLE_HOST']
+  config.storage_blob_host      = ENV['AZURE_STORAGE_BLOB_HOST']
+  config.storage_queue_host     = ENV['AZURE_STORAGE_QUEUE_HOST']
 
-  config.sb_namespace  = ENV["AZURE_SERVICEBUS_NAMESPACE"]
-  config.sb_access_key  = ENV["AZURE_SERVICEBUS_ACCESS_KEY"]
-  config.sb_issuer      = ENV["AZURE_SERVICEBUS_ISSUER"]
+  config.sb_namespace  = ENV['AZURE_SERVICEBUS_NAMESPACE']
+  config.sb_access_key  = ENV['AZURE_SERVICEBUS_ACCESS_KEY']
+  config.sb_issuer      = ENV['AZURE_SERVICEBUS_ISSUER']
 
-  config.management_certificate  = ENV["AZURE_MANAGEMENT_CERTIFICATE"]
-  config.subscription_id         = ENV["AZURE_SUBSCRIPTION_ID"]
-  config.management_endpoint     = ENV["AZURE_MANAGEMENT_ENDPOINT"]
-  config.sql_database_management_endpoint = ENV["AZURE_SQL_DATABASE_MANAGEMENT_ENDPOINT"]
-  config.sql_database_authentication_mode = ENV["AZURE_SQL_DATABASE_AUTHENTICATION_MODE"]
+  config.management_certificate  = ENV['AZURE_MANAGEMENT_CERTIFICATE']
+  config.subscription_id         = ENV['AZURE_SUBSCRIPTION_ID']
+  config.management_endpoint     = ENV['AZURE_MANAGEMENT_ENDPOINT']
+  config.sql_database_management_endpoint = ENV['AZURE_SQL_DATABASE_MANAGEMENT_ENDPOINT']
+  config.sql_database_authentication_mode = ENV['AZURE_SQL_DATABASE_AUTHENTICATION_MODE']
+
+  config.ca_file = ENV['SSL_CERT_FILE']
 end

data/lib/azure/core/configuration.rb

@@ -66,6 +66,13 @@ module Azure
       # Public: Set the Service Bus Issuer for this service.
       attr_writer :sb_issuer
 
+      # Public: Get/Set path of a CA certification directory containing certifications in
+      # PEM format.
+      #
+      # For example:
+      #   config.ca_file = 'ca_cert.pem'
+      attr_accessor :ca_file
+
       # 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

data/lib/azure/core/http/http_error.rb

@@ -29,7 +29,7 @@ module Azure
 
         # Public: The type of error
         #
-        # http://msdn.microsoft.com/en-us/library/windowsazure/dd179357
+        # http://msdn.microsoft.com/en-us/library/azure/dd179357
         #
         # Returns a String
         attr :type

data/lib/azure/core/http/http_request.rb

@@ -140,10 +140,13 @@ module Azure
             http = Net::HTTP.new(uri.host, uri.port)
           end
 
+          http.read_timeout = headers['Keep-Alive'].split('=').last.to_i unless headers.nil? || headers['Keep-Alive'].nil?
+
           if uri.scheme.downcase == 'https'
             # require 'net/https'
+            http.ca_file = Azure.config.ca_file if Azure.config.ca_file
             http.use_ssl = true
-            http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+            http.verify_mode = OpenSSL::SSL::VERIFY_PEER
           end
 
           response = HttpResponse.new(http.request(request))

data/lib/azure/core/utility.rb

@@ -60,7 +60,7 @@ module Azure
         elsif File.exist?(File.join(ENV['HOME'], name))
           File.join(ENV['HOME'], name)
         else
-          Loggerx.error_with_exit "Unable to find #{name} file  "
+          Azure::Loggerx.error_with_exit "Unable to find #{name} file  "
         end
       end
 
@@ -79,6 +79,21 @@ module Azure
       def enable_winrm?(winrm_transport)
         (!winrm_transport.nil? && (winrm_transport.select { |x| x.downcase == 'http' || x.downcase == 'https' }.size > 0))
       end
+
+      def get_certificate(private_key_file)
+        rsa = OpenSSL::PKey.read File.read(private_key_file)
+        cert = OpenSSL::X509::Certificate.new
+        cert.version = 2
+        cert.serial = 0
+        name = OpenSSL::X509::Name.new([['CN', 'Azure Management Certificate']])
+        cert.subject = cert.issuer = name
+        cert.not_before = Time.now
+        cert.not_after = cert.not_before + (60*60*24*365)
+        cert.public_key = rsa.public_key
+        cert.sign(rsa, OpenSSL::Digest::SHA1.new)
+        cert
+      end
+
     end
 
     # Logger

data/lib/azure/queue/queue_service.rb

@@ -55,7 +55,7 @@ module Azure
       # service. Beginning with that version, all metadata names must adhere to the naming 
       # conventions for C# identifiers.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179466 
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179466 
       #
       # Any metadata with invalid names which were previously stored, will be returned with the 
       # key "x-ms-invalid-name" in the metadata hash. This may contain multiple values and be an
@@ -95,7 +95,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+   - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179454
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179454
       # 
       # Returns nil on success
       def clear_messages(queue_name, options={})
@@ -119,7 +119,7 @@ module Azure
       # * +:metadata+      - Hash. A hash of user defined metadata.
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179342
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179342
       #
       # Returns nil on success
       def create_queue(queue_name, options={})
@@ -147,7 +147,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179436
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179436
       #
       # Returns nil on success
       def delete_queue(queue_name, options={})
@@ -172,7 +172,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179384
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179384
       #
       # Returns a tuple of (approximate_message_count, metadata)
       # * approximate_messages_count  - Integer. The approximate number of messages in the queue. This number is not
@@ -207,7 +207,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179348
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179348
       #
       # Returns nil on success
       def set_queue_metadata(queue_name, metadata, options={})
@@ -235,7 +235,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+       - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159101
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159101
       #
       # Returns a list of Azure::Entity::SignedIdentifier instances
       def get_queue_acl(queue_name, options={})
@@ -262,7 +262,7 @@ module Azure
       # * +:signed_identifiers+  - Array. A list of Azure::Entity::SignedIdentifier instances 
       # * +:timeout+             - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/jj159099
+      # See http://msdn.microsoft.com/en-us/library/azure/jj159099
       #
       # Returns nil on success
       def set_queue_acl(queue_name, options={})
@@ -298,7 +298,7 @@ module Azure
       # * +:encode+                 - Boolean. If set to true, the message will be base64 encoded.
       # * +:timeout+                - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179346
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179346
       #
       # Returns nil on success
       def create_message(queue_name, message_text, options={})
@@ -332,7 +332,7 @@ module Azure
       # Accepted key/value pairs in options parameter are:
       # * +:timeout+     - Integer. A timeout in seconds.
       # 
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179347
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179347
       #
       # Returns nil on success
       #
@@ -397,7 +397,7 @@ module Azure
       # * +:decode+             - Boolean. Boolean value indicating if the message should be base64 decoded.
       # * +:timeout+            - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179472
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179472
       #
       # Returns a list of Azure::Entity::Queue::Message instances
       def peek_messages(queue_name, options={})
@@ -429,7 +429,7 @@ module Azure
       # * +:timeout+            - Integer. A timeout in seconds.
       # * +:decode+             - Boolean. Boolean value indicating if the message should be base64 decoded.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/dd179474
+      # See http://msdn.microsoft.com/en-us/library/azure/dd179474
       #
       # Returns a list of Azure::Entity::Queue::Message instances
       def list_messages(queue_name, visibility_timeout, options={})
@@ -465,7 +465,7 @@ module Azure
       # * +:encode+                 - Boolean. If set to true, the message will be base64 encoded.
       # * +:timeout+           - Integer. A timeout in seconds.
       #
-      # See http://msdn.microsoft.com/en-us/library/windowsazure/hh452234
+      # See http://msdn.microsoft.com/en-us/library/azure/hh452234
       #
       # Returns a tuple of (pop_receipt, time_next_visible)
       # * pop_receipt        - String. The pop receipt of the queue message.

data/lib/azure/service/cors.rb

@@ -0,0 +1,11 @@
+module Azure
+  module Service
+    class Cors 
+      def initialize
+        yield self if block_given?
+      end
+
+      attr_accessor :cors_rules
+    end
+  end
+end

data/lib/azure/service/cors_rule.rb

@@ -0,0 +1,15 @@
+module Azure
+  module Service
+    class CorsRule
+      def initialize
+        yield self if block_given?
+      end
+
+      attr_accessor :allowed_origins
+      attr_accessor :allowed_methods
+      attr_accessor :max_age_in_seconds
+      attr_accessor :exposed_headers
+      attr_accessor :allowed_headers
+    end
+  end
+end

data/lib/azure/service/serialization.rb

@@ -22,6 +22,8 @@ require 'azure/service/storage_service_properties'
 require 'azure/service/logging'
 require 'azure/service/metrics'
 require 'azure/service/retention_policy'
+require 'azure/service/cors'
+require 'azure/service/cors_rule'
 
 module Azure
   module Service
@@ -148,18 +150,27 @@ module Azure
           end
         end
 
-        def metrics_to_xml(metrics, xml)
-          xml.Metrics { 
-            xml.Version metrics.version if metrics.version
-            xml.Enabled metrics.enabled unless metrics.enabled == nil
-            xml.IncludeAPIs metrics.include_apis unless metrics.include_apis == nil
-            retention_policy_to_xml(metrics.retention_policy, xml) if metrics.retention_policy
+        def metrics_to_xml_children(metrics, xml)
+          xml.Version metrics.version if metrics.version
+          xml.Enabled metrics.enabled unless metrics.enabled == nil
+          xml.IncludeAPIs metrics.include_apis unless metrics.include_apis == nil
+          retention_policy_to_xml(metrics.retention_policy, xml) if metrics.retention_policy
+        end
+
+        def hour_metrics_to_xml(metrics, xml)
+          xml.HourMetrics { 
+            metrics_to_xml_children(metrics, xml)
+          }
+        end
+
+        def minute_metrics_to_xml(metrics, xml)
+          xml.MinuteMetrics { 
+            metrics_to_xml_children(metrics, xml)
           }
         end
 
         def metrics_from_xml(xml)
           xml = slopify(xml)
-          expect_node("Metrics", xml)
 
           Metrics.new do |metrics|
             metrics.version = xml.Version.text if (xml > "Version").any?
@@ -191,13 +202,59 @@ module Azure
             logging.retention_policy = retention_policy_from_xml(xml.RetentionPolicy)
           end
         end
+
+        def cors_to_xml(cors, xml)
+          xml.Cors {
+            cors.cors_rules.to_a.each do |cors_rule|
+              cors_rule_to_xml(cors_rule, xml)
+            end
+          }
+        end
+
+        def cors_rule_to_xml(cors_rule, xml)
+          xml.CorsRule {
+            xml.AllowedOrigins cors_rule.allowed_origins.join(",") if cors_rule.allowed_origins
+            xml.AllowedMethods cors_rule.allowed_methods.join(",") if cors_rule.allowed_methods
+            xml.MaxAgeInSeconds cors_rule.max_age_in_seconds if cors_rule.max_age_in_seconds
+            xml.ExposedHeaders cors_rule.exposed_headers.join(",") if cors_rule.exposed_headers
+            xml.AllowedHeaders cors_rule.allowed_headers.join(",") if cors_rule.allowed_headers
+          }
+        end
+
+        def cors_from_xml(xml)
+          xml = slopify(xml)
+          expect_node("Cors", xml)
+
+          Cors.new do |cors|
+            cors.cors_rules = xml.children.to_a.map {|child| cors_rule_from_xml(child)}
+          end
+        end
+
+        def cors_rule_from_xml(xml)
+          xml = slopify(xml)
+          expect_node("CorsRule", xml)
+
+          CorsRule.new do |cors_rule|
+            cors_rule.allowed_origins =  ary_from_node(xml.AllowedOrigins) if (xml > "AllowedOrigins").any?
+            cors_rule.allowed_methods =  ary_from_node(xml.AllowedMethods) if (xml > "AllowedMethods").any?
+            cors_rule.max_age_in_seconds = xml.MaxAgeInSeconds.text.to_i if (xml > "MaxAgeInSeconds").any?
+            cors_rule.exposed_headers = ary_from_node(xml.ExposedHeaders) if (xml > "ExposedHeaders").any?
+            cors_rule.allowed_headers = ary_from_node(xml.AllowedHeaders) if (xml > "AllowedHeaders").any?
+          end
+        end
+
+        def ary_from_node(node)
+          node.text.split(",").map {|s| s.strip}
+        end
         
         def service_properties_to_xml(properties)
           builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
             xml.StorageServiceProperties {
+              xml.DefaultServiceVersion(properties.default_service_version) if properties.default_service_version
               logging_to_xml(properties.logging, xml) if properties.logging
-              metrics_to_xml(properties.metrics, xml) if properties.metrics
-              xml.DefaultServiceVersion properties.default_service_version if properties.default_service_version
+              hour_metrics_to_xml(properties.hour_metrics, xml) if properties.hour_metrics
+              minute_metrics_to_xml(properties.minute_metrics, xml) if properties.minute_metrics
+              cors_to_xml(properties.cors, xml) if properties.cors
             }
           end
           builder.to_xml
@@ -210,7 +267,9 @@ module Azure
           StorageServiceProperties.new do |props|
             props.default_service_version = xml.DefaultServiceVersion.text if (xml > "DefaultServiceVersion").any?
             props.logging = logging_from_xml(xml.Logging)
-            props.metrics = metrics_from_xml(xml.Metrics)
+            props.hour_metrics = metrics_from_xml(xml.HourMetrics)
+            props.minute_metrics = metrics_from_xml(xml.MinuteMetrics)
+            props.cors = cors_from_xml(xml.Cors)
           end
         end