RubyGems - aws-sdk - Versions diffs - 1.2.5 → 1.2.6 - Mend

aws-sdk 1.2.5 → 1.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (278) hide show

data/NOTICE.txt +1 -1
data/lib/aws-sdk.rb +1 -1
data/lib/aws.rb +1 -1
data/lib/aws/api_config/EC2-2011-02-28.yml +1 -1
data/lib/aws/api_config/ELB-2011-08-15.yml +1 -1
data/lib/aws/api_config/IAM-2010-07-15.yml +1 -1
data/lib/aws/api_config/SNS-2010-03-31.yml +1 -1
data/lib/aws/api_config/{SQS-2009-02-01.yml → SQS-2011-10-01.yml} +117 -3
data/lib/aws/api_config/STS-2011-06-15.yml +1 -1
data/lib/aws/api_config/SimpleDB-2009-04-15.yml +1 -1
data/lib/aws/api_config/SimpleEmailService-2010-12-01.yml +1 -1
data/lib/aws/core.rb +4 -3
data/lib/aws/core/api_config.rb +1 -1
data/lib/aws/core/async_handle.rb +1 -1
data/lib/aws/core/authorize_v2.rb +1 -1
data/lib/aws/core/authorize_v3.rb +1 -1
data/lib/aws/core/authorize_with_session_token.rb +1 -1
data/lib/aws/core/autoloader.rb +1 -1
data/lib/aws/core/cacheable.rb +1 -1
data/lib/aws/core/client.rb +1 -1
data/lib/aws/core/client_logging.rb +7 -5
data/lib/aws/core/collection.rb +1 -1
data/lib/aws/core/collection/batchable.rb +1 -1
data/lib/aws/core/collection/limitable.rb +1 -1
data/lib/aws/core/collection/simple.rb +1 -1
data/lib/aws/core/configuration.rb +1 -1
data/lib/aws/core/configured_client_methods.rb +1 -1
data/lib/aws/core/configured_grammars.rb +1 -1
data/lib/aws/core/configured_option_grammars.rb +1 -1
data/lib/aws/core/configured_xml_grammars.rb +1 -1
data/lib/aws/core/default_signer.rb +1 -1
data/lib/aws/core/http/curb_handler.rb +1 -1
data/lib/aws/core/http/handler.rb +1 -1
data/lib/aws/core/http/httparty_handler.rb +1 -1
data/lib/aws/core/http/net_http_handler.rb +1 -1
data/lib/aws/core/http/request.rb +5 -14
data/lib/aws/core/http/response.rb +1 -1
data/lib/aws/core/ignore_result_element.rb +1 -1
data/lib/aws/core/indifferent_hash.rb +1 -1
data/lib/aws/core/inflection.rb +1 -1
data/lib/aws/core/lazy_error_classes.rb +1 -1
data/lib/aws/core/meta_utils.rb +1 -1
data/lib/aws/core/model.rb +1 -1
data/lib/aws/core/naming.rb +1 -1
data/lib/aws/core/option_grammar.rb +81 -1
data/lib/aws/core/page_result.rb +1 -1
data/lib/aws/core/policy.rb +1 -1
data/lib/aws/core/resource.rb +1 -1
data/lib/aws/core/resource_cache.rb +1 -1
data/lib/aws/core/response.rb +1 -1
data/lib/aws/core/response_cache.rb +1 -1
data/lib/aws/core/service_interface.rb +1 -1
data/lib/aws/core/uri_escape.rb +1 -1
data/lib/aws/core/xml_grammar.rb +1 -1
data/lib/aws/ec2.rb +1 -1
data/lib/aws/ec2/attachment.rb +1 -1
data/lib/aws/ec2/attachment_collection.rb +1 -1
data/lib/aws/ec2/availability_zone.rb +1 -1
data/lib/aws/ec2/availability_zone_collection.rb +1 -1
data/lib/aws/ec2/block_device_mappings.rb +1 -1
data/lib/aws/ec2/client.rb +1 -1
data/lib/aws/ec2/client/xml.rb +1 -1
data/lib/aws/ec2/collection.rb +1 -1
data/lib/aws/ec2/config.rb +1 -1
data/lib/aws/ec2/config_transform.rb +1 -1
data/lib/aws/ec2/elastic_ip.rb +1 -1
data/lib/aws/ec2/elastic_ip_collection.rb +1 -1
data/lib/aws/ec2/errors.rb +1 -1
data/lib/aws/ec2/filtered_collection.rb +1 -1
data/lib/aws/ec2/has_permissions.rb +1 -1
data/lib/aws/ec2/image.rb +1 -1
data/lib/aws/ec2/image_collection.rb +1 -1
data/lib/aws/ec2/instance.rb +2 -1
data/lib/aws/ec2/instance_collection.rb +1 -1
data/lib/aws/ec2/key_pair.rb +1 -1
data/lib/aws/ec2/key_pair_collection.rb +1 -1
data/lib/aws/ec2/permission_collection.rb +1 -1
data/lib/aws/ec2/region.rb +1 -1
data/lib/aws/ec2/region_collection.rb +1 -1
data/lib/aws/ec2/request.rb +1 -1
data/lib/aws/ec2/reserved_instances.rb +1 -1
data/lib/aws/ec2/reserved_instances_collection.rb +1 -1
data/lib/aws/ec2/reserved_instances_offering.rb +1 -1
data/lib/aws/ec2/reserved_instances_offering_collection.rb +1 -1
data/lib/aws/ec2/resource.rb +1 -1
data/lib/aws/ec2/resource_tag_collection.rb +1 -1
data/lib/aws/ec2/security_group.rb +2 -2
data/lib/aws/ec2/security_group/egress_ip_permission_collection.rb +1 -1
data/lib/aws/ec2/security_group/ingress_ip_permission_collection.rb +1 -1
data/lib/aws/ec2/security_group/ip_permission.rb +1 -1
data/lib/aws/ec2/security_group_collection.rb +1 -1
data/lib/aws/ec2/snapshot.rb +1 -1
data/lib/aws/ec2/snapshot_collection.rb +1 -1
data/lib/aws/ec2/tag.rb +1 -1
data/lib/aws/ec2/tag_collection.rb +1 -1
data/lib/aws/ec2/tagged_collection.rb +1 -1
data/lib/aws/ec2/tagged_item.rb +1 -1
data/lib/aws/ec2/volume.rb +1 -1
data/lib/aws/ec2/volume_collection.rb +1 -1
data/lib/aws/elb.rb +1 -1
data/lib/aws/elb/availability_zone_collection.rb +1 -1
data/lib/aws/elb/backend_server_policy_collection.rb +1 -1
data/lib/aws/elb/client.rb +1 -1
data/lib/aws/elb/client/xml.rb +1 -1
data/lib/aws/elb/config.rb +1 -1
data/lib/aws/elb/errors.rb +1 -1
data/lib/aws/elb/instance_collection.rb +1 -1
data/lib/aws/elb/listener.rb +1 -1
data/lib/aws/elb/listener_collection.rb +1 -1
data/lib/aws/elb/listener_opts.rb +1 -1
data/lib/aws/elb/listener_spec.rb +1 -1
data/lib/aws/elb/load_balancer.rb +1 -1
data/lib/aws/elb/load_balancer_collection.rb +1 -1
data/lib/aws/elb/load_balancer_policy.rb +1 -1
data/lib/aws/elb/load_balancer_policy_collection.rb +1 -1
data/lib/aws/elb/request.rb +1 -1
data/lib/aws/errors.rb +1 -1
data/lib/aws/iam.rb +1 -1
data/lib/aws/iam/access_key.rb +1 -1
data/lib/aws/iam/access_key_collection.rb +1 -1
data/lib/aws/iam/account_alias_collection.rb +1 -1
data/lib/aws/iam/client.rb +1 -1
data/lib/aws/iam/client/xml.rb +1 -1
data/lib/aws/iam/collection.rb +1 -1
data/lib/aws/iam/config.rb +1 -1
data/lib/aws/iam/errors.rb +1 -1
data/lib/aws/iam/group.rb +1 -1
data/lib/aws/iam/group_collection.rb +1 -1
data/lib/aws/iam/group_policy_collection.rb +1 -1
data/lib/aws/iam/group_user_collection.rb +1 -1
data/lib/aws/iam/login_profile.rb +1 -1
data/lib/aws/iam/mfa_device.rb +1 -1
data/lib/aws/iam/mfa_device_collection.rb +1 -1
data/lib/aws/iam/policy.rb +1 -1
data/lib/aws/iam/policy_collection.rb +1 -1
data/lib/aws/iam/request.rb +1 -1
data/lib/aws/iam/resource.rb +1 -1
data/lib/aws/iam/server_certificate.rb +1 -1
data/lib/aws/iam/server_certificate_collection.rb +1 -1
data/lib/aws/iam/signing_certificate.rb +1 -1
data/lib/aws/iam/signing_certificate_collection.rb +1 -1
data/lib/aws/iam/user.rb +1 -1
data/lib/aws/iam/user_collection.rb +1 -1
data/lib/aws/iam/user_group_collection.rb +1 -1
data/lib/aws/iam/user_policy.rb +1 -1
data/lib/aws/iam/user_policy_collection.rb +1 -1
data/lib/aws/rails.rb +1 -1
data/lib/aws/record.rb +1 -1
data/lib/aws/record/attribute.rb +1 -1
data/lib/aws/record/attribute_macros.rb +1 -1
data/lib/aws/record/attributes/boolean.rb +1 -1
data/lib/aws/record/attributes/date.rb +1 -1
data/lib/aws/record/attributes/datetime.rb +1 -1
data/lib/aws/record/attributes/float.rb +1 -1
data/lib/aws/record/attributes/integer.rb +1 -1
data/lib/aws/record/attributes/sortable_float.rb +1 -1
data/lib/aws/record/attributes/sortable_integer.rb +1 -1
data/lib/aws/record/attributes/string.rb +1 -1
data/lib/aws/record/base.rb +1 -1
data/lib/aws/record/conversion.rb +1 -1
data/lib/aws/record/dirty_tracking.rb +1 -1
data/lib/aws/record/errors.rb +1 -1
data/lib/aws/record/exceptions.rb +1 -1
data/lib/aws/record/finder_methods.rb +1 -1
data/lib/aws/record/naming.rb +1 -1
data/lib/aws/record/optimistic_locking.rb +1 -1
data/lib/aws/record/scope.rb +1 -1
data/lib/aws/record/scopes.rb +1 -1
data/lib/aws/record/validations.rb +1 -1
data/lib/aws/record/validator.rb +1 -1
data/lib/aws/record/validators/acceptance.rb +1 -1
data/lib/aws/record/validators/block.rb +1 -1
data/lib/aws/record/validators/confirmation.rb +1 -1
data/lib/aws/record/validators/count.rb +1 -1
data/lib/aws/record/validators/exclusion.rb +1 -1
data/lib/aws/record/validators/format.rb +1 -1
data/lib/aws/record/validators/inclusion.rb +1 -1
data/lib/aws/record/validators/length.rb +1 -1
data/lib/aws/record/validators/method.rb +1 -1
data/lib/aws/record/validators/numericality.rb +1 -1
data/lib/aws/record/validators/presence.rb +1 -1
data/lib/aws/s3.rb +1 -1
data/lib/aws/s3/access_control_list.rb +1 -1
data/lib/aws/s3/acl_object.rb +1 -1
data/lib/aws/s3/bucket.rb +1 -1
data/lib/aws/s3/bucket_collection.rb +1 -1
data/lib/aws/s3/bucket_version_collection.rb +1 -1
data/lib/aws/s3/client.rb +1 -1
data/lib/aws/s3/client/xml.rb +1 -1
data/lib/aws/s3/config.rb +1 -1
data/lib/aws/s3/data_options.rb +1 -1
data/lib/aws/s3/errors.rb +1 -1
data/lib/aws/s3/multipart_upload.rb +1 -1
data/lib/aws/s3/multipart_upload_collection.rb +1 -1
data/lib/aws/s3/object_collection.rb +1 -1
data/lib/aws/s3/object_metadata.rb +1 -1
data/lib/aws/s3/object_upload_collection.rb +1 -1
data/lib/aws/s3/object_version.rb +1 -1
data/lib/aws/s3/object_version_collection.rb +1 -1
data/lib/aws/s3/paginated_collection.rb +1 -1
data/lib/aws/s3/policy.rb +1 -1
data/lib/aws/s3/prefix_and_delimiter_collection.rb +1 -1
data/lib/aws/s3/prefixed_collection.rb +1 -1
data/lib/aws/s3/presigned_post.rb +1 -1
data/lib/aws/s3/request.rb +1 -1
data/lib/aws/s3/s3_object.rb +1 -1
data/lib/aws/s3/tree.rb +1 -1
data/lib/aws/s3/tree/branch_node.rb +1 -1
data/lib/aws/s3/tree/child_collection.rb +1 -1
data/lib/aws/s3/tree/leaf_node.rb +1 -1
data/lib/aws/s3/tree/node.rb +1 -1
data/lib/aws/s3/tree/parent.rb +1 -1
data/lib/aws/s3/uploaded_part.rb +1 -1
data/lib/aws/s3/uploaded_part_collection.rb +1 -1
data/lib/aws/simple_db.rb +1 -1
data/lib/aws/simple_db/attribute.rb +1 -1
data/lib/aws/simple_db/attribute_collection.rb +1 -1
data/lib/aws/simple_db/client.rb +1 -1
data/lib/aws/simple_db/client/options.rb +1 -1
data/lib/aws/simple_db/client/xml.rb +1 -1
data/lib/aws/simple_db/config.rb +1 -1
data/lib/aws/simple_db/consistent_read_option.rb +1 -1
data/lib/aws/simple_db/delete_attributes.rb +1 -1
data/lib/aws/simple_db/domain.rb +1 -1
data/lib/aws/simple_db/domain_collection.rb +1 -1
data/lib/aws/simple_db/domain_metadata.rb +1 -1
data/lib/aws/simple_db/errors.rb +1 -1
data/lib/aws/simple_db/expect_condition_option.rb +1 -1
data/lib/aws/simple_db/item.rb +1 -1
data/lib/aws/simple_db/item_collection.rb +1 -1
data/lib/aws/simple_db/item_data.rb +1 -1
data/lib/aws/simple_db/put_attributes.rb +1 -1
data/lib/aws/simple_db/request.rb +1 -1
data/lib/aws/simple_email_service.rb +1 -1
data/lib/aws/simple_email_service/client.rb +1 -1
data/lib/aws/simple_email_service/client/xml.rb +1 -1
data/lib/aws/simple_email_service/config.rb +1 -1
data/lib/aws/simple_email_service/email_address_collection.rb +1 -1
data/lib/aws/simple_email_service/errors.rb +1 -1
data/lib/aws/simple_email_service/quotas.rb +1 -1
data/lib/aws/simple_email_service/request.rb +1 -1
data/lib/aws/sns.rb +1 -1
data/lib/aws/sns/client.rb +1 -1
data/lib/aws/sns/client/xml.rb +1 -1
data/lib/aws/sns/config.rb +1 -1
data/lib/aws/sns/errors.rb +1 -1
data/lib/aws/sns/policy.rb +1 -1
data/lib/aws/sns/request.rb +1 -1
data/lib/aws/sns/subscription.rb +1 -1
data/lib/aws/sns/subscription_collection.rb +1 -1
data/lib/aws/sns/topic.rb +1 -1
data/lib/aws/sns/topic_collection.rb +1 -1
data/lib/aws/sns/topic_subscription_collection.rb +1 -1
data/lib/aws/sqs.rb +1 -1
data/lib/aws/sqs/client.rb +2 -2
data/lib/aws/sqs/client/xml.rb +1 -1
data/lib/aws/sqs/config.rb +1 -1
data/lib/aws/sqs/errors.rb +78 -2
data/lib/aws/sqs/policy.rb +1 -1
data/lib/aws/sqs/queue.rb +230 -5
data/lib/aws/sqs/queue_collection.rb +84 -18
data/lib/aws/sqs/received_message.rb +2 -3
data/lib/aws/sqs/received_sns_message.rb +1 -1
data/lib/aws/sqs/request.rb +1 -1
data/lib/aws/sts.rb +1 -1
data/lib/aws/sts/client.rb +1 -1
data/lib/aws/sts/client/xml.rb +1 -1
data/lib/aws/sts/config.rb +1 -1
data/lib/aws/sts/errors.rb +1 -1
data/lib/aws/sts/federated_session.rb +1 -1
data/lib/aws/sts/policy.rb +1 -1
data/lib/aws/sts/request.rb +1 -1
data/lib/aws/sts/session.rb +1 -1
data/lib/net/http/connection_pool.rb +1 -1
data/lib/net/http/connection_pool/connection.rb +1 -1
data/lib/net/http/connection_pool/session.rb +1 -1
data/rails/init.rb +1 -1
metadata +17 -44

