aws-sdk 1.1.4 → 1.2.0

data/lib/aws/ec2/security_group/egress_ip_permission_collection.rb

@@ -30,9 +30,8 @@ module AWS
 
             groups = p.groups.collect do |group|
               SecurityGroup.new(group.group_id,
-                :name => group.group_name,
                 :owner_id => group.user_id,
-                :vpc_id => group.vpc_id,
+                :vpc_id => security_group.vpc_id,
                 :config => config)
             end
 

data/lib/aws/ec2/security_group/{ip_permission_collection.rb → ingress_ip_permission_collection.rb}

@@ -15,7 +15,7 @@ module AWS
   class EC2
     class SecurityGroup < Resource
 
-      class IpPermissionCollection
+      class IngressIpPermissionCollection
 
         include Core::Model
         include Enumerable
@@ -53,6 +53,9 @@ module AWS
 
       end
 
+      # alias for ingress permissions
+      IpPermissionCollection = IngressIpPermissionCollection
+
     end
   end
 end

data/lib/aws/ec2/security_group/ip_permission.rb

@@ -19,15 +19,21 @@ module AWS
         include Core::Model
 
         # @param protocol [:tcp, :udp, :icmp]
+        #
         # @param port [Range,Integer] An integer or a range of integers
         #   to open ports for.
+        #
         # @param [Hash] options
+        #
         # @option options [Array] :ip_ranges An array of CIDR ip address
         #   to grant permission to.
+        #
         # @option options [Array] :groups An array of SecurityGroup objects to
         #   grant permission to.
+        #
         # @option options [Boolean] :egress (false) When true this IpPermission
         #   is assumed to be an egree permission.
+        #
         def initialize security_group, protocol, ports, options = {}
 
           @security_group = security_group
@@ -75,33 +81,13 @@ module AWS
         # Authorizes this permission from its security group.
         # @return [IpPermission] Returns self
         def authorize
-
-          method = egress? ? 
-            :authorize_security_group_egress :
-            :authorize_security_group_ingress
-
-          client.send(method, 
-            :group_id => security_group.id,
-            :ip_permissions => [format_permission])
-
-          self
-
+          update_sg(egress? ? :authorize_egress : :authorize_ingress)
         end
 
         # Revokes this permission from its security group.
         # @return [IpPermission] Returns self
         def revoke
-
-          method = egress? ? 
-            :revoke_security_group_egress :
-            :revoke_security_group_ingress
-
-          client.send(method, 
-            :group_id => security_group.id,
-            :ip_permissions => [format_permission])
-
-          self
-
+          update_sg(egress? ? :revoke_egress : :revoke_ingress)
         end
 
         # @return [Boolean] Returns true if the other IpPermission matches
@@ -118,32 +104,24 @@ module AWS
 
         alias_method :eql?, :==
 
-        # @private
         protected
-        def format_permission
-      
-          permission = {}
-
-          permission[:ip_protocol] = protocol == :any ? '-1' : protocol.to_s
-
-          if port_range
-            permission[:from_port] = port_range.first
-            permission[:to_port] = port_range.last
-          end
-
-          unless ip_ranges.empty?
-            permission[:ip_ranges] = ip_ranges.collect{|ip| { :cidr_ip => ip } }
+        def update_sg method
+
+          sources = []
+          sources += ip_ranges
+          sources += groups
+
+          if egress?
+            opts = {}
+            opts[:protocol] = protocol
+            opts[:ports] = port_range if port_range
+            sources << opts
+            security_group.send(method, *sources)
+          else
+            security_group.send(method, protocol, port_range, *sources)
           end
 
-          unless groups.empty?
-            permission[:user_id_group_pairs] = groups.inject([]) do |list,group|
-              list << { :group_id => group.id, :user_id => group.owner_id }
-              list
-            end
-          end
-
-          permission
-
+          self
         end
 
       end

data/lib/aws/elb.rb

