aws-sdk 1.5.7 → 1.5.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. data/lib/aws.rb +2 -0
  2. data/lib/aws/api_config/EMR-2009-03-31.yml +349 -0
  3. data/lib/aws/auto_scaling.rb +8 -8
  4. data/lib/aws/auto_scaling/group.rb +2 -2
  5. data/lib/aws/auto_scaling/instance.rb +1 -1
  6. data/lib/aws/auto_scaling/launch_configuration.rb +4 -4
  7. data/lib/aws/auto_scaling/launch_configuration_collection.rb +11 -11
  8. data/lib/aws/auto_scaling/scaling_policy.rb +1 -1
  9. data/lib/aws/auto_scaling/scheduled_action.rb +1 -1
  10. data/lib/aws/auto_scaling/tag.rb +3 -3
  11. data/lib/aws/cloud_formation/stack.rb +7 -7
  12. data/lib/aws/cloud_formation/stack_collection.rb +13 -13
  13. data/lib/aws/cloud_formation/stack_event_collection.rb +2 -2
  14. data/lib/aws/cloud_formation/stack_resource.rb +1 -1
  15. data/lib/aws/cloud_formation/stack_resource_summary_collection.rb +10 -18
  16. data/lib/aws/cloud_formation/stack_summary_collection.rb +12 -16
  17. data/lib/aws/core.rb +7 -1
  18. data/lib/aws/core/collection.rb +12 -12
  19. data/lib/aws/core/configuration.rb +4 -0
  20. data/lib/aws/core/credential_providers.rb +23 -23
  21. data/lib/aws/core/inflection.rb +2 -0
  22. data/lib/aws/core/model.rb +6 -6
  23. data/lib/aws/core/policy.rb +102 -102
  24. data/lib/aws/core/resource.rb +81 -80
  25. data/lib/aws/core/response.rb +23 -23
  26. data/lib/aws/core/xml/frame.rb +4 -2
  27. data/lib/aws/dynamo_db/resource.rb +2 -2
  28. data/lib/aws/dynamo_db/table.rb +5 -5
  29. data/lib/aws/ec2/availability_zone.rb +2 -3
  30. data/lib/aws/ec2/export_task.rb +7 -7
  31. data/lib/aws/ec2/image.rb +5 -5
  32. data/lib/aws/ec2/instance.rb +40 -40
  33. data/lib/aws/ec2/instance_collection.rb +5 -2
  34. data/lib/aws/ec2/key_pair.rb +1 -1
  35. data/lib/aws/ec2/network_acl.rb +1 -1
  36. data/lib/aws/ec2/network_interface.rb +2 -2
  37. data/lib/aws/ec2/region.rb +1 -1
  38. data/lib/aws/ec2/resource.rb +1 -1
  39. data/lib/aws/ec2/route_table.rb +1 -1
  40. data/lib/aws/ec2/security_group.rb +4 -4
  41. data/lib/aws/ec2/subnet.rb +1 -1
  42. data/lib/aws/ec2/volume.rb +1 -1
  43. data/lib/aws/ec2/vpn_connection.rb +1 -1
  44. data/lib/aws/ec2/vpn_gateway.rb +2 -2
  45. data/lib/aws/elb/listener_opts.rb +1 -1
  46. data/lib/aws/elb/load_balancer.rb +5 -5
  47. data/lib/aws/elb/load_balancer_collection.rb +17 -9
  48. data/lib/aws/elb/load_balancer_policy.rb +2 -2
  49. data/lib/aws/emr.rb +84 -0
  50. data/lib/aws/emr/client.rb +309 -0
  51. data/lib/aws/emr/config.rb +18 -0
  52. data/lib/aws/emr/errors.rb +22 -0
  53. data/lib/aws/emr/instance_group.rb +138 -0
  54. data/lib/aws/emr/instance_group_collection.rb +82 -0
  55. data/lib/aws/emr/job_flow.rb +296 -0
  56. data/lib/aws/emr/job_flow_collection.rb +185 -0
  57. data/lib/aws/emr/request.rb +23 -0
  58. data/lib/aws/iam/access_key.rb +1 -1
  59. data/lib/aws/iam/account_alias_collection.rb +2 -2
  60. data/lib/aws/iam/client.rb +1 -1
  61. data/lib/aws/iam/group.rb +2 -2
  62. data/lib/aws/iam/policy_collection.rb +1 -1
  63. data/lib/aws/iam/server_certificate.rb +2 -2
  64. data/lib/aws/iam/signing_certificate.rb +1 -1
  65. data/lib/aws/iam/user.rb +2 -2
  66. data/lib/aws/iam/virtual_mfa_device.rb +1 -1
  67. data/lib/aws/s3/client.rb +57 -55
  68. data/lib/aws/s3/config.rb +2 -0
  69. data/lib/aws/s3/request.rb +14 -6
  70. data/lib/aws/simple_email_service/identity.rb +9 -7
  71. data/lib/aws/simple_workflow/domain.rb +1 -1
  72. data/lib/aws/simple_workflow/resource.rb +2 -2
  73. data/lib/aws/simple_workflow/workflow_execution.rb +5 -5
  74. data/lib/aws/sns/subscription_collection.rb +33 -35
  75. data/lib/aws/sns/topic_collection.rb +13 -18
  76. data/lib/aws/sns/topic_subscription_collection.rb +8 -9
  77. data/lib/aws/sqs/queue.rb +4 -4
  78. data/lib/aws/sqs/queue_collection.rb +17 -13
  79. metadata +13 -4
  80. data/lib/aws/cloud_formation/stack_summary.rb +0 -71