data/lib/aws/core/http/response.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/ignore_result_element.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/indifferent_hash.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/inflection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/lazy_error_classes.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/meta_utils.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/model.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/naming.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/option_grammar.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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
@@ -318,6 +318,86 @@ module AWS
           end
         end
+        module Map
+          def self.apply(option, members)
+            option.extend self
+            key_option = option.key_option
+            if key_descriptors = members[:key]
+              key_option = key_option.extend_with_config(*key_descriptors)
+              MetaUtils.extend_method(option, :key_option) { key_option }
+            end
+            value_option = option.value_option
+            if value_descriptors = members[:value]
+              value_option = value_option.extend_with_config(*value_descriptors)
+              MetaUtils.extend_method(option, :value_option) { value_option }
+            end
+            key_option.param_name = members[:key_param] if members[:key_param]
+            value_option.param_name = members[:value_param] if members[:value_param]
+          end
+          def validate(value, context = nil)
+            raise format_error("hash value", context) unless
+              value.respond_to?(:to_hash)
+            context = context_description(context)
+            value.each do |key, value|
+              key_option.validate(key, "key of #{context}")
+              value_option.validate(value, "value at key #{key} of #{context}")
+            end
+          end
+          def request_params values, prefix = nil
+            values.inject([]) do |params, (key,value)|
+              index = params.size / 2 + 1
+              common_prefix = "#{prefixed_name(prefix)}.#{index}."
+              key_name = common_prefix + key_option.param_name
+              value_name = common_prefix + value_option.param_name
+              params << Http::Request::Param.new(key_name, key)
+              params << Http::Request::Param.new(value_name, value)
+            end
+          end
+          def hash_format(value)
+            value.inject({}) do |hash, (key, value)|
+              hash[key_option.hash_format(key)] =
+                value_option.hash_format(value)
+              hash
+            end
+          end
+          def key_option
+            @_key_option ||= MapOption.new("key")
+          end
+          def value_option
+            @_value_option ||= MapOption.new("value")
+          end
+          class MapOption < DefaultOption
+            def param_name
+              @param_name || name
+            end
+            def param_name= name
+              @param_name = name
+            end
+          end
+        end
         # @private
         module Boolean

