aws-sdk 1.9.0 → 1.9.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (293) hide show
  1. data/.yardopts +2 -2
  2. data/lib/aws/auto_scaling/activity.rb +1 -1
  3. data/lib/aws/auto_scaling/activity_collection.rb +1 -1
  4. data/lib/aws/auto_scaling/client.rb +1 -1
  5. data/lib/aws/auto_scaling/group_options.rb +1 -1
  6. data/lib/aws/auto_scaling/instance.rb +1 -1
  7. data/lib/aws/auto_scaling/launch_configuration.rb +1 -1
  8. data/lib/aws/auto_scaling/notification_configuration.rb +2 -2
  9. data/lib/aws/auto_scaling/notification_configuration_collection.rb +1 -1
  10. data/lib/aws/auto_scaling/request.rb +1 -1
  11. data/lib/aws/auto_scaling/scaling_policy.rb +1 -1
  12. data/lib/aws/auto_scaling/scaling_policy_options.rb +1 -1
  13. data/lib/aws/auto_scaling/scheduled_action.rb +1 -1
  14. data/lib/aws/auto_scaling/scheduled_action_collection.rb +1 -1
  15. data/lib/aws/auto_scaling/tag.rb +1 -1
  16. data/lib/aws/auto_scaling/tag_collection.rb +1 -1
  17. data/lib/aws/cloud_formation/client.rb +1 -1
  18. data/lib/aws/cloud_formation/request.rb +1 -1
  19. data/lib/aws/cloud_formation/stack.rb +1 -1
  20. data/lib/aws/cloud_formation/stack_collection.rb +1 -1
  21. data/lib/aws/cloud_formation/stack_event.rb +1 -1
  22. data/lib/aws/cloud_formation/stack_options.rb +1 -1
  23. data/lib/aws/cloud_formation/stack_output.rb +1 -1
  24. data/lib/aws/cloud_formation/stack_resource.rb +1 -1
  25. data/lib/aws/cloud_formation/stack_summary_collection.rb +1 -1
  26. data/lib/aws/cloud_front/client.rb +1 -1
  27. data/lib/aws/cloud_front/request.rb +1 -1
  28. data/lib/aws/cloud_search/client.rb +1 -1
  29. data/lib/aws/cloud_search/request.rb +1 -1
  30. data/lib/aws/cloud_watch/alarm.rb +1 -1
  31. data/lib/aws/cloud_watch/alarm_history_item.rb +1 -1
  32. data/lib/aws/cloud_watch/alarm_history_item_collection.rb +1 -1
  33. data/lib/aws/cloud_watch/client.rb +1 -1
  34. data/lib/aws/cloud_watch/metric_alarm_collection.rb +1 -1
  35. data/lib/aws/cloud_watch/metric_collection.rb +1 -1
  36. data/lib/aws/cloud_watch/request.rb +1 -1
  37. data/lib/aws/core.rb +5 -5
  38. data/lib/aws/core/cacheable.rb +5 -5
  39. data/lib/aws/core/client.rb +11 -11
  40. data/lib/aws/core/configuration.rb +4 -4
  41. data/lib/aws/core/credential_providers.rb +3 -3
  42. data/lib/aws/core/data.rb +4 -4
  43. data/lib/aws/core/http/connection_pool.rb +6 -5
  44. data/lib/aws/core/http/curb_handler.rb +1 -1
  45. data/lib/aws/core/http/handler.rb +1 -1
  46. data/lib/aws/core/http/net_http_handler.rb +3 -2
  47. data/lib/aws/core/http/patch.rb +2 -2
  48. data/lib/aws/core/http/request.rb +8 -8
  49. data/lib/aws/core/indifferent_hash.rb +1 -1
  50. data/lib/aws/core/inflection.rb +1 -1
  51. data/lib/aws/core/json_parser.rb +1 -1
  52. data/lib/aws/core/json_request_builder.rb +1 -1
  53. data/lib/aws/core/json_response_parser.rb +1 -1
  54. data/lib/aws/core/lazy_error_classes.rb +1 -1
  55. data/lib/aws/core/log_formatter.rb +1 -1
  56. data/lib/aws/core/managed_file.rb +1 -1
  57. data/lib/aws/core/meta_utils.rb +1 -1
  58. data/lib/aws/core/model.rb +2 -2
  59. data/lib/aws/core/naming.rb +1 -1
  60. data/lib/aws/core/option_grammar.rb +17 -17
  61. data/lib/aws/core/policy.rb +32 -32
  62. data/lib/aws/core/query_error_parser.rb +1 -1
  63. data/lib/aws/core/query_request_builder.rb +1 -1
  64. data/lib/aws/core/query_response_parser.rb +1 -1
  65. data/lib/aws/core/region_collection.rb +3 -3
  66. data/lib/aws/core/resource.rb +25 -25
  67. data/lib/aws/core/resource_cache.rb +1 -1
  68. data/lib/aws/core/response.rb +4 -4
  69. data/lib/aws/core/response_cache.rb +1 -1
  70. data/lib/aws/core/rest_error_parser.rb +1 -1
  71. data/lib/aws/core/rest_request_builder.rb +1 -1
  72. data/lib/aws/core/rest_response_parser.rb +1 -1
  73. data/lib/aws/core/service_interface.rb +2 -2
  74. data/lib/aws/core/xml/frame_stack.rb +1 -1
  75. data/lib/aws/data_pipeline/client.rb +1 -1
  76. data/lib/aws/data_pipeline/request.rb +1 -1
  77. data/lib/aws/direct_connect/client.rb +1 -1
  78. data/lib/aws/direct_connect/errors.rb +1 -1
  79. data/lib/aws/direct_connect/request.rb +1 -1
  80. data/lib/aws/dynamo_db/attribute_collection.rb +3 -3
  81. data/lib/aws/dynamo_db/item.rb +2 -2
  82. data/lib/aws/dynamo_db/item_collection.rb +5 -5
  83. data/lib/aws/dynamo_db/keys.rb +1 -1
  84. data/lib/aws/dynamo_db/request.rb +1 -1
  85. data/lib/aws/dynamo_db/resource.rb +1 -1
  86. data/lib/aws/dynamo_db/table.rb +1 -1
  87. data/lib/aws/dynamo_db/table_collection.rb +1 -1
  88. data/lib/aws/dynamo_db/types.rb +1 -1
  89. data/lib/aws/ec2/attachment.rb +1 -1
  90. data/lib/aws/ec2/attachment_collection.rb +1 -1
  91. data/lib/aws/ec2/availability_zone_collection.rb +1 -1
  92. data/lib/aws/ec2/block_device_mappings.rb +2 -2
  93. data/lib/aws/ec2/client.rb +1 -1
  94. data/lib/aws/ec2/config_transform.rb +1 -1
  95. data/lib/aws/ec2/customer_gateway.rb +1 -1
  96. data/lib/aws/ec2/dhcp_options.rb +1 -1
  97. data/lib/aws/ec2/elastic_ip.rb +4 -4
  98. data/lib/aws/ec2/errors.rb +1 -1
  99. data/lib/aws/ec2/export_task.rb +1 -1
  100. data/lib/aws/ec2/filtered_collection.rb +3 -3
  101. data/lib/aws/ec2/image.rb +1 -1
  102. data/lib/aws/ec2/image_collection.rb +3 -3
  103. data/lib/aws/ec2/instance.rb +7 -7
  104. data/lib/aws/ec2/instance_collection.rb +3 -3
  105. data/lib/aws/ec2/internet_gateway/attachment.rb +1 -1
  106. data/lib/aws/ec2/key_pair_collection.rb +2 -2
  107. data/lib/aws/ec2/permission_collection.rb +10 -10
  108. data/lib/aws/ec2/region_collection.rb +1 -1
  109. data/lib/aws/ec2/request.rb +1 -1
  110. data/lib/aws/ec2/resource.rb +3 -3
  111. data/lib/aws/ec2/resource_tag_collection.rb +1 -1
  112. data/lib/aws/ec2/route_table/association.rb +1 -1
  113. data/lib/aws/ec2/security_group.rb +9 -9
  114. data/lib/aws/ec2/snapshot.rb +2 -2
  115. data/lib/aws/ec2/snapshot_collection.rb +3 -3
  116. data/lib/aws/ec2/tag.rb +2 -2
  117. data/lib/aws/ec2/tag_collection.rb +3 -3
  118. data/lib/aws/ec2/tagged_item.rb +2 -2
  119. data/lib/aws/ec2/volume.rb +1 -1
  120. data/lib/aws/ec2/volume_collection.rb +1 -1
  121. data/lib/aws/ec2/vpn_connection.rb +1 -1
  122. data/lib/aws/ec2/vpn_gateway/attachment.rb +1 -1
  123. data/lib/aws/elastic_beanstalk/client.rb +1 -1
  124. data/lib/aws/elastic_beanstalk/request.rb +1 -1
  125. data/lib/aws/elastic_transcoder/client.rb +2 -2
  126. data/lib/aws/elastic_transcoder/request.rb +1 -1
  127. data/lib/aws/elasticache/client.rb +1 -1
  128. data/lib/aws/elasticache/request.rb +1 -1
  129. data/lib/aws/elb/client.rb +1 -1
  130. data/lib/aws/elb/listener.rb +2 -2
  131. data/lib/aws/elb/listener_opts.rb +1 -1
  132. data/lib/aws/elb/load_balancer_policy.rb +1 -1
  133. data/lib/aws/elb/request.rb +1 -1
  134. data/lib/aws/emr/client.rb +1 -1
  135. data/lib/aws/emr/instance_group.rb +1 -1
  136. data/lib/aws/emr/instance_group_collection.rb +1 -1
  137. data/lib/aws/emr/job_flow.rb +1 -1
  138. data/lib/aws/emr/job_flow_collection.rb +1 -1
  139. data/lib/aws/emr/request.rb +1 -1
  140. data/lib/aws/errors.rb +1 -1
  141. data/lib/aws/glacier/client.rb +1 -1
  142. data/lib/aws/glacier/request.rb +1 -1
  143. data/lib/aws/glacier/resource.rb +1 -1
  144. data/lib/aws/iam.rb +1 -1
  145. data/lib/aws/iam/access_key.rb +3 -3
  146. data/lib/aws/iam/access_key_collection.rb +2 -2
  147. data/lib/aws/iam/account_alias_collection.rb +3 -3
  148. data/lib/aws/iam/client.rb +1 -1
  149. data/lib/aws/iam/collection.rb +1 -1
  150. data/lib/aws/iam/group.rb +2 -2
  151. data/lib/aws/iam/group_collection.rb +1 -1
  152. data/lib/aws/iam/group_policy_collection.rb +1 -1
  153. data/lib/aws/iam/group_user_collection.rb +2 -2
  154. data/lib/aws/iam/login_profile.rb +1 -1
  155. data/lib/aws/iam/mfa_device_collection.rb +1 -1
  156. data/lib/aws/iam/request.rb +1 -1
  157. data/lib/aws/iam/resource.rb +2 -2
  158. data/lib/aws/iam/server_certificate.rb +2 -2
  159. data/lib/aws/iam/server_certificate_collection.rb +1 -1
  160. data/lib/aws/iam/signing_certificate.rb +3 -3
  161. data/lib/aws/iam/signing_certificate_collection.rb +2 -2
  162. data/lib/aws/iam/user.rb +1 -1
  163. data/lib/aws/iam/user_collection.rb +1 -1
  164. data/lib/aws/iam/user_group_collection.rb +3 -3
  165. data/lib/aws/iam/user_policy.rb +1 -1
  166. data/lib/aws/iam/virtual_mfa_device.rb +1 -1
  167. data/lib/aws/import_export/client.rb +1 -1
  168. data/lib/aws/import_export/request.rb +1 -1
  169. data/lib/aws/ops_works/client.rb +1 -1
  170. data/lib/aws/ops_works/request.rb +1 -1
  171. data/lib/aws/rails.rb +4 -4
  172. data/lib/aws/rds/client.rb +1 -1
  173. data/lib/aws/rds/db_snapshot_collection.rb +1 -1
  174. data/lib/aws/rds/request.rb +1 -1
  175. data/lib/aws/record.rb +3 -3
  176. data/lib/aws/record/abstract_base.rb +4 -4
  177. data/lib/aws/record/attributes.rb +7 -7
  178. data/lib/aws/record/conversion.rb +4 -4
  179. data/lib/aws/record/dirty_tracking.rb +5 -5
  180. data/lib/aws/record/exceptions.rb +3 -3
  181. data/lib/aws/record/hash_model.rb +2 -2
  182. data/lib/aws/record/model.rb +6 -6
  183. data/lib/aws/record/model/scope.rb +5 -5
  184. data/lib/aws/record/naming.rb +2 -2
  185. data/lib/aws/record/scope.rb +7 -7
  186. data/lib/aws/record/validations.rb +1 -1
  187. data/lib/aws/record/validator.rb +14 -14
  188. data/lib/aws/record/validators/acceptance.rb +1 -1
  189. data/lib/aws/record/validators/block.rb +1 -1
  190. data/lib/aws/record/validators/confirmation.rb +1 -1
  191. data/lib/aws/record/validators/count.rb +4 -4
  192. data/lib/aws/record/validators/exclusion.rb +1 -1
  193. data/lib/aws/record/validators/format.rb +1 -1
  194. data/lib/aws/record/validators/inclusion.rb +1 -1
  195. data/lib/aws/record/validators/length.rb +4 -4
  196. data/lib/aws/record/validators/method.rb +1 -1
  197. data/lib/aws/record/validators/numericality.rb +1 -1
  198. data/lib/aws/record/validators/presence.rb +1 -1
  199. data/lib/aws/redshift/client.rb +1 -1
  200. data/lib/aws/redshift/request.rb +1 -1
  201. data/lib/aws/route_53/change_batch.rb +2 -2
  202. data/lib/aws/route_53/change_info.rb +1 -1
  203. data/lib/aws/route_53/client.rb +1 -1
  204. data/lib/aws/route_53/hosted_zone.rb +1 -1
  205. data/lib/aws/route_53/hosted_zone_collection.rb +1 -1
  206. data/lib/aws/route_53/request.rb +1 -1
  207. data/lib/aws/route_53/resource_record_set.rb +1 -1
  208. data/lib/aws/route_53/resource_record_set_collection.rb +1 -1
  209. data/lib/aws/s3/access_control_list.rb +7 -7
  210. data/lib/aws/s3/acl_object.rb +6 -6
  211. data/lib/aws/s3/acl_options.rb +1 -1
  212. data/lib/aws/s3/bucket.rb +3 -3
  213. data/lib/aws/s3/bucket_collection.rb +1 -1
  214. data/lib/aws/s3/bucket_lifecycle_configuration.rb +3 -3
  215. data/lib/aws/s3/bucket_tag_collection.rb +1 -1
  216. data/lib/aws/s3/bucket_version_collection.rb +4 -4
  217. data/lib/aws/s3/cipher_io.rb +1 -1
  218. data/lib/aws/s3/client.rb +2 -2
  219. data/lib/aws/s3/client/xml.rb +1 -1
  220. data/lib/aws/s3/data_options.rb +2 -2
  221. data/lib/aws/s3/encryption_utils.rb +1 -1
  222. data/lib/aws/s3/errors.rb +1 -1
  223. data/lib/aws/s3/multipart_upload.rb +5 -5
  224. data/lib/aws/s3/multipart_upload_collection.rb +1 -1
  225. data/lib/aws/s3/object_collection.rb +5 -5
  226. data/lib/aws/s3/object_upload_collection.rb +1 -1
  227. data/lib/aws/s3/object_version.rb +1 -1
  228. data/lib/aws/s3/paginated_collection.rb +1 -1
  229. data/lib/aws/s3/prefix_and_delimiter_collection.rb +3 -3
  230. data/lib/aws/s3/prefixed_collection.rb +2 -2
  231. data/lib/aws/s3/presigned_post.rb +18 -18
  232. data/lib/aws/s3/request.rb +2 -2
  233. data/lib/aws/s3/s3_object.rb +3 -3
  234. data/lib/aws/s3/tree/branch_node.rb +1 -1
  235. data/lib/aws/s3/tree/child_collection.rb +1 -1
  236. data/lib/aws/s3/tree/leaf_node.rb +1 -1
  237. data/lib/aws/s3/tree/node.rb +1 -1
  238. data/lib/aws/s3/tree/parent.rb +1 -1
  239. data/lib/aws/s3/uploaded_part.rb +2 -2
  240. data/lib/aws/s3/uploaded_part_collection.rb +6 -6
  241. data/lib/aws/s3/website_configuration.rb +4 -4
  242. data/lib/aws/simple_db.rb +2 -2
  243. data/lib/aws/simple_db/attribute.rb +2 -2
  244. data/lib/aws/simple_db/client.rb +6 -6
  245. data/lib/aws/simple_db/consistent_read_option.rb +1 -1
  246. data/lib/aws/simple_db/delete_attributes.rb +3 -3
  247. data/lib/aws/simple_db/domain.rb +2 -2
  248. data/lib/aws/simple_db/domain_metadata.rb +1 -1
  249. data/lib/aws/simple_db/errors.rb +2 -2
  250. data/lib/aws/simple_db/expect_condition_option.rb +2 -2
  251. data/lib/aws/simple_db/item_collection.rb +17 -17
  252. data/lib/aws/simple_db/item_data.rb +1 -1
  253. data/lib/aws/simple_db/put_attributes.rb +3 -3
  254. data/lib/aws/simple_db/request.rb +1 -1
  255. data/lib/aws/simple_email_service.rb +3 -3
  256. data/lib/aws/simple_email_service/client.rb +1 -1
  257. data/lib/aws/simple_email_service/identity.rb +1 -1
  258. data/lib/aws/simple_email_service/identity_collection.rb +1 -1
  259. data/lib/aws/simple_email_service/quotas.rb +1 -1
  260. data/lib/aws/simple_email_service/request.rb +1 -1
  261. data/lib/aws/simple_workflow/activity_task.rb +1 -1
  262. data/lib/aws/simple_workflow/activity_task_collection.rb +1 -1
  263. data/lib/aws/simple_workflow/client.rb +1 -1
  264. data/lib/aws/simple_workflow/count.rb +1 -1
  265. data/lib/aws/simple_workflow/decision_task.rb +1 -1
  266. data/lib/aws/simple_workflow/decision_task_collection.rb +1 -1
  267. data/lib/aws/simple_workflow/domain.rb +1 -1
  268. data/lib/aws/simple_workflow/history_event.rb +3 -3
  269. data/lib/aws/simple_workflow/option_formatters.rb +1 -1
  270. data/lib/aws/simple_workflow/request.rb +1 -1
  271. data/lib/aws/simple_workflow/resource.rb +8 -8
  272. data/lib/aws/simple_workflow/type_collection.rb +1 -1
  273. data/lib/aws/simple_workflow/workflow_execution_collection.rb +2 -2
  274. data/lib/aws/sns/client.rb +1 -1
  275. data/lib/aws/sns/request.rb +1 -1
  276. data/lib/aws/sns/subscription.rb +2 -2
  277. data/lib/aws/sns/topic.rb +3 -3
  278. data/lib/aws/sns/topic_subscription_collection.rb +1 -1
  279. data/lib/aws/sqs/client.rb +1 -1
  280. data/lib/aws/sqs/errors.rb +1 -1
  281. data/lib/aws/sqs/queue.rb +8 -8
  282. data/lib/aws/sqs/queue_collection.rb +1 -1
  283. data/lib/aws/sqs/received_message.rb +3 -3
  284. data/lib/aws/sqs/request.rb +1 -1
  285. data/lib/aws/storage_gateway/client.rb +1 -1
  286. data/lib/aws/storage_gateway/request.rb +1 -1
  287. data/lib/aws/sts/client.rb +1 -1
  288. data/lib/aws/sts/federated_session.rb +1 -1
  289. data/lib/aws/sts/request.rb +1 -1
  290. data/lib/aws/sts/session.rb +1 -1
  291. data/lib/aws/version.rb +1 -1
  292. metadata +16 -8
  293. checksums.yaml +0 -7