data/lib/aws.rb CHANGED
@@ -18,6 +18,7 @@ require 'aws/cloud_formation/config'
18
18
  require 'aws/cloud_watch/config'
19
19
  require 'aws/dynamo_db/config'
20
20
  require 'aws/ec2/config'
21
+ require 'aws/emr/config'
21
22
  require 'aws/elb/config'
22
23
  require 'aws/iam/config'
23
24
  require 'aws/s3/config'
@@ -35,6 +36,7 @@ module AWS
35
36
  autoload :CloudWatch, 'cloud_watch'
36
37
  autoload :DynamoDB, 'dynamo_db'
37
38
  autoload :EC2, 'ec2'
39
+ autoload :EMR, 'emr'
38
40
  autoload :ELB, 'elb'
39
41
  autoload :IAM, 'iam'
40
42
  autoload :S3, 's3'
@@ -0,0 +1,349 @@
1
+ # Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
2
+ #
3
+ # Licensed under the Apache License, Version 2.0 (the "License"). You
4
+ # may not use this file except in compliance with the License. A copy of
5
+ # the License is located at
6
+ #
7
+ # http://aws.amazon.com/apache2.0/
8
+ #
9
+ # or in the "license" file accompanying this file. This file is
10
+ # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11
+ # ANY KIND, either express or implied. See the License for the specific
12
+ # language governing permissions and limitations under the License.
13
+
14
+ ---
15
+ :operations:
16
+ - :name: AddInstanceGroups
17
+ :method: :add_instance_groups
18
+ :inputs:
19
+ InstanceGroups:
20
+ - :membered_list:
21
+ - :structure:
22
+ Name:
23
+ - :string
24
+ Market:
25
+ - :string
26
+ InstanceRole:
27
+ - :string
28
+ - :required
29
+ BidPrice:
30
+ - :string
31
+ InstanceType:
32
+ - :string
33
+ - :required
34
+ InstanceCount:
35
+ - :integer
36
+ - :required
37
+ - :required
38
+ JobFlowId:
39
+ - :string
40
+ - :required
41
+ :outputs:
42
+ :children:
43
+ AddInstanceGroupsResult:
44
+ :ignore: true
45
+ :children:
46
+ InstanceGroupIds:
47
+ :ignore: true
48
+ :children:
49
+ member:
50
+ :rename: :instance_group_ids
51
+ :list: true
52
+ - :name: AddJobFlowSteps
53
+ :method: :add_job_flow_steps
54
+ :inputs:
55
+ JobFlowId:
56
+ - :string
57
+ - :required
58
+ Steps:
59
+ - :membered_list:
60
+ - :structure:
61
+ Name:
62
+ - :string
63
+ - :required
64
+ ActionOnFailure:
65
+ - :string
66
+ HadoopJarStep:
67
+ - :structure:
68
+ Properties:
69
+ - :membered_list:
70
+ - :structure:
71
+ Key:
72
+ - :string
73
+ Value:
74
+ - :string
75
+ Jar:
76
+ - :string
77
+ - :required
78
+ MainClass:
79
+ - :string
80
+ Args:
81
+ - :membered_list:
82
+ - :string
83
+ - :required
84
+ - :required
85
+ :outputs:
86
+ :children:
87
+ AddJobFlowStepsResult:
88
+ :ignore: true
89
+ - :name: DescribeJobFlows
90
+ :method: :describe_job_flows
91
+ :inputs:
92
+ CreatedAfter:
93
+ - :timestamp
94
+ CreatedBefore:
95
+ - :timestamp
96
+ JobFlowIds:
97
+ - :membered_list:
98
+ - :string
99
+ JobFlowStates:
100
+ - :membered_list:
101
+ - :string
102
+ :outputs:
103
+ :children:
104
+ DescribeJobFlowsResult:
105
+ :ignore: true
106
+ :children:
107
+ JobFlows:
108
+ :ignore: true
109
+ :children:
110
+ member:
111
+ :rename: :job_flows
112
+ :list: true
113
+ :children:
114
+ ExecutionStatusDetail:
115
+ :children:
116
+ CreationDateTime:
117
+ :type: :time
118
+ StartDateTime:
119
+ :type: :time
120
+ ReadyDateTime:
121
+ :type: :time
122
+ EndDateTime:
123
+ :type: :time
124
+ Instances:
125
+ :children:
126
+ InstanceCount:
127
+ :type: :integer
128
+ InstanceGroups:
129
+ :ignore: true
130
+ :children:
131
+ member:
132
+ :rename: :instance_groups
133
+ :list: true
134
+ :children:
135
+ InstanceRequestCount:
136
+ :type: :integer
137
+ InstanceRunningCount:
138
+ :type: :integer
139
+ CreationDateTime:
140
+ :type: :time
141
+ StartDateTime:
142
+ :type: :time
143
+ ReadyDateTime:
144
+ :type: :time
145
+ EndDateTime:
146
+ :type: :time
147
+ NormalizedInstanceHours:
148
+ :type: :integer
149
+ KeepJobFlowAliveWhenNoSteps:
150
+ :type: :boolean
151
+ TerminationProtected:
152
+ :type: :boolean
153
+ Steps:
154
+ :ignore: true
155
+ :children:
156
+ member:
157
+ :rename: :steps
158
+ :list: true
159
+ :children:
160
+ StepConfig:
161
+ :children:
162
+ HadoopJarStep:
163
+ :children:
164
+ Properties:
165
+ :ignore: true
166
+ :children:
167
+ member:
168
+ :rename: :properties
169
+ :list: true
170
+ Args:
171
+ :ignore: true
172
+ :children:
173
+ member:
174
+ :rename: :args
175
+ :list: true
176
+ ExecutionStatusDetail:
177
+ :children:
178
+ CreationDateTime:
179
+ :type: :time
180
+ StartDateTime:
181
+ :type: :time
182
+ EndDateTime:
183
+ :type: :time
184
+ BootstrapActions:
185
+ :ignore: true
186
+ :children:
187
+ member:
188
+ :rename: :bootstrap_actions
189
+ :list: true
190
+ :children:
191
+ BootstrapActionConfig:
192
+ :children:
193
+ ScriptBootstrapAction:
194
+ :children:
195
+ Args:
196
+ :ignore: true
197
+ :children:
198
+ member:
199
+ :rename: :args
200
+ :list: true
201
+ SupportedProducts:
202
+ :ignore: true
203
+ :children:
204
+ member:
205
+ :rename: :supported_products
206
+ :list: true
207
+ - :name: ModifyInstanceGroups
208
+ :method: :modify_instance_groups
209
+ :inputs:
210
+ InstanceGroups:
211
+ - :membered_list:
212
+ - :structure:
213
+ InstanceGroupId:
214
+ - :string
215
+ - :required
216
+ InstanceCount:
217
+ - :integer
218
+ - :required
219
+ :outputs:
220
+ :children:
221
+ ModifyInstanceGroupsResult:
222
+ :ignore: true
223
+ - :name: RunJobFlow
224
+ :method: :run_job_flow
225
+ :inputs:
226
+ Name:
227
+ - :string
228
+ - :required
229
+ LogUri:
230
+ - :string
231
+ AdditionalInfo:
232
+ - :string
233
+ AmiVersion:
234
+ - :string
235
+ Instances:
236
+ - :structure:
237
+ MasterInstanceType:
238
+ - :string
239
+ SlaveInstanceType:
240
+ - :string
241
+ InstanceCount:
242
+ - :integer
243
+ InstanceGroups:
244
+ - :membered_list:
245
+ - :structure:
246
+ Name:
247
+ - :string
248
+ Market:
249
+ - :string
250
+ InstanceRole:
251
+ - :string
252
+ - :required
253
+ BidPrice:
254
+ - :string
255
+ InstanceType:
256
+ - :string
257
+ - :required
258
+ InstanceCount:
259
+ - :integer
260
+ - :required
261
+ Ec2KeyName:
262
+ - :string
263
+ Placement:
264
+ - :structure:
265
+ AvailabilityZone:
266
+ - :string
267
+ - :required
268
+ KeepJobFlowAliveWhenNoSteps:
269
+ - :boolean
270
+ TerminationProtected:
271
+ - :boolean
272
+ HadoopVersion:
273
+ - :string
274
+ Ec2SubnetId:
275
+ - :string
276
+ - :required
277
+ Steps:
278
+ - :membered_list:
279
+ - :structure:
280
+ Name:
281
+ - :string
282
+ - :required
283
+ ActionOnFailure:
284
+ - :string
285
+ HadoopJarStep:
286
+ - :structure:
287
+ Properties:
288
+ - :membered_list:
289
+ - :structure:
290
+ Key:
291
+ - :string
292
+ Value:
293
+ - :string
294
+ Jar:
295
+ - :string
296
+ - :required
297
+ MainClass:
298
+ - :string
299
+ Args:
300
+ - :membered_list:
301
+ - :string
302
+ - :required
303
+ BootstrapActions:
304
+ - :membered_list:
305
+ - :structure:
306
+ Name:
307
+ - :string
308
+ - :required
309
+ ScriptBootstrapAction:
310
+ - :structure:
311
+ Path:
312
+ - :string
313
+ - :required
314
+ Args:
315
+ - :membered_list:
316
+ - :string
317
+ - :required
318
+ SupportedProducts:
319
+ - :membered_list:
320
+ - :string
321
+ :outputs:
322
+ :children:
323
+ RunJobFlowResult:
324
+ :ignore: true
325
+ - :name: SetTerminationProtection
326
+ :method: :set_termination_protection
327
+ :inputs:
328
+ JobFlowIds:
329
+ - :membered_list:
330
+ - :string
331
+ - :required
332
+ TerminationProtected:
333
+ - :boolean
334
+ - :required
335
+ :outputs:
336
+ :children:
337
+ SetTerminationProtectionResult:
338
+ :ignore: true
339
+ - :name: TerminateJobFlows
340
+ :method: :terminate_job_flows
341
+ :inputs:
342
+ JobFlowIds:
343
+ - :membered_list:
344
+ - :string
345
+ - :required
346
+ :outputs:
347
+ :children:
348
+ TerminateJobFlowsResult:
349
+ :ignore: true
@@ -18,7 +18,7 @@ module AWS
18
18
 