data/lib/aws/core/page_result.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/policy.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/resource.rb CHANGED

@@ -1,5 +1,5 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/resource_cache.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/response.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/response_cache.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/service_interface.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/uri_escape.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/core/xml_grammar.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/attachment.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/attachment_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/availability_zone.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/availability_zone_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/block_device_mappings.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/client.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/client/xml.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/config.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/config_transform.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 module AWS
   class EC2

data/lib/aws/ec2/elastic_ip.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/elastic_ip_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/errors.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/filtered_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/has_permissions.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/image.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/image_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/instance.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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
@@ -159,6 +159,7 @@ module AWS
       # @return [String] Returns the instance id.
       attr_reader :id
+      alias_method :instance_id, :id
       # @private
       def self.reservation_attributes

data/lib/aws/ec2/instance_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/key_pair.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/key_pair_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/permission_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/region.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/region_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/request.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/reserved_instances.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/reserved_instances_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/reserved_instances_offering.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/reserved_instances_offering_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/resource.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

data/lib/aws/ec2/resource_tag_collection.rb CHANGED

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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

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

@@ -1,4 +1,4 @@
-# Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# 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
@@ -419,7 +419,7 @@ module AWS
           else
             raise ArgumentError, 'invalid ingress ip permission, ' +
-              'expected CIDR IP addres or SecurityGroup'
+              'expected CIDR IP address or SecurityGroup'
           end
         end