@@ -259,7 +259,7 @@ module AWS
259
259
  nil
260
260
  end
261
261
 
262
- # @private
262
+ # @api private
263
263
  def __permissions_attribute__
264
264
  "launchPermission"
265
265
  end
@@ -34,7 +34,7 @@ module AWS
34
34
  include TaggedCollection
35
35
  include BlockDeviceMappings
36
36
 
37
- # @private
37
+ # @api private
38
38
  def initialize(options = {})
39
39
  @owners = options[:owners] || []
40
40
  @executable_users = options[:executable_users] || []
@@ -202,13 +202,13 @@ module AWS
202
202
  Image.new(resp.image_id, :config => config)
203
203
  end
204
204
 
205
- # @private
205
+ # @api private
206
206
  protected
207
207
  def member_class
208
208
  Image
209
209
  end
210
210
 
211
- # @private
211
+ # @api private
212
212
  protected
213
213
  def preserved_options
214
214
  super.merge(:owners => @owners, :executable_users => @executable_users)
@@ -172,40 +172,40 @@ module AWS
172
172
  attr_reader :id
173
173
  alias_method :instance_id, :id
174
174
 
175
- # @private
175
+ # @api private
176
176
  def self.reservation_attributes
177
177
  @reservation_attributes ||= {}
178
178
  end