@@ -0,0 +1,65 @@
+# Copyright 2011 Amazon.com, Inc. or its affiliates. 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. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file 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 'aws/core'
+require 'aws/elb/config'
+
+module AWS
+
+  # Provides an expressive, object-oriented interface to Elastic Load 
+  # Balancing (ELB).
+  #
+  # == Credentials
+  #
+  # You can setup default credentials for all AWS services via
+  # AWS.config:
+  #
+  #   AWS.config(
+  #     :access_key_id => 'YOUR_ACCESS_KEY_ID',
+  #     :secret_access_key => 'YOUR_SECRET_ACCESS_KEY')
+  #
+  # Or you can set them directly on the ELB interface:
+  #
+  #   elb = AWS::ELB.new(
+  #     :access_key_id => 'YOUR_ACCESS_KEY_ID',
+  #     :secret_access_key => 'YOUR_SECRET_ACCESS_KEY')
+  #
+  class ELB
+
+    AWS.register_autoloads(self) do
+      autoload :AvailabilityZoneCollection,    'availability_zone_collection'
+      autoload :BackendServerPolicyCollection, 'backend_server_policy_collection'
+      autoload :Client,                        'client'
+      autoload :Errors,                        'errors'
+      autoload :InstanceCollection,            'instance_collection'
+      autoload :ListenerOpts,                  'listener_opts'
+      autoload :Listener,                      'listener'
+      autoload :ListenerCollection,            'listener_collection'
+      autoload :LoadBalancer,                  'load_balancer'
+      autoload :LoadBalancerCollection,        'load_balancer_collection'
+      autoload :LoadBalancerPolicy,            'load_balancer_policy'
+      autoload :LoadBalancerPolicyCollection,  'load_balancer_policy_collection'
+      autoload :Request,                       'request'
+    end
+
+    include Core::ServiceInterface
+
+    # @return [LoadBalancerCollection] Returns a collection that represents
+    #   all of your load balancers.
+    def load_balancers
+      LoadBalancerCollection.new(:config => config)
+    end
+
+  end
+
+end

data/lib/aws/elb/availability_zone_collection.rb