19
19
  # This class is the starting point for working with Auto Scaling.
20
20
  #
21
- # To use Auto Scaling you must first
21
+ # To use Auto Scaling you must first
22
22
  # {sign up here}[http://aws.amazon.com/autoscaling/].
23
23
  #
24
24
  # For more information about Auto Scaling:
@@ -28,13 +28,13 @@ module AWS
28
28
  #
29
29
  # = Credentials
30
30
  #
31
- # You can setup default credentials for all AWS services via
31
+ # You can setup default credentials for all AWS services via
32
32
  # AWS.config:
33
33
  #
34
34
  # AWS.config(
35
35
  # :access_key_id => 'YOUR_ACCESS_KEY_ID',
36
36
  # :secret_access_key => 'YOUR_SECRET_ACCESS_KEY')
37
- #
37
+ #
38
38
  # Or you can set them directly on the AWS::AutoSclaing interface:
39
39
  #
40
40
  # auto_scaling = AWS::AutoScaling.new(
@@ -48,9 +48,9 @@ module AWS
48
48
  #
49
49
  # # needs a name, image id, and instance type
50
50
  # launch_config = auto_scaling.launch_configurations.create(
51
- # 'launch-config-name', 'ami-12345', 'm1-small')
51
+ # 'launch-config-name', 'ami-12345', 'm1.small')
52
52
  #