179
179
 
180
- # @private
180
+ # @api private
181
181
  def self.reservation_attribute name, options = {}, &block
182
182
  attr = attribute(name, options, &block)
183
183
  reservation_attributes[attr.name] = attr
184
184
  end
185
185
 
186
- # @private
186
+ # @api private
187
187
  def self.describe_call_attributes
188
188
  @describe_call_attributes ||= {}
189
189
  end
190
190
 
191
- # @private
191
+ # @api private
192
192
  def self.mutable_describe_attributes
193
193
  @mutable_describe_attributes ||= {}
194
194
  end
195
195
 
196
- # @private
196
+ # @api private
197
197
  def self.describe_call_attribute name, options = {}, &block
198
198
  attr = attribute(name, options, &block)
199
199
  describe_call_attributes[attr.name] = attr
200
200
  end
201
201
 
202
- # @private
202
+ # @api private
203
203
  def self.mutable_describe_call_attribute name, options = {}, &block
204
204
  attr = mutable_attribute(name, options, &block)
205
205
  describe_call_attributes[attr.name] = attr
206
206
  end
207
207
 
208
- # @private
208
+ # @api private
209
209
  def self.mutable_describe_attribute name, options = {}, &block
210
210
  attr = mutable_attribute(name, options, &block)
211
211
  mutable_describe_attributes[attr.name] = attr
