fog 0.7.2 → 0.8.0

data/lib/fog/aws/requests/elb/delete_load_balancer_policy.rb

@@ -0,0 +1,31 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/empty'
+
+        # Delete a Load Balancer Stickiness Policy
+        #
+        # ==== Parameters
+        # * lb_name<~String> - Name of the ELB
+        # * policy_name<~String> - The name of the policy to delete
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        def delete_load_balancer_policy(lb_name, policy_name)
+          params = {'PolicyName' => policy_name}
+
+          request({
+            'Action'           => 'DeleteLoadBalancerPolicy',
+            'LoadBalancerName' => lb_name,
+            :parser            => Fog::Parsers::AWS::ELB::Empty.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elb/set_load_balancer_policies_of_listener.rb

@@ -0,0 +1,43 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/empty'
+
+        # Associates, updates, or disables a policy with a listener on the
+        # load balancer. Currently only zero (0) or one (1) policy can be
+        # associated with a listener.
+        #
+        # ==== Parameters
+        # * lb_name<~String> - Name of the ELB
+        # * load_balancer_port<~Integer> - The external port of the LoadBalancer
+        #   with which this policy has to be associated.
+
+        # * policy_names<~Array> - List of policies to be associated with the
+        #   listener. Currently this list can have at most one policy. If the
+        #   list is empty, the current policy is removed from the listener.
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'ResponseMetadata'<~Hash>:
+        #       * 'RequestId'<~String> - Id of request
+        def set_load_balancer_policies_of_listener(lb_name, load_balancer_port, policy_names)
+          params = {'LoadBalancerPort' => load_balancer_port}
+          if policy_names.any?
+            params.merge!(AWS.indexed_param('PolicyNames.member', policy_names))
+          else
+            params['PolicyNames'] = ''
+          end
+
+          request({
+            'Action'           => 'SetLoadBalancerPoliciesOfListener',
+            'LoadBalancerName' => lb_name,
+            :parser            => Fog::Parsers::AWS::ELB::Empty.new
+          }.merge!(params))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/iam/list_server_certificates.rb

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+
+        require 'fog/aws/parsers/iam/list_server_certificates'
+
+        # List server certificates
+        #
+        # ==== Parameters
+        # * options<~Hash>:
+        #   * 'Marker'<~String> - The marker from the previous result (for pagination)
+        #   * 'MaxItems'<~String> - The maximum number of server certificates you want in the response
+        #   * 'PathPrefix'<~String> - The path prefix for filtering the results
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'Certificates'<~Array> - Matching server certificates
+        #       * server_certificate<~Hash>:
+        #         * Arn<~String> -
+        #         * Path<~String> -
+        #         * ServerCertificateId<~String> -
+        #         * ServerCertificateName<~String> -
+        #         * UploadDate<~Time> -
+        #       * 'IsTruncated'<~Boolean> - Whether or not the results were truncated
+        #       * 'Marker'<~String> - appears when IsTruncated is true as the next marker to use
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/IAM/latest/APIReference/index.html?API_ListServerCertificates.html
+        #
+        def list_server_certificates(options = {})
+          request({
+            'Action'  => 'ListServerCertificates',
+            :parser   => Fog::Parsers::AWS::IAM::ListServerCertificates.new
+          }.merge!(options))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/ses/send_raw_email.rb

@@ -5,13 +5,13 @@ module Fog
 
         require 'fog/aws/parsers/ses/send_raw_email'
 
-        # Delete an existing verified email address
+        # Send a raw email
         #
         # ==== Parameters
         # * RawMessage <~String> - The message to be sent.
         # * Options <~Hash>
-        #   * Source <~String> - The sender's email address
-        #   * Destinations <~Array> - The destination for this email, composed of To:, From:, and CC: fields.
+        #   * Source <~String> - The sender's email address. Takes precenence over Return-Path if specified in RawMessage
+        #   * Destinations <~Array> - All destinations for this email.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -22,7 +22,7 @@ module Fog
         def send_raw_email(raw_message, options = {})
           params = {}
           if options.has_key?('Destinations')
-            params['Destinations'] = AWS.indexed_param('Destinations.member', [*options['Destinations']])
+            params.merge!(AWS.indexed_param('Destinations.member', [*options['Destinations']]))
           end
           if options.has_key?('Source')
             params['Source'] = options['Source']

data/lib/fog/aws/simpledb.rb

@@ -124,8 +124,8 @@ module Fog
             item_index = 0
             for item_key in items.keys
               encoded_attributes["Item.#{item_index}.ItemName"] = item_key.to_s
+              attribute_index = 0
               for attribute_key in items[item_key].keys
-                attribute_index = 0
                 for value in Array(items[item_key][attribute_key])
                   encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Name"] = attribute_key.to_s
                   if replace_attributes[item_key].include?(attribute_key)
@@ -134,8 +134,8 @@ module Fog
                   encoded_attributes["Item.#{item_index}.Attribute.#{attribute_index}.Value"] = sdb_encode(value)
                   attribute_index += 1
                 end
-                item_index += 1
               end
+              item_index += 1
             end
           end
           encoded_attributes

data/lib/fog/bin.rb

@@ -65,6 +65,7 @@ require 'fog/bin/local'
 require 'fog/bin/new_servers'
 require 'fog/bin/rackspace'
 require 'fog/bin/slicehost'
+require 'fog/bin/stormondemand'
 require 'fog/bin/terremark'
 require 'fog/bin/virtual_box'
 require 'fog/bin/voxel'

data/lib/fog/bin/stormondemand.rb

@@ -0,0 +1,30 @@
+class StormOnDemand < Fog::Bin
+  class << self
+
+    def class_for(key)
+      case key
+      when :compute
+        Fog::StormOnDemand::Compute
+      else 
+        raise ArgumentError, "Unsupported #{self} service: #{key}"
+      end
+    end
+
+    def [](service)
+      @@connections ||= Hash.new do |hash, key|
+        hash[key] = case key
+        when :compute
+          Fog::Compute.new(:provider => 'StormOnDemand')
+        else
+          raise ArgumentError, "Unrecognized service: #{key.inspect}"
+        end
+      end
+      @@connections[service]
+    end
+
+    def services
+      Fog::StormOnDemand.services
+    end
+
+  end
+end

data/lib/fog/cdn/parsers/aws/distribution.rb

@@ -21,31 +21,31 @@ module Fog
           def end_element(name)
             case name
             when 'AwsAccountNumber'
-              @response['DistributionConfig']['TrustedSigners'] << @value
+              @response['DistributionConfig']['TrustedSigners'] << value
             when 'Bucket', 'Prefix'
-              @response['DistributionConfig']['Logging'][name] = @value
+              @response['DistributionConfig']['Logging'][name] = value
             when 'CNAME'
-              @response['DistributionConfig']['CNAME'] << @value
+              @response['DistributionConfig']['CNAME'] << value
             when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
-              @response['DistributionConfig'][@origin][name] = @value
+              @response['DistributionConfig'][@origin][name] = value
             when 'DomainName', 'Id', 'Status'
-              @response[name] = @value
+              @response[name] = value
             when 'CallerReference', 'Comment', 'DefaultRootObject', 'Origin', 'OriginAccessIdentity'
-              @response['DistributionConfig'][name] = @value
+              @response['DistributionConfig'][name] = value
             when 'Enabled'
-              if @value == 'true'
+              if value == 'true'
                 @response['DistributionConfig'][name] = true
               else
                 @response['DistributionConfig'][name] = false
               end
             when 'HTTPPort', 'HTTPSPort'
-              @response['DistributionConfig'][@origin][name] = @value.to_i
+              @response['DistributionConfig'][@origin][name] = value.to_i
             when 'InProgressInvalidationBatches'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             when 'LastModifiedTime'
-              @response[name] = Time.parse(@value)
+              @response[name] = Time.parse(value)
             when 'Protocol'
-              @response['DistributionConfig']['RequireProtocols'] = @value
+              @response['DistributionConfig']['RequireProtocols'] = value
             when 'Self'
               @response['DistributionConfig']['TrustedSigners'] << 'Self'
             end

data/lib/fog/cdn/parsers/aws/get_distribution_list.rb

@@ -25,31 +25,31 @@ module Fog
               @response['DistributionSummary'] << @distribution_summary
               @distribution_summary = { 'CNAME' => [], 'TrustedSigners' => [] }
             when 'Comment', 'DomainName', 'Id', 'Origin', 'Status'
-              @distribution_summary[name] = @value
+              @distribution_summary[name] = value
             when 'CNAME'
-              @distribution_summary[name] << @value
+              @distribution_summary[name] << value
             when 'DNSName', 'OriginAccessIdentity', 'OriginProtocolPolicy'
-              @distribution_summary[@origin][name] = @value
+              @distribution_summary[@origin][name] = value
             when 'Enabled'
-              if @value == 'true'
+              if value == 'true'
                 @distribution_summary[name] = true
               else
                 @distribution_summary[name] = false
               end
             when 'HTTPPort', 'HTTPSPort'
-              @distribution_summary[@origin][name] = @value.to_i
+              @distribution_summary[@origin][name] = value.to_i
             when 'LastModifiedTime'
-              @distribution_summary[name] = Time.parse(@value)
+              @distribution_summary[name] = Time.parse(value)
             when 'IsTruncated'
-              if @value == 'true'
+              if value == 'true'
                 @response[name] = true
               else
                 @response[name] = false
               end
             when 'Marker', 'NextMarker'
-              @response[name] = @value
+              @response[name] = value
             when 'MaxItems'
-              @response[name] = @value.to_i
+              @response[name] = value.to_i
             end
           end
 

data/lib/fog/cdn/parsers/aws/post_invalidation.rb

@@ -12,11 +12,11 @@ module Fog
           def end_element(name)
             case name
             when 'CallerReference'
-              @response['InvalidationBatch'][name] = @value
+              @response['InvalidationBatch'][name] = value
             when 'CreateTime', 'Id', 'Status'
-              @response[name] = @value
+              @response[name] = value
             when 'Path'
-              @response['InvalidationBatch'][name] << @value
+              @response['InvalidationBatch'][name] << value
             end
           end
 

data/lib/fog/compute.rb

@@ -31,6 +31,9 @@ module Fog
       when 'Slicehost'
         require 'fog/compute/slicehost'
         Fog::Slicehost::Compute.new(attributes)
+      when 'StormOnDemand'
+        require 'fog/compute/storm_on_demand'
+        Fog::StormOnDemand::Compute.new(attributes)
       when 'VirtualBox'
         require 'fog/compute/virtual_box'
         Fog::VirtualBox::Compute.new(attributes)

data/lib/fog/compute/aws.rb

@@ -188,7 +188,8 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #   * region<~String> - optional region to use, in ['eu-west-1', 'us-east-1', 'us-west-1']
+        #   * region<~String> - optional region to use, in
+        #     ['eu-west-1', 'us-east-1', 'us-west-1', 'ap-northeast-1', 'ap-southeast-1']
         #
         # ==== Returns
         # * EC2 object with connection to aws.
@@ -205,6 +206,8 @@ module Fog
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
           @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @region = options[:region] ||= 'us-east-1'
+
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host
@@ -212,7 +215,6 @@ module Fog
             @port = endpoint.port
             @scheme = endpoint.scheme
           else
-            options[:region] ||= 'us-east-1'
             @host = options[:host] || case options[:region]
             when 'ap-northeast-1'
               'ec2.ap-northeast-1.amazonaws.com'

data/lib/fog/compute/models/aws/server.rb

@@ -42,8 +42,22 @@ module Fog
         attr_writer   :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          self.groups ||= ["default"] unless attributes[:subnet_id]
-          self.flavor_id ||= 'm1.small'
+          self.groups     ||= ["default"] unless attributes[:subnet_id]
+          self.flavor_id  ||= 't1.micro'
+          self.image_id ||= begin
+            case attributes[:connection].instance_variable_get(:@region) # Ubuntu 10.04 LTS 64bit (EBS)
+            when 'ap-northeast-1'
+              'ami-5e0fa45f'
+            when 'ap-southeast-1'
+              'ami-f092eca2'
+            when 'eu-west-1'
+              'ami-3d1f2b49'
+            when 'us-east-1'
+              'ami-3202f25b'
+            when 'us-west-1'
+              'ami-f5bfefb0'
+            end
+          end
           super
         end
 

data/lib/fog/compute/models/bluebox/server.rb

@@ -21,11 +21,12 @@ module Fog
         attribute :storage
         attribute :template
 
-        attr_accessor :password
+        attr_accessor :password, :lb_applications, :lb_services, :lb_backends
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          self.flavor_id ||= '94fd37a7-2606-47f7-84d5-9000deda52ae'
+          self.flavor_id  ||= '94fd37a7-2606-47f7-84d5-9000deda52ae' # Block 1GB Virtual Server
+          self.image_id   ||= '03807e08-a13d-44e4-b011-ebec7ef2c928' # Ubuntu LTS 10.04 64bit
           super
         end
 
@@ -92,6 +93,14 @@ module Fog
             options['password'] = password if @password
           end
 
+          if @lb_backends
+            options['lb_backends'] = lb_backends
+          elsif @lb_services
+            options['lb_services'] = lb_services
+          elsif @lb_applications
+            options['lb_applications'] = lb_applications
+          end
+
           options['username'] = username
           data = connection.create_block(flavor_id, image_id, options)
           merge_attributes(data.body)

data/lib/fog/compute/models/brightbox/server.rb

@@ -28,6 +28,12 @@ module Fog
         attribute :cloud_ips
         attribute :interfaces
 
+        def initialize(attributes={})
+          self.flavor_id  ||= 'typ-4nssg' # Nano
+          self.image_id   ||= 'img-2ab98' # Ubuntu Lucid 10.04 server (i686)
+          super
+        end
+
         def snapshot
           requires :identity
           connection.snapshot_server(identity)

data/lib/fog/compute/models/ecloud/servers.rb

@@ -37,7 +37,9 @@ module Fog
         private
 
         def _resource_entities
-          connection.get_vdc(href).body[:ResourceEntities][:ResourceEntity]
+          if Hash === resource_entities = connection.get_vdc(href).body[:ResourceEntities]
+            resource_entities[:ResourceEntity]
+          end
         end
 
         def _vapps

data/lib/fog/compute/models/go_grid/server.rb

@@ -21,6 +21,7 @@ module Fog
         attribute :sandbox      # Optional. Default: False
 
         def initialize(attributes={})
+          image_id ||= 'ubuntu_10_04_LTS_64_base' # Ubuntu 10.04 LTS 64bit
           super
         end
 

data/lib/fog/compute/models/rackspace/server.rb

@@ -22,7 +22,8 @@ module Fog
         attr_writer :private_key, :private_key_path, :public_key, :public_key_path, :username
 
         def initialize(attributes={})
-          self.flavor_id ||= 1
+          self.flavor_id  ||= 1  # 256 server
+          self.image_id   ||= 49 # Ubuntu 10.04 LTS 64bit
           super
         end