aws-sdk 1.8.3.1 → 1.8.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (43) hide show
  1. data/.yardopts +3 -2
  2. data/ca-bundle.crt +566 -2
  3. data/lib/aws/api_config/CloudFormation-2010-05-15.yml +10 -0
  4. data/lib/aws/api_config/{EC2-2012-12-01.yml → EC2-2013-02-01.yml} +105 -15
  5. data/lib/aws/auto_scaling.rb +2 -0
  6. data/lib/aws/auto_scaling/scaling_policy.rb +2 -2
  7. data/lib/aws/auto_scaling/scaling_policy_options.rb +2 -1
  8. data/lib/aws/cloud_formation.rb +2 -0
  9. data/lib/aws/cloud_formation/client.rb +23 -11
  10. data/lib/aws/cloud_front.rb +2 -0
  11. data/lib/aws/cloud_search.rb +2 -0
  12. data/lib/aws/cloud_watch.rb +2 -0
  13. data/lib/aws/core.rb +1 -1
  14. data/lib/aws/core/client.rb +15 -0
  15. data/lib/aws/data_pipeline.rb +2 -0
  16. data/lib/aws/dynamo_db.rb +3 -11
  17. data/lib/aws/ec2.rb +2 -0
  18. data/lib/aws/ec2/client.rb +77 -12
  19. data/lib/aws/elastic_beanstalk.rb +2 -0
  20. data/lib/aws/elasticache.rb +2 -0
  21. data/lib/aws/elb.rb +2 -0
  22. data/lib/aws/emr.rb +2 -0
  23. data/lib/aws/glacier.rb +2 -0
  24. data/lib/aws/iam.rb +2 -0
  25. data/lib/aws/import_export.rb +2 -0
  26. data/lib/aws/rds.rb +2 -0
  27. data/lib/aws/record/abstract_base.rb +1 -1
  28. data/lib/aws/route_53.rb +2 -0
  29. data/lib/aws/route_53/hosted_zone.rb +1 -1
  30. data/lib/aws/route_53/resource_record_set.rb +12 -8
  31. data/lib/aws/s3/bucket.rb +1 -1
  32. data/lib/aws/s3/client.rb +4 -0
  33. data/lib/aws/s3/cors_rule_collection.rb +1 -1
  34. data/lib/aws/simple_db.rb +2 -0
  35. data/lib/aws/simple_email_service.rb +2 -0
  36. data/lib/aws/simple_workflow.rb +2 -0
  37. data/lib/aws/sns.rb +2 -0
  38. data/lib/aws/sqs.rb +2 -0
  39. data/lib/aws/sqs/request.rb +16 -0
  40. data/lib/aws/storage_gateway.rb +2 -0
  41. data/lib/aws/sts.rb +2 -0
  42. data/lib/aws/version.rb +1 -1
  43. metadata +4 -4
@@ -14,6 +14,16 @@
14
14
  ---
15
15
  :api_version: '2010-05-15'
16
16
  :operations:
17
+ - :name: CancelUpdateStack
18
+ :method: :cancel_update_stack
19
+ :inputs:
20
+ StackName:
21
+ - :string
22
+ - :required
23
+ :outputs:
24
+ :children:
25
+ CancelUpdateStackResult:
26
+ :ignore: true
17
27
  - :name: CreateStack
18
28
  :method: :create_stack
19
29
  :inputs:
@@ -12,7 +12,7 @@
12
12
  # language governing permissions and limitations under the License.
13
13
 
14
14
  ---
15
- :api_version: '2012-12-01'
15
+ :api_version: '2013-02-01'
16
16
  :operations:
17
17
  - :name: ActivateLicense
18
18
  :method: :activate_license
@@ -371,6 +371,23 @@
371
371
  - :string
372
372
  - :required
373
373
  :outputs: {}
374
+ - :name: CopyImage
375
+ :method: :copy_image
376
+ :inputs:
377
+ SourceRegion:
378
+ - :string
379
+ - :required
380
+ SourceImageId:
381
+ - :string
382
+ - :required
383
+ Name:
384
+ - :string
385
+ - :required
386
+ Description:
387
+ - :string
388
+ ClientToken:
389
+ - :string
390
+ :outputs: {}
374
391
  - :name: CopySnapshot
375
392
  :method: :copy_snapshot