@@ -297,13 +297,13 @@ module AWS
297
297
  super
298
298
  end
299
299
 
300
- # @private
300
+ # @api private
301
301
  protected
302
302
  def member_class
303
303
  Instance
304
304
  end
305
305
 
306
- # @private
306
+ # @api private
307
307
  private
308
308
  def count_options options
309
309
  min = max = 1
@@ -318,7 +318,7 @@ module AWS
318
318
  { :min_count => min, :max_count => max }
319
319
  end
320
320
 
321
- # @private
321
+ # @api private
322
322
  private
323
323
  def security_group_opts options
324
324
 
@@ -49,7 +49,7 @@ module AWS
49
49
  #
50
50
  class Attachment
51
51
 
52
- # @private
52
+ # @api private
53
53
  def initialize internet_gateway, details
54
54
  @internet_gateway = internet_gateway
55
55
  @vpc = VPC.new(details.vpc_id, :config => internet_gateway.config)
@@ -70,13 +70,13 @@ module AWS
70
70
  nil
71
71
  end
72
72
 
73
- # @private
73
+ # @api private
74
74
  protected
75
75
  def member_class
76
76
  KeyPair
77
77
  end
78
78
 
79
- # @private
79
+ # @api private
80
80
  private
81
81
  def create_or_import client_method, options