53
- # If you have previously created a launch configuration you can
53
+ # If you have previously created a launch configuration you can
54
54
  # reference using the {LaunchConfigurationCollection}.
55
55
  #
56
56
  # launch_config = auto_scaling.launch_configurations['launch-config-name']
@@ -59,9 +59,9 @@ module AWS
59
59
  #
60
60
  # Given a launch configuration, you can now create an Auto Scaling {Group}.
61
61
  #
62
- # group = auto_scaling.groups.create('group-name',
62
+ # group = auto_scaling.groups.create('group-name',
63
63
  # :launch_configuration => launch_config,
64
- # :availability_zones => %(us-east-1a us-east-1b),
64
+ # :availability_zones => %w(us-east-1a us-east-1b),
65
65
  # :min_size => 1,
66
66
  # :max_size => 4)
67
67
  #
@@ -130,7 +130,7 @@ module AWS
130
130
  ScheduledActionCollection.new(:config => config)
131
131
  end
132
132
 
133
- # Returns a list of all notification types that are supported by
133
+ # Returns a list of all notification types that are supported by
134
134
  # Auto Scaling.
135
135
  # @return [Array<String>]
136
136
  def notification_types
@@ -60,7 +60,7 @@ module AWS
60
60
 
61
61
  alias_method :arn, :auto_scaling_group_arn