376
393
  :inputs:
@@ -799,12 +816,6 @@
799
816
  item:
800
817
  :rename: :propagating_vgw_set
801
818
  :list: true
802
- propagatedRouteSet:
803
- :ignore: true
804
- :children:
805
- item:
806
- :rename: :propagated_route_set
807
- :list: true
808
819
  - :name: CreateSecurityGroup
809
820
  :method: :create_security_group
810
821
  :inputs:
@@ -864,6 +875,10 @@
864
875
  :children:
865
876
  availableIpAddressCount:
866
877
  :type: :integer
878
+ defaultForAz:
879
+ :type: :boolean
880
+ mapPublicIpOnLaunch:
881
+ :type: :boolean
867
882
  tagSet:
868
883
  :ignore: true
869
884
  :children:
@@ -945,6 +960,8 @@
945
960
  item:
946
961
  :rename: :tag_set
947
962
  :list: true
963
+ isDefault:
964
+ :type: :boolean
948
965
  - :name: CreateVpnConnection
949
966
  :method: :create_vpn_connection
950
967
  :inputs:
@@ -1205,6 +1222,28 @@
1205
1222
  - :string
1206
1223
  - :required
1207
1224
  :outputs: {}
1225
+ - :name: DescribeAccountAttributes
1226
+ :method: :describe_account_attributes
1227
+ :inputs:
1228
+ AttributeName:
1229
+ - :list:
1230
+ - :string
1231
+ - :rename: attributeNames
1232
+ :outputs:
1233
+ :children:
1234
+ accountAttributeSet:
1235
+ :ignore: true
1236
+ :children:
1237
+ item:
1238
+ :rename: :account_attribute_set
1239
+ :list: true
1240
+ :children:
1241
+ attributeValueSet:
1242
+ :ignore: true
1243
+ :children:
1244
+ item:
1245
+ :rename: :attribute_value_set
1246
+ :list: true
1208
1247
  - :name: DescribeAddresses
1209
1248
  :method: :describe_addresses
1210
1249
  :inputs:
@@ -1770,6 +1809,15 @@
1770
1809
  :type: :time
1771
1810
  deleteOnTermination:
1772
1811
  :type: :boolean
1812
+ privateIpAddressesSet:
1813
+ :ignore: true
1814
+ :children:
1815
+ item:
1816
+ :rename: :private_ip_addresses_set
1817
+ :list: true
1818
+ :children:
1819
+ primary:
1820
+ :type: :boolean
1773
1821
  ebsOptimized:
1774
1822
  :type: :boolean
1775
1823
  :index:
@@ -2330,12 +2378,6 @@
2330
2378
  item:
2331
2379
  :rename: :propagating_vgw_set
2332
2380
  :list: true
2333
- propagatedRouteSet:
2334
- :ignore: true
2335
- :children:
2336
- item:
2337
- :rename: :propagated_route_set
2338
- :list: true
2339
2381
  - :name: DescribeSecurityGroups
2340
2382
  :method: :describe_security_groups
2341
2383
  :inputs:
@@ -2662,6 +2704,10 @@
2662
2704
  :children:
2663
2705
  availableIpAddressCount:
2664
2706
  :type: :integer
2707
+ defaultForAz:
2708
+ :type: :boolean
2709
+ mapPublicIpOnLaunch:
2710
+ :type: :boolean
2665
2711
  tagSet:
2666
2712
  :ignore: true
2667
2713
  :children:
@@ -2822,6 +2868,26 @@
2822
2868
  :index:
2823
2869
  :key: :volume_id
2824
2870
  :name: :volume_index
2871
+ - :name: DescribeVpcAttribute
2872
+ :method: :describe_vpc_attribute
2873
+ :inputs:
2874
+ VpcId:
2875
+ - :string
2876
+ - :required
2877
+ EnableDnsSupport:
2878
+ - :string
2879
+ EnableDnsHostnames:
2880
+ - :string
2881
+ :outputs:
2882
+ :children:
2883
+ enableDnsSupport:
2884
+ :children:
2885
+ value:
2886
+ :type: :boolean
2887
+ enableDnsHostnames:
2888
+ :children:
2889
+ value:
2890
+ :type: :boolean
2825
2891
  - :name: DescribeVpcs
