aws-sdk 1.2.5 → 1.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (278) hide show
  1. data/NOTICE.txt +1 -1
  2. data/lib/aws-sdk.rb +1 -1
  3. data/lib/aws.rb +1 -1
  4. data/lib/aws/api_config/EC2-2011-02-28.yml +1 -1
  5. data/lib/aws/api_config/ELB-2011-08-15.yml +1 -1
  6. data/lib/aws/api_config/IAM-2010-07-15.yml +1 -1
  7. data/lib/aws/api_config/SNS-2010-03-31.yml +1 -1
  8. data/lib/aws/api_config/{SQS-2009-02-01.yml → SQS-2011-10-01.yml} +117 -3
  9. data/lib/aws/api_config/STS-2011-06-15.yml +1 -1
  10. data/lib/aws/api_config/SimpleDB-2009-04-15.yml +1 -1
  11. data/lib/aws/api_config/SimpleEmailService-2010-12-01.yml +1 -1
  12. data/lib/aws/core.rb +4 -3
  13. data/lib/aws/core/api_config.rb +1 -1
  14. data/lib/aws/core/async_handle.rb +1 -1
  15. data/lib/aws/core/authorize_v2.rb +1 -1
  16. data/lib/aws/core/authorize_v3.rb +1 -1
  17. data/lib/aws/core/authorize_with_session_token.rb +1 -1
  18. data/lib/aws/core/autoloader.rb +1 -1
  19. data/lib/aws/core/cacheable.rb +1 -1
  20. data/lib/aws/core/client.rb +1 -1
  21. data/lib/aws/core/client_logging.rb +7 -5
  22. data/lib/aws/core/collection.rb +1 -1
  23. data/lib/aws/core/collection/batchable.rb +1 -1
  24. data/lib/aws/core/collection/limitable.rb +1 -1
  25. data/lib/aws/core/collection/simple.rb +1 -1
  26. data/lib/aws/core/configuration.rb +1 -1
  27. data/lib/aws/core/configured_client_methods.rb +1 -1
  28. data/lib/aws/core/configured_grammars.rb +1 -1
  29. data/lib/aws/core/configured_option_grammars.rb +1 -1
  30. data/lib/aws/core/configured_xml_grammars.rb +1 -1
  31. data/lib/aws/core/default_signer.rb +1 -1
  32. data/lib/aws/core/http/curb_handler.rb +1 -1
  33. data/lib/aws/core/http/handler.rb +1 -1
  34. data/lib/aws/core/http/httparty_handler.rb +1 -1
  35. data/lib/aws/core/http/net_http_handler.rb +1 -1
  36. data/lib/aws/core/http/request.rb +5 -14
  37. data/lib/aws/core/http/response.rb +1 -1
  38. data/lib/aws/core/ignore_result_element.rb +1 -1
  39. data/lib/aws/core/indifferent_hash.rb +1 -1
  40. data/lib/aws/core/inflection.rb +1 -1
  41. data/lib/aws/core/lazy_error_classes.rb +1 -1
  42. data/lib/aws/core/meta_utils.rb +1 -1
  43. data/lib/aws/core/model.rb +1 -1
  44. data/lib/aws/core/naming.rb +1 -1
  45. data/lib/aws/core/option_grammar.rb +81 -1
  46. data/lib/aws/core/page_result.rb +1 -1
  47. data/lib/aws/core/policy.rb +1 -1
  48. data/lib/aws/core/resource.rb +1 -1
  49. data/lib/aws/core/resource_cache.rb +1 -1
  50. data/lib/aws/core/response.rb +1 -1
  51. data/lib/aws/core/response_cache.rb +1 -1
  52. data/lib/aws/core/service_interface.rb +1 -1
  53. data/lib/aws/core/uri_escape.rb +1 -1
  54. data/lib/aws/core/xml_grammar.rb +1 -1
  55. data/lib/aws/ec2.rb +1 -1
  56. data/lib/aws/ec2/attachment.rb +1 -1
  57. data/lib/aws/ec2/attachment_collection.rb +1 -1
  58. data/lib/aws/ec2/availability_zone.rb +1 -1
  59. data/lib/aws/ec2/availability_zone_collection.rb +1 -1
  60. data/lib/aws/ec2/block_device_mappings.rb +1 -1
  61. data/lib/aws/ec2/client.rb +1 -1
  62. data/lib/aws/ec2/client/xml.rb +1 -1
  63. data/lib/aws/ec2/collection.rb +1 -1
  64. data/lib/aws/ec2/config.rb +1 -1
  65. data/lib/aws/ec2/config_transform.rb +1 -1
  66. data/lib/aws/ec2/elastic_ip.rb +1 -1
  67. data/lib/aws/ec2/elastic_ip_collection.rb +1 -1
  68. data/lib/aws/ec2/errors.rb +1 -1
  69. data/lib/aws/ec2/filtered_collection.rb +1 -1
  70. data/lib/aws/ec2/has_permissions.rb +1 -1
  71. data/lib/aws/ec2/image.rb +1 -1
  72. data/lib/aws/ec2/image_collection.rb +1 -1
  73. data/lib/aws/ec2/instance.rb +2 -1
  74. data/lib/aws/ec2/instance_collection.rb +1 -1
  75. data/lib/aws/ec2/key_pair.rb +1 -1
  76. data/lib/aws/ec2/key_pair_collection.rb +1 -1
  77. data/lib/aws/ec2/permission_collection.rb +1 -1
  78. data/lib/aws/ec2/region.rb +1 -1
  79. data/lib/aws/ec2/region_collection.rb +1 -1
  80. data/lib/aws/ec2/request.rb +1 -1
  81. data/lib/aws/ec2/reserved_instances.rb +1 -1
  82. data/lib/aws/ec2/reserved_instances_collection.rb +1 -1
  83. data/lib/aws/ec2/reserved_instances_offering.rb +1 -1
  84. data/lib/aws/ec2/reserved_instances_offering_collection.rb +1 -1
  85. data/lib/aws/ec2/resource.rb +1 -1
  86. data/lib/aws/ec2/resource_tag_collection.rb +1 -1
  87. data/lib/aws/ec2/security_group.rb +2 -2
  88. data/lib/aws/ec2/security_group/egress_ip_permission_collection.rb +1 -1
  89. data/lib/aws/ec2/security_group/ingress_ip_permission_collection.rb +1 -1
  90. data/lib/aws/ec2/security_group/ip_permission.rb +1 -1
  91. data/lib/aws/ec2/security_group_collection.rb +1 -1
  92. data/lib/aws/ec2/snapshot.rb +1 -1
  93. data/lib/aws/ec2/snapshot_collection.rb +1 -1
  94. data/lib/aws/ec2/tag.rb +1 -1
  95. data/lib/aws/ec2/tag_collection.rb +1 -1
  96. data/lib/aws/ec2/tagged_collection.rb +1 -1
  97. data/lib/aws/ec2/tagged_item.rb +1 -1
  98. data/lib/aws/ec2/volume.rb +1 -1
  99. data/lib/aws/ec2/volume_collection.rb +1 -1
  100. data/lib/aws/elb.rb +1 -1
  101. data/lib/aws/elb/availability_zone_collection.rb +1 -1
  102. data/lib/aws/elb/backend_server_policy_collection.rb +1 -1
  103. data/lib/aws/elb/client.rb +1 -1
  104. data/lib/aws/elb/client/xml.rb +1 -1
  105. data/lib/aws/elb/config.rb +1 -1
  106. data/lib/aws/elb/errors.rb +1 -1
  107. data/lib/aws/elb/instance_collection.rb +1 -1
  108. data/lib/aws/elb/listener.rb +1 -1
  109. data/lib/aws/elb/listener_collection.rb +1 -1
  110. data/lib/aws/elb/listener_opts.rb +1 -1
  111. data/lib/aws/elb/listener_spec.rb +1 -1
  112. data/lib/aws/elb/load_balancer.rb +1 -1
  113. data/lib/aws/elb/load_balancer_collection.rb +1 -1
  114. data/lib/aws/elb/load_balancer_policy.rb +1 -1
  115. data/lib/aws/elb/load_balancer_policy_collection.rb +1 -1
  116. data/lib/aws/elb/request.rb +1 -1
  117. data/lib/aws/errors.rb +1 -1
  118. data/lib/aws/iam.rb +1 -1
  119. data/lib/aws/iam/access_key.rb +1 -1
  120. data/lib/aws/iam/access_key_collection.rb +1 -1
  121. data/lib/aws/iam/account_alias_collection.rb +1 -1
  122. data/lib/aws/iam/client.rb +1 -1
  123. data/lib/aws/iam/client/xml.rb +1 -1
  124. data/lib/aws/iam/collection.rb +1 -1
  125. data/lib/aws/iam/config.rb +1 -1
  126. data/lib/aws/iam/errors.rb +1 -1
  127. data/lib/aws/iam/group.rb +1 -1
  128. data/lib/aws/iam/group_collection.rb +1 -1
  129. data/lib/aws/iam/group_policy_collection.rb +1 -1
  130. data/lib/aws/iam/group_user_collection.rb +1 -1
  131. data/lib/aws/iam/login_profile.rb +1 -1
  132. data/lib/aws/iam/mfa_device.rb +1 -1
  133. data/lib/aws/iam/mfa_device_collection.rb +1 -1
  134. data/lib/aws/iam/policy.rb +1 -1
  135. data/lib/aws/iam/policy_collection.rb +1 -1
  136. data/lib/aws/iam/request.rb +1 -1
  137. data/lib/aws/iam/resource.rb +1 -1
  138. data/lib/aws/iam/server_certificate.rb +1 -1
  139. data/lib/aws/iam/server_certificate_collection.rb +1 -1
  140. data/lib/aws/iam/signing_certificate.rb +1 -1
  141. data/lib/aws/iam/signing_certificate_collection.rb +1 -1
  142. data/lib/aws/iam/user.rb +1 -1
  143. data/lib/aws/iam/user_collection.rb +1 -1
  144. data/lib/aws/iam/user_group_collection.rb +1 -1
  145. data/lib/aws/iam/user_policy.rb +1 -1
  146. data/lib/aws/iam/user_policy_collection.rb +1 -1
  147. data/lib/aws/rails.rb +1 -1
  148. data/lib/aws/record.rb +1 -1
  149. data/lib/aws/record/attribute.rb +1 -1
  150. data/lib/aws/record/attribute_macros.rb +1 -1
  151. data/lib/aws/record/attributes/boolean.rb +1 -1
  152. data/lib/aws/record/attributes/date.rb +1 -1
  153. data/lib/aws/record/attributes/datetime.rb +1 -1
  154. data/lib/aws/record/attributes/float.rb +1 -1
  155. data/lib/aws/record/attributes/integer.rb +1 -1
  156. data/lib/aws/record/attributes/sortable_float.rb +1 -1
  157. data/lib/aws/record/attributes/sortable_integer.rb +1 -1
  158. data/lib/aws/record/attributes/string.rb +1 -1
  159. data/lib/aws/record/base.rb +1 -1
  160. data/lib/aws/record/conversion.rb +1 -1
  161. data/lib/aws/record/dirty_tracking.rb +1 -1
  162. data/lib/aws/record/errors.rb +1 -1
  163. data/lib/aws/record/exceptions.rb +1 -1
  164. data/lib/aws/record/finder_methods.rb +1 -1
  165. data/lib/aws/record/naming.rb +1 -1
  166. data/lib/aws/record/optimistic_locking.rb +1 -1
  167. data/lib/aws/record/scope.rb +1 -1
  168. data/lib/aws/record/scopes.rb +1 -1
  169. data/lib/aws/record/validations.rb +1 -1
  170. data/lib/aws/record/validator.rb +1 -1
  171. data/lib/aws/record/validators/acceptance.rb +1 -1
  172. data/lib/aws/record/validators/block.rb +1 -1
  173. data/lib/aws/record/validators/confirmation.rb +1 -1
  174. data/lib/aws/record/validators/count.rb +1 -1
  175. data/lib/aws/record/validators/exclusion.rb +1 -1
  176. data/lib/aws/record/validators/format.rb +1 -1
  177. data/lib/aws/record/validators/inclusion.rb +1 -1
  178. data/lib/aws/record/validators/length.rb +1 -1
  179. data/lib/aws/record/validators/method.rb +1 -1
  180. data/lib/aws/record/validators/numericality.rb +1 -1
  181. data/lib/aws/record/validators/presence.rb +1 -1
  182. data/lib/aws/s3.rb +1 -1
  183. data/lib/aws/s3/access_control_list.rb +1 -1
  184. data/lib/aws/s3/acl_object.rb +1 -1
  185. data/lib/aws/s3/bucket.rb +1 -1
  186. data/lib/aws/s3/bucket_collection.rb +1 -1
  187. data/lib/aws/s3/bucket_version_collection.rb +1 -1
  188. data/lib/aws/s3/client.rb +1 -1
  189. data/lib/aws/s3/client/xml.rb +1 -1
  190. data/lib/aws/s3/config.rb +1 -1
  191. data/lib/aws/s3/data_options.rb +1 -1
  192. data/lib/aws/s3/errors.rb +1 -1
  193. data/lib/aws/s3/multipart_upload.rb +1 -1
  194. data/lib/aws/s3/multipart_upload_collection.rb +1 -1
  195. data/lib/aws/s3/object_collection.rb +1 -1
  196. data/lib/aws/s3/object_metadata.rb +1 -1
  197. data/lib/aws/s3/object_upload_collection.rb +1 -1
  198. data/lib/aws/s3/object_version.rb +1 -1
  199. data/lib/aws/s3/object_version_collection.rb +1 -1
  200. data/lib/aws/s3/paginated_collection.rb +1 -1
  201. data/lib/aws/s3/policy.rb +1 -1
  202. data/lib/aws/s3/prefix_and_delimiter_collection.rb +1 -1
  203. data/lib/aws/s3/prefixed_collection.rb +1 -1
  204. data/lib/aws/s3/presigned_post.rb +1 -1
  205. data/lib/aws/s3/request.rb +1 -1
  206. data/lib/aws/s3/s3_object.rb +1 -1
  207. data/lib/aws/s3/tree.rb +1 -1
  208. data/lib/aws/s3/tree/branch_node.rb +1 -1
  209. data/lib/aws/s3/tree/child_collection.rb +1 -1
  210. data/lib/aws/s3/tree/leaf_node.rb +1 -1
  211. data/lib/aws/s3/tree/node.rb +1 -1
  212. data/lib/aws/s3/tree/parent.rb +1 -1
  213. data/lib/aws/s3/uploaded_part.rb +1 -1
  214. data/lib/aws/s3/uploaded_part_collection.rb +1 -1
  215. data/lib/aws/simple_db.rb +1 -1
  216. data/lib/aws/simple_db/attribute.rb +1 -1
  217. data/lib/aws/simple_db/attribute_collection.rb +1 -1
  218. data/lib/aws/simple_db/client.rb +1 -1
  219. data/lib/aws/simple_db/client/options.rb +1 -1
  220. data/lib/aws/simple_db/client/xml.rb +1 -1
  221. data/lib/aws/simple_db/config.rb +1 -1
  222. data/lib/aws/simple_db/consistent_read_option.rb +1 -1
  223. data/lib/aws/simple_db/delete_attributes.rb +1 -1
  224. data/lib/aws/simple_db/domain.rb +1 -1
  225. data/lib/aws/simple_db/domain_collection.rb +1 -1
  226. data/lib/aws/simple_db/domain_metadata.rb +1 -1
  227. data/lib/aws/simple_db/errors.rb +1 -1
  228. data/lib/aws/simple_db/expect_condition_option.rb +1 -1
  229. data/lib/aws/simple_db/item.rb +1 -1
  230. data/lib/aws/simple_db/item_collection.rb +1 -1
  231. data/lib/aws/simple_db/item_data.rb +1 -1
  232. data/lib/aws/simple_db/put_attributes.rb +1 -1
  233. data/lib/aws/simple_db/request.rb +1 -1
  234. data/lib/aws/simple_email_service.rb +1 -1
  235. data/lib/aws/simple_email_service/client.rb +1 -1
  236. data/lib/aws/simple_email_service/client/xml.rb +1 -1
  237. data/lib/aws/simple_email_service/config.rb +1 -1
  238. data/lib/aws/simple_email_service/email_address_collection.rb +1 -1
  239. data/lib/aws/simple_email_service/errors.rb +1 -1
  240. data/lib/aws/simple_email_service/quotas.rb +1 -1
  241. data/lib/aws/simple_email_service/request.rb +1 -1
  242. data/lib/aws/sns.rb +1 -1
  243. data/lib/aws/sns/client.rb +1 -1
  244. data/lib/aws/sns/client/xml.rb +1 -1
  245. data/lib/aws/sns/config.rb +1 -1
  246. data/lib/aws/sns/errors.rb +1 -1
  247. data/lib/aws/sns/policy.rb +1 -1
  248. data/lib/aws/sns/request.rb +1 -1
  249. data/lib/aws/sns/subscription.rb +1 -1
  250. data/lib/aws/sns/subscription_collection.rb +1 -1
  251. data/lib/aws/sns/topic.rb +1 -1
  252. data/lib/aws/sns/topic_collection.rb +1 -1
  253. data/lib/aws/sns/topic_subscription_collection.rb +1 -1
  254. data/lib/aws/sqs.rb +1 -1
  255. data/lib/aws/sqs/client.rb +2 -2
  256. data/lib/aws/sqs/client/xml.rb +1 -1
  257. data/lib/aws/sqs/config.rb +1 -1
  258. data/lib/aws/sqs/errors.rb +78 -2
  259. data/lib/aws/sqs/policy.rb +1 -1
  260. data/lib/aws/sqs/queue.rb +230 -5
  261. data/lib/aws/sqs/queue_collection.rb +84 -18
  262. data/lib/aws/sqs/received_message.rb +2 -3
  263. data/lib/aws/sqs/received_sns_message.rb +1 -1
  264. data/lib/aws/sqs/request.rb +1 -1
  265. data/lib/aws/sts.rb +1 -1
  266. data/lib/aws/sts/client.rb +1 -1
  267. data/lib/aws/sts/client/xml.rb +1 -1
  268. data/lib/aws/sts/config.rb +1 -1
  269. data/lib/aws/sts/errors.rb +1 -1
  270. data/lib/aws/sts/federated_session.rb +1 -1
  271. data/lib/aws/sts/policy.rb +1 -1
  272. data/lib/aws/sts/request.rb +1 -1
  273. data/lib/aws/sts/session.rb +1 -1
  274. data/lib/net/http/connection_pool.rb +1 -1
  275. data/lib/net/http/connection_pool/connection.rb +1 -1
  276. data/lib/net/http/connection_pool/session.rb +1 -1
  277. data/rails/init.rb +1 -1
  278. metadata +17 -44