62
62
 
63
- attribute :availability_zone_names, :as => :availability_zones
63
+ attribute :availability_zone_names, :from => :availability_zones
64
64
 
65
65
  attribute :created_time, :static => true
66
66
 
@@ -102,7 +102,7 @@ module AWS
102
102
  end
103
103
  end
104
104
 
105
- attribute :tag_details, :as => :tags
105
+ attribute :tag_details, :from => :tags
106
106
 
107
107
  protected :tag_details
108
108
 
@@ -71,7 +71,7 @@ module AWS
71
71
  attribute :auto_scaling_group_name, :static => true
72
72
 
73
73
  attribute :availability_zone_name,
74
- :as => :availability_zone,
74
+ :from => :availability_zone,
75
75
  :static => true
76
76
 
77
77
  attribute :health_status
@@ -49,7 +49,7 @@ module AWS
49
49
  super(options.merge(:name => name))
50
50
  end
51
51
 
52
- attribute :name, :as => :launch_configuration_name, :static => true
52
+ attribute :name, :from => :launch_configuration_name, :static => true
53
53
 
54
54
  attribute :created_time, :static => true
55
55
 
@@ -58,7 +58,7 @@ module AWS
58
58
  attribute :image_id, :static => true
59
59
 
60
60
  attribute :detailed_instance_monitoring,
61
- :as => :instance_monitoring,
61
+ :from => :instance_monitoring,
62
62
  :static => true do
63
63
  translates_output {|value| value[:enabled] }
64
64
  end
@@ -71,7 +71,7 @@ module AWS
71
71
 
72
72
  attribute :key_name, :static => true
73
73
 
74
- attribute :arn, :as => :launch_configuration_arn, :static => true
74
+ attribute :arn, :from => :launch_configuration_arn, :static => true
75
75
 
76
76
  attribute :ramdisk_id, :static => true
77
77
 
@@ -89,7 +89,7 @@ module AWS
89
89
  end
90
90
 
91
91
  attribute :security_group_details,
92
- :as => :security_groups,
92
+ :from => :security_groups,
93
93
  :static => true
94
94
 
95
95
  protected :security_group_details