2826
2892
  :method: :describe_vpcs
2827
2893
  :inputs:
@@ -2854,6 +2920,8 @@
2854
2920
  item:
2855
2921
  :rename: :tag_set
2856
2922
  :list: true
2923
+ isDefault:
2924
+ :type: :boolean
2857
2925
  - :name: DescribeVpnConnections
2858
2926
  :method: :describe_vpn_connections
2859
2927
  :inputs:
@@ -3445,6 +3513,21 @@
3445
3513
  AutoEnableIO:
3446
3514
  - :boolean
3447
3515
  :outputs: {}
3516
+ - :name: ModifyVpcAttribute
3517
+ :method: :modify_vpc_attribute
3518
+ :inputs:
3519
+ VpcId:
3520
+ - :string
3521
+ - :rename: VpcId
3522
+ EnableDnsSupport:
3523
+ - :structure:
3524
+ Value:
3525
+ - :boolean
3526
+ EnableDnsHostnames:
3527
+ - :structure:
3528
+ Value:
3529
+ - :boolean
3530
+ :outputs: {}
3448
3531
  - :name: MonitorInstances
3449
3532
  :method: :monitor_instances
3450
3533
  :inputs:
@@ -3988,8 +4071,6 @@
3988
4071
  - :rename: SecurityGroupIds
3989
4072
  UserData:
3990
4073
  - :string
3991
- AddressingType:
3992
- - :string
3993
4074
  InstanceType:
3994
4075
  - :string
3995
4076
  Placement:
@@ -4168,6 +4249,15 @@
4168
4249
  :type: :time
4169
4250
  deleteOnTermination:
4170
4251
  :type: :boolean
4252
+ privateIpAddressesSet:
4253
+ :ignore: true
4254
+ :children:
4255
+ item:
4256
+ :rename: :private_ip_addresses_set
4257
+ :list: true
4258
+ :children:
4259
+ primary:
4260
+ :type: :boolean
4171
4261
  ebsOptimized:
4172
4262
  :type: :boolean
4173
4263
  - :name: StartInstances
@@ -65,6 +65,8 @@ module AWS
65
65
  # :min_size => 1,
66
66
  # :max_size => 4)
67
67
  #
68
+ # @!attribute [r] client
69
+ # @return [Client] the low-level AutoScaling client object
68
70
  class AutoScaling
69
71
 
70
72
  AWS.register_autoloads(self, 'aws/auto_scaling') do
@@ -26,7 +26,7 @@ module AWS
26
26
  #
27
27
  # @attr_reader [Integer] cooldown
28
28
  #
29
- # @attr_reader [Integer] min_adjustment_magnitude
29
+ # @attr_reader [Integer] min_adjustment_step
30
30
  #
31
31
  class ScalingPolicy < Core::Resource
32
32
 
@@ -63,7 +63,7 @@ module AWS
63
63
 
64
64
  attribute :cooldown
65
65
 
66
- attribute :min_adjustment_magintude
66
+ attribute :min_adjustment_step
67
67
 
68
68
  populates_from(:describe_policies) do |resp|
69
69
  resp.scaling_policies.find do |p|
@@ -40,7 +40,7 @@ module AWS
40
40
  # after a scaling activity completes before any further
41
41
  # trigger-related scaling activities can start.
42
42
  #
43
- # @option options [Integer] :min_adjustment_magnitude
43
+ # @option options [Integer] :min_adjustment_step
44
44
  #
45
45
  # @return [Hash]
46
46
  #
@@ -52,6 +52,7 @@ module AWS
52
52
  :cooldown,
53
53
  :adjustment_type,
54
54
  :scaling_adjustment,
55
+ :min_adjustment_step,
55
56
  ].each do |opt|
56
57
  opts[opt] = options[opt] if options.key?(opt)
57
58
  end
@@ -141,6 +141,8 @@ module AWS
141
141
  # # ...
142
142
  # end
143
143
  #
144
+ # @!attribute [r] client
145
+ # @return [Client] the low-level CloudFormation client object
144
146
  class CloudFormation
145
147
 
146
148
  AWS.register_autoloads(self, 'aws/cloud_formation') do
@@ -35,6 +35,13 @@ module AWS
35
35
 
36
36
  # client methods #
37
37
 