data/lib/aws/core/http/response.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # may not use this file except in compliance with the License. A copy of
@@ -318,6 +318,86 @@ module AWS
318
318
  end
319
319
 
320
320
  end
321
+
322
+ module Map
323
+
324
+ def self.apply(option, members)
325
+
326
+ option.extend self
327
+
328
+ key_option = option.key_option
329
+ if key_descriptors = members[:key]
330
+ key_option = key_option.extend_with_config(*key_descriptors)
331
+ MetaUtils.extend_method(option, :key_option) { key_option }
332
+ end
333
+
334
+ value_option = option.value_option
335
+ if value_descriptors = members[:value]
336
+ value_option = value_option.extend_with_config(*value_descriptors)
337
+ MetaUtils.extend_method(option, :value_option) { value_option }
338
+ end
339
+
340
+ key_option.param_name = members[:key_param] if members[:key_param]
341
+ value_option.param_name = members[:value_param] if members[:value_param]
342
+
343
+ end
344
+
345
+ def validate(value, context = nil)
346
+
347
+ raise format_error("hash value", context) unless
348
+ value.respond_to?(:to_hash)
349
+
350
+ context = context_description(context)
351
+
352
+ value.each do |key, value|
353
+ key_option.validate(key, "key of #{context}")
354
+ value_option.validate(value, "value at key #{key} of #{context}")
355
+ end
356
+
357
+ end
358
+
359
+ def request_params values, prefix = nil
360
+ values.inject([]) do |params, (key,value)|
361
+
362
+ index = params.size / 2 + 1
363
+ common_prefix = "#{prefixed_name(prefix)}.#{index}."
364
+
365
+ key_name = common_prefix + key_option.param_name
366
+ value_name = common_prefix + value_option.param_name
367
+
368
+ params << Http::Request::Param.new(key_name, key)
369
+ params << Http::Request::Param.new(value_name, value)
370
+
371
+ end
372
+ end
373
+
374
+
375
+ def hash_format(value)
376
+ value.inject({}) do |hash, (key, value)|
377
+ hash[key_option.hash_format(key)] =
378
+ value_option.hash_format(value)
379
+ hash
380
+ end
381
+ end
382
+
383
+ def key_option
384
+ @_key_option ||= MapOption.new("key")
385
+ end
386
+
387
+ def value_option
388
+ @_value_option ||= MapOption.new("value")
389
+ end
390
+
391
+ class MapOption < DefaultOption
392
+ def param_name
393
+ @param_name || name
394
+ end
395
+ def param_name= name
396
+ @param_name = name
397
+ end
398
+ end
399
+
400
+ end
321
401
 