@@ -0,0 +1,138 @@
+# Copyright 2011 Amazon.com, Inc. or its affiliates. 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. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file 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.
+
+module AWS
+  class ELB
+
+    # A collection that help maanage the availability zones for 
+    # a load balancer.
+    #
+    #   load_balancer = AWS::ELB.new.load_balancers['my-load-balancer']
+    #
+    #   zones = load_balancer.availability_zones
+    #
+    #   # adding zones
+    #   zones.enable('us-east-1b', 'us-east-1c')
+    #
+    #   # removing zones
+    #   zones.disable('us-east-1b')
+    #
+    #   # enumerating enabled zones
+    #   zones.each do |zone|
+    #     puts zone.name
+    #   end
+    #
+    class AvailabilityZoneCollection
+
+      include Core::Collection::Simple
+
+      # @param [LoadBalancer] The load balancer this list of availability
+      #   zones belongs to.
+      def initialize load_balancer, options = {}
+        @load_balancer = load_balancer
+        super
+      end
+
+      # @return [LoadBalancer] Returns the load balancer this list describes.
+      attr_reader :load_balancer
+
+      # Adds one or more EC2 Availability Zones to the load balancer.
+      #
+      #   load_balancer.availability_zones.enable("us-east-1a", "us-east-1b")
+      #
+      # You can also pass {EC2::AvailabilityZone} objects:
+      #
+      #   # enable all availabilty zones for this region
+      #   zones = AWS::EC2.new.availability_zones.to_a
+      #   load_balancer.availability_zones.enable(zones)
+      #
+      # The load balancer evenly distributes requests across all its 
+      # registered availability zones that contain instances. As a result, 
+      # the client must ensure that its load balancer is appropriately 
+      # scaled for each registered Availability Zone.
+      #
+      # @param [String,EC2::AvailabilityZone] availability_zones One or more
+      #   availability zone names (strings) or objects {EC2::AvailabilityZone}.
+      #
+      # @return [nil]
+      # 
+      def enable *availability_zones
+
+        names = availability_zones.flatten.collect do |av|
+          av.is_a?(EC2::AvailabilityZone) ? av.name : av.to_s
+        end
+
+        client.enable_availability_zones_for_load_balancer(
+          :load_balancer_name => load_balancer.name,
+          :availability_zones => names)
+
+        nil
+
+      end
+
+      # Removes the specified EC2 availability zones from the set of 
+      # configured availability zones for the load balancer.
+      #
+      #   load_balancer.availability_zones.disable("us-east-1a", "us-east-1b")
+      #
+      # You can also pass {EC2::AvailabilityZone} objects:
+      #
+      #   # disable all availabilty zones
+      #   zones = AWS::EC2.new.availability_zones.to_a
+      #   load_balancer.availability_zones.disable(zones)
+      #
+      # There must be at least one availability zone registered with a 
+      # load balancer at all times. A client cannot remove all the availability 
+      # zones from a load balancer. Once an availability zone is removed, 
+      # all the instances registered with the load balancer that are in the 
+      # removed availability zone go into the out of service state. 
+      #
+      # Upon availability zone removal, the load balancer attempts to 
+      # equally balance the traffic among its remaining usable availability 
+      # zones. Trying to remove an availability zone that was not 
+      # associated with the load balancer does nothing.
+      #
+      # @param [String,EC2::AvailabilityZone] availability_zones One or more
+      #   availability zone names (strings) or objects {EC2::AvailabilityZone}.
+      #
+      # @return [nil]
+      # 
+      def disable *availability_zones
+
+        names = availability_zones.flatten.collect do |av|
+          av.is_a?(EC2::AvailabilityZone) ? av.name : av.to_s
+        end
+
+        client.disable_availability_zones_for_load_balancer(
+          :load_balancer_name => load_balancer.name,
+          :availability_zones => names)
+
+        nil
+
+      end
+
+      protected
+      def _each_item options = {}, &block
+        load_balancer.availability_zone_names.each do |az_name|
+
+          availability_zone = EC2::AvailabilityZone.new(
+            az_name, :config => config)
+
+          yield(availability_zone)
+
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/elb/backend_server_policy_collection.rb