38
+ # @!method cancel_update_stack(options = {})
39
+ # Calls the CancelUpdateStack API operation.
40
+ # @param [Hash] options
41
+ # * +:stack_name+ - *required* - (String) The name or the unique
42
+ # identifier associated with the stack.
43
+ # @return [Core::Response]
44
+
38
45
  # @!method create_stack(options = {})
39
46
  # Calls the CreateStack API operation.
40
47
  # @param [Hash] options
@@ -48,10 +55,11 @@ module AWS
48
55
  # Conditional: You must pass TemplateBody or TemplateURL. If both are
49
56
  # passed, only TemplateBody is used.
50
57
  # * +:template_url+ - (String) Location of file containing the template
51
- # body. The URL must point to a template located in an S3 bucket in
52
- # the same region as the stack. For more information, go to the AWS
53
- # CloudFormation User Guide. Conditional: You must pass TemplateURL
54
- # or TemplateBody. If both are passed, only TemplateBody is used.
58
+ # body. The URL must point to a template (max size: 307,200 bytes)
59
+ # located in an S3 bucket in the same region as the stack. For more
60
+ # information, go to the AWS CloudFormation User Guide. Conditional:
61
+ # You must pass TemplateURL or TemplateBody. If both are passed, only
62
+ # TemplateBody is used.
55
63
  # * +:parameters+ - (Array<Hash>) A list of Parameter structures that
56
64
  # specify input parameters for the stack.
57
65
  # * +:parameter_key+ - (String) The key associated with the
@@ -154,7 +162,9 @@ module AWS
154
162
  # Calls the DescribeStackResources API operation.
155
163
  # @param [Hash] options
156
164
  # * +:stack_name+ - (String) The name or the unique identifier
157
- # associated with the stack. Default: There is no default value.
165
+ # associated with the stack. Required: Conditional. If you do not
166
+ # specify StackName, you must specify PhysicalResourceId. Default:
167
+ # There is no default value.
158
168
  # * +:logical_resource_id+ - (String) The logical name of the resource
159
169
  # as specified in the template. Default: There is no default value.
160
170
  # * +:physical_resource_id+ - (String) The name or unique identifier
@@ -163,8 +173,9 @@ module AWS
163
173
  # Cloud (EC2) instance, PhysicalResourceId corresponds to the
164
174
  # InstanceId. You can pass the EC2 InstanceId to
165
175
  # DescribeStackResources to find which stack the instance belongs to
166
- # and what other resources are part of the stack. Default: There is
167
- # no default value.
176
+ # and what other resources are part of the stack. Required:
177
+ # Conditional. If you do not specify PhysicalResourceId, you must
178
+ # specify StackName. Default: There is no default value.
168
179
  # @return [Core::Response]
169
180
  # The #data method of the response object returns
170
181
  # a hash with the following structure:
@@ -332,10 +343,11 @@ module AWS
332
343
  # Conditional: You must pass TemplateURL or TemplateBody. If both are
333
344
  # passed, only TemplateBody is used.
334
345
  # * +:template_url+ - (String) Location of file containing the template
335
- # body. The URL must point to a template located in an S3 bucket in
336
- # the same region as the stack. For more information, go to the AWS
337
- # CloudFormation User Guide. Conditional: You must pass TemplateURL
338
- # or TemplateBody. If both are passed, only TemplateBody is used.
346
+ # body. The URL must point to a template (max size: 307,200 bytes)
347
+ # located in an S3 bucket in the same region as the stack. For more
348
+ # information, go to the AWS CloudFormation User Guide. Conditional:
349
+ # You must pass TemplateURL or TemplateBody. If both are passed, only
350
+ # TemplateBody is used.
339
351
  # @return [Core::Response]
340
352
  # The #data method of the response object returns
341
353
  # a hash with the following structure:
@@ -57,6 +57,8 @@ module AWS
57
57
  #
58
58
  # See {Client} for documentation on all of the supported operations.
59
59
  #
60
+ # @!attribute [r] client
61
+ # @return [Client] the low-level CloudFront client object
60
62
  class CloudFront
61
63
 
62
64
  AWS.register_autoloads(self, 'aws/cloud_front') do
@@ -57,6 +57,8 @@ module AWS
57
57
  #
58
58
  # See {Client} for documentation on all of the supported operations.
59
59
  #
