aws-sdk 1.7.1 → 1.8.0

data/lib/aws/data_pipeline/config.rb

@@ -0,0 +1,18 @@
+# Copyright 2011-2012 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.
+
+AWS::Core::Configuration.module_eval do
+
+  add_service 'DataPipeline', 'data_pipeline', 'datapipeline.us-east-1.amazonaws.com'
+
+end

data/lib/aws/data_pipeline/errors.rb

@@ -0,0 +1,20 @@
+# Copyright 2011-2012 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 DataPipeline
+    module Errors
+      extend Core::LazyErrorClasses
+    end
+  end
+end

data/lib/aws/data_pipeline/request.rb

@@ -0,0 +1,26 @@
+# Copyright 2011-2012 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 DataPipeline
+    # @private
+    class Request < Core::Http::Request
+      include Core::Signature::Version4
+
+      def service
+        'datapipeline'
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/instance_collection.rb

@@ -192,6 +192,16 @@ module AWS
       #   valid for instances launched outside a VPC (e.g. those
       #   launched without the :subnet option).
       #
+      # @option options [Boolean] :ebs_optimized (false) EBS-Optimized instances 
+      #   enable Amazon EC2 instances to fully utilize the IOPS provisioned on 
+      #   an EBS volume. EBS-optimized instances deliver dedicated throughput 
+      #   between Amazon EC2 and Amazon EBS, with options between 500 Mbps and
+      #   1000 Mbps depending on the instance type used. When attached to 
+      #   EBS-Optimized instances, Provisioned IOPS volumes are designed 
+      #   to deliver within 10% of their provisioned performance 99.9% of the time. 
+      #   *NOTE:* EBS Optimized instances incur an additional service charge. This
+      #   optional is only valid for certain instance types.
+      #
       # @return [Instance or Array] If a single instance is being created,
       #   this returns an {EC2::Instance} to represent the newly
       #   created instance.  Otherwise it returns an array of instance
@@ -268,9 +278,7 @@ module AWS
             options[:min_count] == 1
           self[resp.instances_set.first.instance_id]
         else
-          resp.instances_set.map do |i|
-            self[i.instance_id]
-          end
+          resp[:instances_set].map {|i| self[i[:instance_id]] }
         end
       end
 

data/lib/aws/ec2/security_group.rb

@@ -31,9 +31,9 @@ module AWS
 
       AWS.register_autoloads(self, 'aws/ec2/security_group') do
         autoload :IpPermission,                  'ip_permission'
-        autoload :IpPermissionCollection,        'ingress_ip_permission_collection'
-        autoload :IngressIpPermissionCollection, 'ingress_ip_permission_collection'
-        autoload :EgressIpPermissionCollection,  'egress_ip_permission_collection'
+        autoload :IpPermissionCollection,        'ip_permission_collection'
+        autoload :IngressIpPermissionCollection, 'ip_permission_collection'
+        autoload :EgressIpPermissionCollection,  'ip_permission_collection'
       end
 
       include TaggedItem
@@ -63,7 +63,7 @@ module AWS
       attribute :ip_permissions_list_egress, :from => :ip_permissions_egress
 
       populates_from(:describe_security_groups) do |resp|
-        resp.security_group_index[id]
+        resp[:security_group_index][id]
       end
 
       # @return [Boolean] True if the security group exists.
@@ -347,7 +347,7 @@ module AWS
       def ingress_opts protocol, ports, sources
 
         opts = {}
-        opts[:ip_protocol] = protocol.to_s.downcase
+        opts[:ip_protocol] = protocol == :any ? '-1' : protocol.to_s.downcase
         opts[:from_port] = Array(ports).first.to_i
         opts[:to_port] = Array(ports).last.to_i
 

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

@@ -14,42 +14,50 @@
 module AWS
   class EC2
     class SecurityGroup < Resource
-      class EgressIpPermissionCollection
 
-        include Core::Model
-        include Enumerable
+      class IpPermissionCollection
+
+        include Core::Collection::Simple
 
         def initialize security_group, options = {}
           @security_group = security_group
+          @egress = !!options[:egress]
           super
         end
 
         # @return [SecurityGroup]
         attr_reader :security_group
 
-        def each
-          security_group.ip_permissions_list_egress.each do |p|
+        # @return [Boolean]
+        attr_reader :egress
+
+        alias_method :egress?, :egress
+
+        private
+
+        def _each_item options = {}
+
+          list_method = 'ip_permissions_list'
+          list_method += '_egress' if egress?
+
+          security_group.send(list_method).each do |p|
 
             # egress permissions don't always have ports
-            if p[:from_port]
-              ports = [p[:from_port], p[:to_port]]
-            else
-              ports = nil
-            end
+            ports = p[:from_port] ? [p[:from_port], p[:to_port]] : nil
 
-            ip_ranges = p.ip_ranges.collect{|ip| ip.cidr_ip }
+            ip_ranges = p[:ip_ranges].collect{|ip| ip[:cidr_ip] }
 
-            groups = p.groups.collect do |group|
+            groups = p[:groups].collect do |group|
               SecurityGroup.new(group[:group_id],
                 :owner_id => group[:user_id],
                 :vpc_id => security_group.vpc_id,
                 :config => config)
             end
 