322
402
  # @private
323
403
  module Boolean
data/lib/aws/core/page_result.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
1
 
2
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3
3
  #
4
4
  # Licensed under the Apache License, Version 2.0 (the "License"). You
5
5
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # may not use this file except in compliance with the License. A copy of
data/lib/aws/ec2.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
 
3
3
  module AWS
4
4
  class EC2
data/lib/aws/ec2/elastic_ip.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # may not use this file except in compliance with the License. A copy of
@@ -159,6 +159,7 @@ module AWS
159
159
 
160
160
  # @return [String] Returns the instance id.
161
161
  attr_reader :id
162
+ alias_method :instance_id, :id
162
163
 
163
164
  # @private
164
165
  def self.reservation_attributes
data/lib/aws/ec2/instance_collection.rb CHANGED
@@ -1,4 +1,4 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # 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 @@
1
- # Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
2
  #
3
3
  # Licensed under the Apache License, Version 2.0 (the "License"). You
4
4
  # may not use this file except in compliance with the License. A copy of
@@ -419,7 +419,7 @@ module AWS
419
419
 
420
420
  else
421
421
  raise ArgumentError, 'invalid ingress ip permission, ' +
422
- 'expected CIDR IP addres or SecurityGroup'
422
+ 'expected CIDR IP address or SecurityGroup'
423
423
  end
424
424
  end
425
425