@@ -0,0 +1,150 @@
+# Copyright 2011 Amazon.com, Inc. or its affiliates. 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. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file 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.
+
+module AWS
+  class ELB
+
+    # Helps manage policies assigned to backend server instnace ports.
+    #
+    # == Creating a Backend Server Policy
+    #
+    # Creating a backend server policy can be a bit tricky.  A 
+    # BackendServerAuthenticationPolicyType policy only has one 
+    # attribute, a list of public key policies.  
+    #
+    # Before you can assign a policy to a backend server instance port you
+    # must create on of the appropriate type:
+    #
+    #   # step 1, create one (or more) PublicKeyPolicyType policies
+    #
+    #   public_key1 = <<-KEY
+    #   -----BEGIN CERTIFICATE-----
+    #   MIICaTCCAdICCQDuvCF4erLGSjANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJa
+    #   WjENMAsGA1UECBMERkFLRTENMAsGA1UEBxMERkFLRTENMAsGA1UEChMERkFLRTEN
+    #   MAsGA1UECxMERkFLRTENMAsGA1UEAxMERkFLRTEfMB0GCSqGSIb3DQEJARYQZmFr
+    #   ZUBleGFtcGxlLmNvbTAeFw0xMTA4MTAyMjE0NDVaFw0xMjA4MDkyMjE0NDVaMHkx
+    #   CzAJBgNVBAYTAlpaMQ0wCwYDVQQIEwRGQUtFMQ0wCwYDVQQHEwRGQUtFMQ0wCwYD
+    #   VQQKEwRGQUtFMQ0wCwYDVQQLEwRGQUtFMQ0wCwYDVQQDEwRGQUtFMR8wHQYJKoZI
+    #   hvcNAQkBFhBmYWtlQGV4YW1wbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+    #   iQKBgQC4vy7K2LCgYJs7AbxdanPEwL4KLC9gi1LqzkRWShEaz8COUZswcOkevLQy
+    #   SMFTXAvmH1FVqNO97wVG6ydxi+LNE7Jub62QQnsK420y+nXRTytxrboH1eAiAIEt
+    #   ZoUKaOymfAN8l/MJbcPH0rTYNdni99B+UMPWmFeRg/BeWiy2hwIDAQABMA0GCSqG
+    #   SIb3DQEBBQUAA4GBAD+VNA6ia8TXa2lJgvmoGYCLGcCaccz7Nv/u4/oqv8qMPvdZ
+    #   5DZxDLIExOSHiFGwWg5m8NgcirH2diveyRBgNhgC6S6DntkEMvAV0yvaQgHtUO53
+    #   o50MymfqtoVcebZcXbiDVAXW1cPEHKLBXecX6/LZ+GOzEsUOxgt7Xs9uabqp
+    #   -----END CERTIFICATE-----
+    #   KEY
+    #
+    #   public_key_policy = load_balancer.policies.create("pkp",
+    #     'PublicKeyPolicyType', 'PublicKey' => public_key.strip)  
+    #
+    #   # step 2, create the backend server policy, passing the public key policy
+    #
+    #   name = 'backend-policy'
+    #   type = 'BackendServerAuthenticationPolicyType'
+    #   attributes = {
+    #     # note: you can pass more than one public key policy here
+    #     'PublicKeyPolicyName' => [public_key_policy]
+    #   }
+    #
+    #   backend_policy = @load_balancer.policies.create(name, type, attributes)
+    #     'BackendServerAuthenticationPolicyType', attributes)
+    #
+    # Once you have created a backend server authentication policy, you
+    # can assign it to a backend instance port:
+    #
+    #   load_balancer.backend_server_policies[80] = backend_policy
+    # 
+    # If you want to remove the policy you can pass nil instead.
+    #
+    #   # removes the policy from instance port 80
+    #   load_balancer.backend_server_policies[80] = nil 
+    #
+    # You can also get the current policy:
+    #
+    #   load_balancer.backend_server_policies[80] # returns a policy or nil
+    # 
+    class BackendServerPolicyCollection
+
+      include Core::Collection::Simple
+
+      def initialize load_balancer, options = {}
+        @load_balancer = load_balancer
+        super
+      end
+
+      # @return [LoadBalancer]
+      attr_reader :load_balancer
+
+      # Returns the policy currently assigned to the given instance port.
+      #
+      # @param [Integer] instance_port The backend server port to 
+      #   get the currently policy of.
+      #
+      # @return [LoadBalancerPolicy,nil] Returns the load balancer policy
+      #   currently assigned to the given instance port.  Returns nil if
+      #   no policy has been assigned.
+      #
+      def [] instance_port
+        enum(:instance_port => instance_port).first
+      end
+
+      # Sets the policy for the given backend server instance port.
+      #
+      # @param [Integer] instance_port The instance port you want to set
+      #   backend server policies for.
+      #
+      # @param [String,LoadBalancerPolicy,nil] policies Load balancer policy
+      #   name or object.  Passing nil removes the current policy.
+      #
+      # @return [nil]
+      #
+      def []= instance_port, policy
+
+        client.set_load_balancer_policies_for_backend_server(
+          :load_balancer_name => load_balancer.name,
+          :instance_port => instance_port.to_i,
+          :policy_names => [policy_name(policy)].compact)
+
+        nil
+
+      end
+
+      protected
+      def policy_name policy
+        case policy
+        when nil then nil
+        when LoadBalancerPolicy then policy.name
+        else policy.to_s
+        end
+      end
+
+      protected
+      def _each_item options = {}
+
+        instance_port = options[:instance_port]
+
+        load_balancer.backend_server_descriptions.each do |desc|
+          if instance_port.nil? or desc.instance_port == instance_port
+            desc.policy_names.collect do |policy_name|
+              policy = load_balancer.policies[policy_name]
+              yield(policy)
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end