-            permission = IpPermission.new(security_group, p.ip_protocol, ports,
+            permission = IpPermission.new(security_group, p[:ip_protocol], ports,
               :ip_ranges => ip_ranges,
               :groups => groups,
-              :egress => true,
+              :egress => egress?,
               :config => config)
 
             yield(permission)
@@ -58,6 +66,17 @@ module AWS
         end
 
       end
+
+      class IngressIpPermissionCollection < IpPermissionCollection; end
+
+      class EgressIpPermissionCollection < IpPermissionCollection
+
+        def initialize security_group, options = {}
+          super(security_group, options.merge(:egress => true))
+        end
+
+      end
+
     end
   end
 end

data/lib/aws/glacier.rb

@@ -0,0 +1,50 @@
+# Copyright 2011-2012 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/glacier/config'
+
+module AWS
+  class Glacier
+
+    AWS.register_autoloads(self, 'aws/glacier') do
+      autoload :Archive, 'archive'
+      autoload :ArchiveCollection, 'archive_collection'
+      autoload :Client, 'client'
+      autoload :Errors, 'errors'
+      autoload :Request, 'request'
+      autoload :Resource, 'resource'
+      autoload :Vault, 'vault'
+      autoload :VaultCollection, 'vault_collection'
+      autoload :VaultNotificationConfiguration, 'vault_notification_configuration'
+    end
+
+    include Core::ServiceInterface
+
+    # @option options[String] :account_id ('-')
+    def intialize options = {}
+      @account_id = options[:account_id] || '-'
+      super
+    end
+
+    # @return [String]
+    attr_accessor :account_id
+
+    # @return [VaultCollection] Returns a collection for working with
+    #   vaults that belong to this account.
+    def vaults
+      VaultCollection.new(:config => config, :account_id => account_id)
+    end
+
+  end
+end

data/lib/aws/glacier/archive.rb

@@ -0,0 +1,54 @@
+# Copyright 2011-2012 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 Glacier
+
+    class Archive < Resource
+
+      # @param [Vault] vault
+      # @param [String] archive_id
+      # @param [Hash] options
+      # @option options [String] :account_id
+      def initialize vault, archive_id, options = {}
+        @vault = vault
+        @archive_id = archive_id
+        super
+      end
+
+      # @return [Vault]
+      attr_reader :vault
+
+      # @return [String]
+      attr_reader :archive_id
+
+      # Deletes the current archive.
+      # @return [nil]
+      def delete
+        client.delete_archive(resource_options)
+        nil
+      end
+
+      protected
+
+      def resource_identifiers
+        [
+          [:vault_name, vault.name],
+          [:archive_id, archive_id],
+          [:account_id, account_id],
+        ]
+      end
+
+    end
+  end
+end

data/lib/aws/glacier/archive_collection.rb

@@ -0,0 +1,141 @@
+# Copyright 2011-2012 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 'openssl'
+
+module AWS
+  class Glacier
+
+    class ArchiveCollection
+
+      include Core::Model
+
+      # @param [Vault] vault
+      # @param [Hash] options
+      # @option options [String] :account_id
+      def initialize vault, options = {}
+        @vault = vault
+        @account_id = options[:account_id] || '-'
+        super
+      end
+
+      # @return [Vault]
+      attr_reader :vault
+
+      # @return [String]
+      attr_reader :account_id
+
+      # Creates an archive by uploading a file to a vault.
+      # @param [File,Pathname,IO,String] data The data to upload.
+      #   If +data+ is a string, this is treated as a path to a file
+      #   on disk.
+      # @param [Hash] options
+      # @option options [String] description
+      # @return [Archive]
+      def create data, options = {}
+
+        data = convert_to_io(data)
+
+        hash, tree_hash = compute_checksums(data)
+
+        options = {}
+        options[:vault_name] = vault.name
+        options[:account_id] = account_id
+        options[:body] = data
+        options[:checksum] = tree_hash
+        options[:content_sha256] = hash
+        options[:archive_description] = options[:description] if
+          options[:description]
+
+        resp = client.upload_archive(options)
+
+        self[resp[:archive_id]]
+
+      end
+
+      # @param [String] archive_id
+      # @return [Archive]
+      def [] archive_id
+        Archive.new(vault, archive_id, :config => config, :account_id => account_id)
+      end
+
+      protected
+
+      def convert_to_io data
+        return Core::ManagedFile.open(data) if
+          data.is_a?(Pathname) or data.is_a?(String)
+
+        return data if io_like?(data)
+
+        msg = "expected data to be IO-like or a file path (String/Pathanme)."
+        raise ArgumentError, msg
+      end
+
+      # @return [Boolean] Returns +tue+ if data acts like a file.
+      def io_like? data
+        data.respond_to?(:read) and
+        data.respond_to?(:eof?) and
+        data.respond_to?(:rewind) and
+        data.respond_to?(:size)
+      end
+
+      # Computes two checksums in a single pass of the data:
+      # * a hash of the entire payload
+      # * a tree hash of the entire payload
+      #
+      # The tree hash is required by the streaming operations,
+      # the simple hash is required for generating the signature
+      # (via sigv4).
+      #
+      # The sigv4 module will compute the hash of the payload for us,
+      # but that requires reading the data a 2nd time. :(
+      def compute_checksums data
+
+        digest = OpenSSL::Digest::Digest.new('sha256')
+        tree_digest = OpenSSL::Digest::Digest.new('sha256')
+        tree_parts = []
+
+        until data.eof?
+
+          chunk = data.read(1024 * 1024) # read 1MB
+          tree_parts << tree_digest.update(chunk).to_s
+          tree_digest.reset
+
+          digest.update(chunk)
+
+        end
+
+        data.rewind
+
+        [digest.to_s, compute_tree_hash(tree_parts)]
+
+      end
+
+      def compute_tree_hash hashes
+
+        digest = OpenSSL::Digest::Digest.new('sha256')
+
+        until hashes.count == 1
+          hashes = hashes.each_slice(2).map do |h1,h2|
+            h2 ? digest.update(h1 + h2).to_s : h1
+          end
+          digest.reset
+        end
+
+        hashes.first
+
+      end
+
+    end
+  end
+end