60
+ # @!attribute [r] client
61
+ # @return [Client] the low-level CloudSearch client object
60
62
  class CloudSearch
61
63
 
62
64
  AWS.register_autoloads(self, 'aws/cloud_search') do
@@ -57,6 +57,8 @@ module AWS
57
57
  #
58
58
  # See {Client} for documentation on all of the supported operations.
59
59
  #
60
+ # @!attribute [r] client
61
+ # @return [Client] the low-level CloudWatch client object
60
62
  class CloudWatch
61
63
 
62
64
  AWS.register_autoloads(self, 'aws/cloud_watch') do
@@ -256,7 +256,7 @@ module AWS
256
256
  # @option options [String] :elastic_beanstalk_endpoint ('elasticbeanstalk.us-east-1.amazonaws.com')
257
257
  # The service endpoint for AWS Elastic Beanstalk.
258
258
  #
259
- # @option options [String] :elastic_transcoder_endpoint ('elastictranscoderbeanstalk.us-east-1.amazonaws.com')
259
+ # @option options [String] :elastic_transcoder_endpoint ('elastictranscoder.us-east-1.amazonaws.com')
260
260
  # The service endpoint for Elastic Transcoder.
261
261
  #
262
262
  # @option options [String] :elb_endpoint ('elasticloadbalancing.us-east-1.amazonaws.com')
@@ -14,6 +14,7 @@
14
14
  require 'json'
15
15
  require 'set'
16
16
  require 'yaml'
17
+ require 'uri'
17
18
 
18
19
  module AWS
19
20
  module Core
@@ -273,6 +274,15 @@ module AWS
273
274
  def rebuild_http_request response
274
275
  credential_provider.refresh if expired_credentials?(response)
275
276
  response.rebuild_request
277
+ if redirected?(response)
278
+ loc = URI.parse(response.http_response.headers['location'].first)
279
+ AWS::Core::MetaUtils.extend_method(response.http_request, :host) do
280
+ loc.host
281
+ end
282
+ response.http_request.host = loc.host
283
+ response.http_request.port = loc.port
284
+ response.http_request.uri = loc.path
285
+ end
276
286
  response.retry_count += 1
277
287
  end
278
288
 
@@ -301,6 +311,7 @@ module AWS
301
311
  expired_credentials?(response) or
302
312
  response.network_error? or
303
313
  throttled?(response) or
314
+ redirected?(response) or
304
315
  response.error.kind_of?(Errors::ServerError)
305
316
  end
306
317
 
@@ -318,6 +329,10 @@ module AWS
318
329
  response.error.code.to_s.match(/Throttling/i)
319
330
  end
320
331
 
332
+ def redirected? response
333
+ response.http_response.status == 307
334
+ end
335
+
321
336
  def return_or_raise options, &block
322
337
  response = yield
323
338
  unless options[:async]
@@ -57,6 +57,8 @@ module AWS
57
57
  #
58
58
  # See {Client} for documentation on all of the supported operations.
59
59
  #
60
+ # @!attribute [r] client
61
+ # @return [Client] the low-level DataPipeline client object
60
62
  class DataPipeline
61
63
 
62
64
  AWS.register_autoloads(self, 'aws/data_pipeline') do
@@ -20,17 +20,7 @@ module AWS
20
20
  #
21
21
  # dynamo_db = AWS::DynamoDB.new(
22
22
  # :access_key_id => '...',
23
- # :secret_access_key => '...',
24
- # :session_token => '...')
25
- #
26
- # = Credentials
27
- #
28
- # Amazon DynamoDB requires that all requests are made with short-term
29
- # credentials (e.g. requires a session token).
30
- #
31
- # @note If you make a request using AWS::DynamoDB with long-term credentials
32
- # a request is made to Amazon STS for temporary session credentials.
33
- # These will be cached in the process and re-used.
23
+ # :secret_access_key => '...')
34
24
  #
35
25
  # = Tables
36
26
  #
@@ -108,6 +98,8 @@ module AWS
108
98
  # # delete an item and all of its attributes
109
99
  # item.delete
110
100
  #
101
+ # @!attribute [r] client
102
+ # @return [Client] the low-level DynamoDB client object
111
103
  class DynamoDB
112
104
 
113
105
  AWS.register_autoloads(self, 'aws/dynamo_db') do