aws-sdk 1.6.4 → 1.6.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/aws/auto_scaling/client.rb +2 -2
- data/lib/aws/cloud_formation/client.rb +2 -2
- data/lib/aws/cloud_watch/client.rb +2 -2
- data/lib/aws/core.rb +4 -1
- data/lib/aws/core/configuration.rb +3 -0
- data/lib/aws/core/options/xml_serializer.rb +7 -16
- data/lib/aws/dynamo_db/client.rb +2 -2
- data/lib/aws/ec2/client.rb +188 -5
- data/lib/aws/ec2/key_pair_collection.rb +1 -1
- data/lib/aws/ec2/security_group.rb +36 -31
- data/lib/aws/ec2/security_group/ip_permission.rb +7 -7
- data/lib/aws/elb/backend_server_policy_collection.rb +11 -12
- data/lib/aws/elb/client.rb +2 -2
- data/lib/aws/elb/instance_collection.rb +8 -9
- data/lib/aws/elb/listener.rb +16 -15
- data/lib/aws/elb/listener_collection.rb +20 -26
- data/lib/aws/elb/load_balancer.rb +97 -69
- data/lib/aws/elb/load_balancer_collection.rb +37 -24
- data/lib/aws/elb/load_balancer_policy.rb +1 -1
- data/lib/aws/elb/load_balancer_policy_collection.rb +9 -9
- data/lib/aws/emr/client.rb +2 -2
- data/lib/aws/iam/client.rb +2 -2
- data/lib/aws/route_53/client.rb +2 -2
- data/lib/aws/s3/bucket_lifecycle_configuration.rb +25 -24
- data/lib/aws/s3/s3_object.rb +6 -2
- data/lib/aws/simple_db/client.rb +2 -2
- data/lib/aws/simple_email_service/client.rb +2 -2
- data/lib/aws/simple_workflow/client.rb +2 -2
- data/lib/aws/sns/client.rb +2 -2
- data/lib/aws/sqs/client.rb +2 -2
- data/lib/aws/sts/client.rb +2 -2
- metadata +3 -5
- data/lib/aws/api_config/.document +0 -0
- data/lib/aws/core/json_error_parser.rb +0 -25
@@ -15,7 +15,7 @@ module AWS
|
|
15
15
|
class ELB
|
16
16
|
|
17
17
|
class LoadBalancerPolicyCollection
|
18
|
-
|
18
|
+
|
19
19
|
include Core::Collection::Simple
|
20
20
|
|
21
21
|
def initialize load_balancer, options = {}
|
@@ -25,10 +25,10 @@ module AWS
|
|
25
25
|
|
26
26
|
attr_reader :load_balancer
|
27
27
|
|
28
|
-
# Creates a new load balancer policy that contains the necessary
|
29
|
-
# attributes depending on the policy type. Policies are settings
|
30
|
-
# that are saved for your load balancer and that can be applied to
|
31
|
-
# the front-end listener, or the back-end application server,
|
28
|
+
# Creates a new load balancer policy that contains the necessary
|
29
|
+
# attributes depending on the policy type. Policies are settings
|
30
|
+
# that are saved for your load balancer and that can be applied to
|
31
|
+
# the front-end listener, or the back-end application server,
|
32
32
|
# depending on your policy type.
|
33
33
|
#
|
34
34
|
# == Applying Policies
|
@@ -161,9 +161,9 @@ module AWS
|
|
161
161
|
|
162
162
|
attributes.each do |attr_name,values|
|
163
163
|
[values].flatten.each do |value|
|
164
|
-
attribute_list << {
|
165
|
-
:attribute_name => attr_name,
|
166
|
-
:attribute_value => value.to_s
|
164
|
+
attribute_list << {
|
165
|
+
:attribute_name => attr_name,
|
166
|
+
:attribute_value => value.to_s
|
167
167
|
}
|
168
168
|
end
|
169
169
|
end
|
@@ -194,7 +194,7 @@ module AWS
|
|
194
194
|
response.policy_descriptions.each do |desc|
|
195
195
|
|
196
196
|
load_balancer_policy = LoadBalancerPolicy.new_from(
|
197
|
-
:describe_load_balancer_policies,
|
197
|
+
:describe_load_balancer_policies,
|
198
198
|
desc, load_balancer, desc.policy_name)
|
199
199
|
|
200
200
|
yield(load_balancer_policy)
|
data/lib/aws/emr/client.rb
CHANGED
@@ -15,8 +15,6 @@ module AWS
|
|
15
15
|
class EMR
|
16
16
|
class Client < Core::QueryClient
|
17
17
|
|
18
|
-
define_client_methods('2009-03-31')
|
19
|
-
|
20
18
|
# @private
|
21
19
|
CACHEABLE_REQUESTS = Set[]
|
22
20
|
|
@@ -295,6 +293,8 @@ module AWS
|
|
295
293
|
|
296
294
|
## end client methods ##
|
297
295
|
|
296
|
+
define_client_methods('2009-03-31')
|
297
|
+
|
298
298
|
end
|
299
299
|
end
|
300
300
|
end
|
data/lib/aws/iam/client.rb
CHANGED
@@ -17,8 +17,6 @@ module AWS
|
|
17
17
|
# Client class for AWS Identity and Access Management (IAM).
|
18
18
|
class Client < Core::QueryClient
|
19
19
|
|
20
|
-
define_client_methods('2010-05-08')
|
21
|
-
|
22
20
|
# @private
|
23
21
|
CACHEABLE_REQUESTS = Set[
|
24
22
|
:get_group,
|
@@ -1087,6 +1085,8 @@ module AWS
|
|
1087
1085
|
|
1088
1086
|
## end client methods ##
|
1089
1087
|
|
1088
|
+
define_client_methods('2010-05-08')
|
1089
|
+
|
1090
1090
|
end
|
1091
1091
|
end
|
1092
1092
|
end
|
data/lib/aws/route_53/client.rb
CHANGED
@@ -15,8 +15,6 @@ module AWS
|
|
15
15
|
class Route53
|
16
16
|
class Client < Core::RESTClient
|
17
17
|
|
18
|
-
define_client_methods('2012-02-29')
|
19
|
-
|
20
18
|
# @private
|
21
19
|
CACHEABLE_REQUESTS = Set[]
|
22
20
|
|
@@ -257,6 +255,8 @@ module AWS
|
|
257
255
|
|
258
256
|
## end client methods ##
|
259
257
|
|
258
|
+
define_client_methods('2012-02-29')
|
259
|
+
|
260
260
|
end
|
261
261
|
end
|
262
262
|
end
|
@@ -31,9 +31,9 @@ module AWS
|
|
31
31
|
# * +#status+
|
32
32
|
# * +#id+
|
33
33
|
#
|
34
|
-
# Objects with keys matching a rule prefix will be deleted after
|
34
|
+
# Objects with keys matching a rule prefix will be deleted after
|
35
35
|
# #expiration_days have passed.
|
36
|
-
#
|
36
|
+
#
|
37
37
|
# A rule is comprised primarily of a prefix and number of expiration days.
|
38
38
|
# Objects with keys that start with the given prefix will be automatically
|
39
39
|
# deleted after "expiration days" have passed. Rules also have an
|
@@ -80,15 +80,15 @@ module AWS
|
|
80
80
|
# remove_rule(rule) if rule.disabled?
|
81
81
|
# end
|
82
82
|
# end
|
83
|
-
#
|
83
|
+
#
|
84
84
|
# You can also remove all rules in a single call:
|
85
85
|
#
|
86
86
|
# # remove all rules from this lifecycle configuration
|
87
87
|
# bucket.lifecycle_configuration.clear
|
88
|
-
#
|
88
|
+
#
|
89
89
|
# == Editing Existing Rules
|
90
90
|
#
|
91
|
-
# You can also make changes to existing rules.
|
91
|
+
# You can also make changes to existing rules.
|
92
92
|
#
|
93
93
|
# # change the expiration days to 10 for EVERY rule
|
94
94
|
# bucket.lifecycle_configuration.update do
|
@@ -102,7 +102,7 @@ module AWS
|
|
102
102
|
# or the changes will not be persisted.
|
103
103
|
#
|
104
104
|
class BucketLifecycleConfiguration
|
105
|
-
|
105
|
+
|
106
106
|
# @private
|
107
107
|
def initialize bucket, options = {}
|
108
108
|
@bucket = bucket
|
@@ -110,7 +110,7 @@ module AWS
|
|
110
110
|
@rules = [] if options[:empty] == true
|
111
111
|
end
|
112
112
|
|
113
|
-
# @return [Bucket] Returns the bucket this lifecycle configuration
|
113
|
+
# @return [Bucket] Returns the bucket this lifecycle configuration
|
114
114
|
# belongs to.
|
115
115
|
attr_reader :bucket
|
116
116
|
|
@@ -127,7 +127,7 @@ module AWS
|
|
127
127
|
end
|
128
128
|
end
|
129
129
|
|
130
|
-
# @param [String] prefix
|
130
|
+
# @param [String] prefix
|
131
131
|
#
|
132
132
|
# @param [Integer] expiration_days Indicates the lifetime for objects
|
133
133
|
# matching the given prefix.
|
@@ -158,7 +158,7 @@ module AWS
|
|
158
158
|
# bucket.lifecycle_configuration.update do
|
159
159
|
# remove_rule('rule-id')
|
160
160
|
# end
|
161
|
-
#
|
161
|
+
#
|
162
162
|
# # remove all disabled rules
|
163
163
|
# bucket.lifecycle_configuration.update do
|
164
164
|
# rules.each do |rule|
|
@@ -172,7 +172,7 @@ module AWS
|
|
172
172
|
# @param [Rule,String] rule_or_rule_id
|
173
173
|
#
|
174
174
|
# @return [nil]
|
175
|
-
#
|
175
|
+
#
|
176
176
|
def remove_rule rule_or_rule_id
|
177
177
|
rule_id = rule_or_rule_id
|
178
178
|
if rule_id.nil?
|
@@ -184,7 +184,7 @@ module AWS
|
|
184
184
|
end
|
185
185
|
|
186
186
|
# Saves changes made to this lifecycle configuration.
|
187
|
-
#
|
187
|
+
#
|
188
188
|
# # set the number of days before expiration for all rules to 10
|
189
189
|
# config = bucket.lifecycle_configuration
|
190
190
|
# config.rules.each do |rule|
|
@@ -213,7 +213,7 @@ module AWS
|
|
213
213
|
# # 2 requests
|
214
214
|
# bucket.lifecycle_configuration.add_rule 'prefix/a', 10
|
215
215
|
# bucket.lifecycle_configuration.add_rule 'prefix/b', 5
|
216
|
-
#
|
216
|
+
#
|
217
217
|
# @return [nil]
|
218
218
|
#
|
219
219
|
def update &block
|
@@ -229,7 +229,7 @@ module AWS
|
|
229
229
|
|
230
230
|
# Yields to the given block. Before yielding, the current
|
231
231
|
# rules will be blanked out. This allows you to provide all
|
232
|
-
# new rules.
|
232
|
+
# new rules.
|
233
233
|
#
|
234
234
|
# When the block is complete, a single call will be made to save
|
235
235
|
# the new rules.
|
@@ -257,19 +257,20 @@ module AWS
|
|
257
257
|
# @return [String] Returns an xml string representation of this
|
258
258
|
# bucket lifecycle configuration.
|
259
259
|
def to_xml
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
260
|
+
Nokogiri::XML::Builder.new do |xml|
|
261
|
+
xml.LifecycleConfiguration do
|
262
|
+
rules.each do |rule|
|
263
|
+
xml.Rule do
|
264
|
+
xml.ID rule.id
|
265
|
+
xml.Prefix rule.prefix
|
266
|
+
xml.Status rule.status
|
267
|
+
xml.Expiration do
|
268
|
+
xml.Days rule.expiration_days
|
269
|
+
end
|
269
270
|
end
|
270
271
|
end
|
271
272
|
end
|
272
|
-
end.
|
273
|
+
end.doc.root.to_xml
|
273
274
|
end
|
274
275
|
|
275
276
|
protected
|
@@ -299,7 +300,7 @@ module AWS
|
|
299
300
|
# # remove the rule created above
|
300
301
|
# bucket.lifecycle_configuration.remove_rule 'temporary/'
|
301
302
|
#
|
302
|
-
#
|
303
|
+
#
|
303
304
|
class Rule
|
304
305
|
|
305
306
|
def initialize configuration, id, prefix, expiration_days, status
|
data/lib/aws/s3/s3_object.rb
CHANGED
@@ -12,6 +12,7 @@
|
|
12
12
|
# language governing permissions and limitations under the License.
|
13
13
|
|
14
14
|
require 'uri'
|
15
|
+
require 'base64'
|
15
16
|
|
16
17
|
module AWS
|
17
18
|
class S3
|
@@ -819,13 +820,16 @@ module AWS
|
|
819
820
|
copy_opts[:metadata_directive] = "REPLACE"
|
820
821
|
end
|
821
822
|
|
823
|
+
if options[:cache_control]
|
824
|
+
copy_opts[:cache_control] = options[:cache_control]
|
825
|
+
copy_opts[:metadata_directive] = "REPLACE"
|
826
|
+
end
|
827
|
+
|
822
828
|
copy_opts[:acl] = options[:acl] if options[:acl]
|
823
829
|
copy_opts[:version_id] = options[:version_id] if options[:version_id]
|
824
830
|
copy_opts[:server_side_encryption] =
|
825
831
|
options[:server_side_encryption] if
|
826
832
|
options.key?(:server_side_encryption)
|
827
|
-
copy_opts[:cache_control] = options[:cache_control] if
|
828
|
-
options[:cache_control]
|
829
833
|
add_sse_options(copy_opts)
|
830
834
|
|
831
835
|
if options[:reduced_redundancy]
|
data/lib/aws/simple_db/client.rb
CHANGED
@@ -17,8 +17,6 @@ module AWS
|
|
17
17
|
# Client class for Amazon SimpleDB.
|
18
18
|
class Client < Core::QueryClient
|
19
19
|
|
20
|
-
define_client_methods('2009-04-15')
|
21
|
-
|
22
20
|
# @private
|
23
21
|
REGION_US_E1 = 'sdb.amazonaws.com'
|
24
22
|
|
@@ -282,6 +280,8 @@ module AWS
|
|
282
280
|
|
283
281
|
## end client methods ##
|
284
282
|
|
283
|
+
define_client_methods('2009-04-15')
|
284
|
+
|
285
285
|
end
|
286
286
|
end
|
287
287
|
end
|
@@ -17,8 +17,6 @@ module AWS
|
|
17
17
|
# Client class for Amazon Simple E-mail Service (SES).
|
18
18
|
class Client < Core::QueryClient
|
19
19
|
|
20
|
-
define_client_methods('2010-12-01')
|
21
|
-
|
22
20
|
REGION_US_E1 = 'email.us-east-1.amazonaws.com'
|
23
21
|
|
24
22
|
# @private
|
@@ -271,6 +269,8 @@ module AWS
|
|
271
269
|
|
272
270
|
## end client methods ##
|
273
271
|
|
272
|
+
define_client_methods('2010-12-01')
|
273
|
+
|
274
274
|
end
|
275
275
|
end
|
276
276
|
end
|
@@ -17,8 +17,6 @@ module AWS
|
|
17
17
|
# Client class for Amazon Simple Workflow Service (SWF).
|
18
18
|
class Client < Core::JSONClient
|
19
19
|
|
20
|
-
define_client_methods('2012-01-25')
|
21
|
-
|
22
20
|
# @private
|
23
21
|
CACHEABLE_REQUESTS = Set[
|
24
22
|
:count_pending_activity_tasks,
|
@@ -1189,6 +1187,8 @@ module AWS
|
|
1189
1187
|
|
1190
1188
|
## end client methods ##
|
1191
1189
|
|
1190
|
+
define_client_methods('2012-01-25')
|
1191
|
+
|
1192
1192
|
protected
|
1193
1193
|
|
1194
1194
|
def cacheable_request? name, options
|
data/lib/aws/sns/client.rb
CHANGED
@@ -17,8 +17,6 @@ module AWS
|
|
17
17
|
# Client class for Amazon Simple Notifications Service (SNS).
|
18
18
|
class Client < Core::QueryClient
|
19
19
|
|
20
|
-
define_client_methods('2010-03-31')
|
21
|
-
|
22
20
|
# @private
|
23
21
|
CACHEABLE_REQUESTS = Set[]
|
24
22
|
|
@@ -261,6 +259,8 @@ module AWS
|
|
261
259
|
|
262
260
|
## end client methods ##
|
263
261
|
|
262
|
+
define_client_methods('2010-03-31')
|
263
|
+
|
264
264
|
end
|
265
265
|
end
|
266
266
|
end
|
data/lib/aws/sqs/client.rb
CHANGED
@@ -17,8 +17,6 @@ module AWS
|
|
17
17
|
# Client class for Amazon Simple Queue Service (SQS).
|
18
18
|
class Client < Core::QueryClient
|
19
19
|
|
20
|
-
define_client_methods('2011-10-01')
|
21
|
-
|
22
20
|
# @private
|
23
21
|
CACHEABLE_REQUESTS = Set[]
|
24
22
|
|
@@ -247,6 +245,8 @@ module AWS
|
|
247
245
|
|
248
246
|
## end client methods ##
|
249
247
|
|
248
|
+
define_client_methods('2011-10-01')
|
249
|
+
|
250
250
|
end
|
251
251
|
end
|
252
252
|
end
|
data/lib/aws/sts/client.rb
CHANGED
@@ -17,8 +17,6 @@ module AWS
|
|
17
17
|
# Client class for AWS Security Token Service (STS).
|
18
18
|
class Client < Core::QueryClient
|
19
19
|
|
20
|
-
define_client_methods('2011-06-15')
|
21
|
-
|
22
20
|
REGION_US_E1 = 'sts.amazonaws.com'
|
23
21
|
|
24
22
|
# @private
|
@@ -101,6 +99,8 @@ module AWS
|
|
101
99
|
|
102
100
|
## end client methods ##
|
103
101
|
|
102
|
+
define_client_methods('2011-06-15')
|
103
|
+
|
104
104
|
end
|
105
105
|
end
|
106
106
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: aws-sdk
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.6.
|
4
|
+
version: 1.6.5
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-09-05 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: uuidtools
|
@@ -154,7 +154,6 @@ files:
|
|
154
154
|
- lib/aws/core/indifferent_hash.rb
|
155
155
|
- lib/aws/core/inflection.rb
|
156
156
|
- lib/aws/core/json_client.rb
|
157
|
-
- lib/aws/core/json_error_parser.rb
|
158
157
|
- lib/aws/core/json_request_builder.rb
|
159
158
|
- lib/aws/core/json_response_parser.rb
|
160
159
|
- lib/aws/core/lazy_error_classes.rb
|
@@ -520,7 +519,6 @@ files:
|
|
520
519
|
- lib/aws/api_config/SNS-2010-03-31.yml
|
521
520
|
- lib/aws/api_config/SQS-2011-10-01.yml
|
522
521
|
- lib/aws/api_config/STS-2011-06-15.yml
|
523
|
-
- lib/aws/api_config/.document
|
524
522
|
- .yardopts
|
525
523
|
- README.rdoc
|
526
524
|
- NOTICE.txt
|
@@ -540,7 +538,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
540
538
|
version: '0'
|
541
539
|
segments:
|
542
540
|
- 0
|
543
|
-
hash:
|
541
|
+
hash: -4596701733449318258
|
544
542
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
545
543
|
none: false
|
546
544
|
requirements:
|
File without changes
|
@@ -1,25 +0,0 @@
|
|
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
|
-
module AWS
|
15
|
-
module Core
|
16
|
-
|
17
|
-
# @private
|
18
|
-
module JSONErrorParser
|
19
|
-
|
20
|
-
end
|
21
|
-
|
22
|
-
end
|
23
|
-
|
24
|
-
end
|
25
|
-
end
|