82
82
 
@@ -24,7 +24,7 @@ module AWS
24
24
  include Core::Model
25
25
  include Enumerable
26
26
 
27
- # @private
27
+ # @api private
28
28
  def initialize(resource, opts = {})
29
29
  @resource = resource
30
30
  super(opts)
@@ -105,25 +105,25 @@ module AWS
105
105
  client.send(reset_call, reset_params)
106
106
  end
107
107
 
108
- # @private
108
+ # @api private
109
109
  private
110
110
  def describe_call
111
111
  "describe_#{resource_name}_attribute"
112
112
  end
113
113
 
114
- # @private
114
+ # @api private
115
115
  private
116
116
  def modify_call
117
117
  "modify_#{resource_name}_attribute"
118
118
  end
119
119
 
120
- # @private
120
+ # @api private
121
121
  private
122
122
  def reset_call
123
123
  "reset_#{resource_name}_attribute"
124
124
  end
125
125
 
126
- # @private
126
+ # @api private
127
127
  private
128
128
  def describe_params
129
129
  Hash[[["#{resource_name}_id".to_sym, @resource.send(:__resource_id__)],
@@ -131,25 +131,25 @@ module AWS
131
131
  end
132
132
  alias_method :reset_params, :describe_params
133
133
 
134
- # @private
134
+ # @api private
135
135
  private
136
136
  def inflected_permissions_attribute
137
137
  Core::Inflection.ruby_name(permissions_attribute).to_sym
138
138
  end
139
139
 
140
- # @private
140
+ # @api private
141
141
  private
142
142
  def permissions_attribute
143
143
  @resource.__permissions_attribute__
144
144
  end
145
145
 
146
- # @private
146
+ # @api private
147
147
  private
148
148
  def resource_name
149
149
  @resource.send(:inflected_name)
150
150
  end
151
151
 
152
- # @private
152
+ # @api private
153
153
  private
154
154
  def modify(action, *users)
155
155
  return if users.empty?
@@ -161,7 +161,7 @@ module AWS
161
161
  nil
162
162
  end
163
163
 
164
- # @private
164
+ # @api private
165
165
  private
166
166
  def modify_params(modifications)
167
167
  Hash[[["#{resource_name}_id".to_sym, @resource.send(:__resource_id__)],
@@ -39,7 +39,7 @@ module AWS
39
39
  super
40
40
  end
41
41
 
42
- # @private
42
+ # @api private
43
43
  protected
44
44
  def member_class
45
45
  Region
@@ -13,7 +13,7 @@
13
13
 
14
14
  module AWS
15
15
  class EC2
16
- # @private
16
+ # @api private
17
17
  class Request < Core::Http::Request
18
18
  include Core::Signature::Version2
19
19
  end
@@ -14,10 +14,10 @@
14
14
  module AWS
15
15
  class EC2
16
16
 
17
- # @private
17
+ # @api private
18
18
  class Resource < Core::Resource
19
19
 
20
- # @private
20
+ # @api private
21
21
  protected
22
22
  def resource_identifiers
23
23
  [[resource_id_method, send(resource_id_method)]]
@@ -147,7 +147,7 @@ module AWS
147
147
 
148
148
  class << self
149
149
 
150
- # @private
150
+ # @api private
151
151
  protected
152
152
  def describe_call_attribute(name, opts = {}, &blk)
153
153
  attribute(name, opts, &blk)
@@ -27,7 +27,7 @@ module AWS
27
27
  include Core::Model
28
28
  include Enumerable
29
29
 
30
- # @private
30
+ # @api private
31
31
  def initialize(resource, opts = {})
32
32
  @resource = resource
33
33
  super(opts)
@@ -70,7 +70,7 @@ module AWS
70
70
  #
71
71
  class Association
72
72
 
73
- # @private
73
+ # @api private
74
74
  def initialize route_table, association_id, subnet_id
75
75
  @route_table = route_table
76
76
  @association_id = association_id
@@ -330,28 +330,28 @@ module AWS
330
330
  nil
331
331
  end
332
332
 
333
- # @private
333
+ # @api private
334
334
  def <=> other
335
335
  self.id <=> other.id
336
336
  end
337
337
 
338
- # @private
338
+ # @api private
339
339
  def resource_type
340
340
  'security-group'
341
341
  end
342
342
 
343
- # @private
343
+ # @api private
344
344
  def inflected_name
345
345
  "group"
346
346
  end
347
347
 
348
- # @private
348
+ # @api private
349
349
  def self.describe_call_name
350
350
  :describe_security_groups
351
351
  end
352
352
  def describe_call_name; self.class.describe_call_name; end
353
353
 
354
- # @private
354
+ # @api private
355
355
  protected
356
356
  def ingress_opts protocol, ports, sources
357
357
 
@@ -373,7 +373,7 @@ module AWS
373
373
 
374
374
  end
375
375
 
376
- # @private
376
+ # @api private
377
377
  protected
378
378
  def egress_opts args
379
379
  ensure_vpc do
@@ -417,7 +417,7 @@ module AWS
417
417
  end
418
418
  end
419
419
 
420
- # @private
420
+ # @api private
421
421
  protected
422
422
  def parse_sources sources
423
423
 
@@ -464,14 +464,14 @@ module AWS
464
464
 
465
465
  end
466
466
 
467
- # @private
467
+ # @api private
468
468
  protected
469
469
  def ensure_vpc &block
470
470
  raise 'operation permitted for VPC security groups only' unless vpc?
471
471
  yield
472
472
  end
473
473
 
474
- # @private
474
+ # @api private
475
475
  protected
476
476
  def find_in_response(resp)
477
477
  resp.security_group_index[id]
@@ -54,7 +54,7 @@ module AWS
54
54
  include TaggedItem
55
55
  include HasPermissions
56
56
 
57
- # @private
57
+ # @api private
58
58
  def initialize id, options = {}
59
59
  @id = id
60
60
  super(options)
@@ -132,7 +132,7 @@ module AWS
132
132
  Volume.new(volume_id, :config => config) if volume_id
133
133
  end
134
134
 
135
- # @private
135
+ # @api private
136
136
  def __permissions_attribute__
137
137
  "createVolumePermission"
138
138
  end
@@ -35,7 +35,7 @@ module AWS
35
35
 
36
36
  include TaggedCollection
37
37
 
38
- # @private
38
+ # @api private
39
39
  def initialize(options = {})
40
40
  @owners = options[:owners] || []
41
41
  @restorable_by = options[:restorable_by] || []
@@ -113,13 +113,13 @@ module AWS
113
113
  Snapshot.new(resp.snapshot_id, :config => config)
114
114
  end
115
115
 
116
- # @private
116
+ # @api private
117
117
  protected
118
118
  def member_class
119
119
  Snapshot
120
120
  end
121
121
 
122
- # @private
122
+ # @api private
123
123
  protected
124
124
  def preserved_options
125
125
  super.merge(:owners => @owners, :restorable_by => @restorable_by)
@@ -50,12 +50,12 @@ module AWS
50
50
  nil
51
51
  end
52
52
 
53
- # @private
53
+ # @api private
54
54
  def inspect
55
55
  "<#{self.class}:#{local_cache_key}>"
56
56
  end
57
57
 
58
- # @private
58
+ # @api private
59
59
  def local_cache_key
60
60
  response_index_key
61
61
  end
@@ -28,12 +28,12 @@ module AWS
28
28
 
29
29
  include TaggedItem
30
30
 
31
- # @private
31
+ # @api private
32
32
  def tagging_resource_type
33
33
  @resource_type
34
34
  end
35
35
 
36
- # @private
36
+ # @api private
37
37
  # We don't know how to make a describe call for this object yet
38
38
  def cached_tags; nil; end
39
39
 
@@ -96,7 +96,7 @@ module AWS
96
96
  nil
97
97
  end
98
98
 
99
- # @private
99
+ # @api private
100
100
  protected
101
101
  def member_class
102
102
  Tag
@@ -60,7 +60,7 @@ module AWS
60
60
  ResourceTagCollection.new(self, :config => config)
61
61
  end
62
62
 
63
- # @private
63
+ # @api private
64
64
  def cached_tags
65
65
  if cache = AWS.response_cache
66
66
  cache.select(describe_call_name.to_sym).each do |resp|
@@ -75,7 +75,7 @@ module AWS
75
75
  nil
76
76
  end
77
77
 
78
- # @private
78
+ # @api private
79
79
  def tagging_resource_type
80
80
  Core::Inflection.ruby_name(self.class.to_s).tr("_","-")
81
81
  end
@@ -54,7 +54,7 @@ module AWS
54
54
 
55
55
  include TaggedItem
56
56
 
57
- # @private
57
+ # @api private
58
58
  def initialize(id, opts = {})
59
59
  @id = id
60
60
  super(opts)