aws-sdk 1.21.0 → 1.22.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -89,6 +89,38 @@
89
89
  :input_key:
90
90
  :name: InputKey
91
91
  :type: :string
92
+ :album_art:
93
+ :name: AlbumArt
94
+ :type: :hash
95
+ :members:
96
+ :merge_policy:
97
+ :name: MergePolicy
98
+ :type: :string
99
+ :artwork:
100
+ :name: Artwork
101
+ :type: :array
102
+ :members:
103
+ :name: member
104
+ :type: :hash
105
+ :members:
106
+ :input_key:
107
+ :name: InputKey
108
+ :type: :string
109
+ :max_width:
110
+ :name: MaxWidth
111
+ :type: :string
112
+ :max_height:
113
+ :name: MaxHeight
114
+ :type: :string
115
+ :sizing_policy:
116
+ :name: SizingPolicy
117
+ :type: :string
118
+ :padding_policy:
119
+ :name: PaddingPolicy
120
+ :type: :string
121
+ :album_art_format:
122
+ :name: AlbumArtFormat
123
+ :type: :string
92
124
  :outputs:
93
125
  :name: Outputs
94
126
  :type: :array
@@ -124,6 +156,38 @@
124
156
  :input_key:
125
157
  :name: InputKey
126
158
  :type: :string
159
+ :album_art:
160
+ :name: AlbumArt
161
+ :type: :hash
162
+ :members:
163
+ :merge_policy:
164
+ :name: MergePolicy
165
+ :type: :string
166
+ :artwork:
167
+ :name: Artwork
168
+ :type: :array
169
+ :members:
170
+ :name: member
171
+ :type: :hash
172
+ :members:
173
+ :input_key:
174
+ :name: InputKey
175
+ :type: :string
176
+ :max_width:
177
+ :name: MaxWidth
178
+ :type: :string
179
+ :max_height:
180
+ :name: MaxHeight
181
+ :type: :string
182
+ :sizing_policy:
183
+ :name: SizingPolicy
184
+ :type: :string
185
+ :padding_policy:
186
+ :name: PaddingPolicy
187
+ :type: :string
188
+ :album_art_format:
189
+ :name: AlbumArtFormat
190
+ :type: :string
127
191
  :output_key_prefix:
128
192
  :name: OutputKeyPrefix
129
193
  :type: :string
@@ -226,6 +290,35 @@
226
290
  InputKey:
227
291
  :sym: :input_key
228
292
  :type: :string
293
+ AlbumArt:
294
+ :sym: :album_art
295
+ :type: :hash
296
+ :members:
297
+ MergePolicy:
298
+ :sym: :merge_policy
299
+ :type: :string
300
+ Artwork:
301
+ :sym: :artwork
302
+ :type: :hash
303
+ :members:
304
+ InputKey:
305
+ :sym: :input_key
306
+ :type: :string
307
+ MaxWidth:
308
+ :sym: :max_width
309
+ :type: :string
310
+ MaxHeight:
311
+ :sym: :max_height
312
+ :type: :string
313
+ SizingPolicy:
314
+ :sym: :sizing_policy
315
+ :type: :string
316
+ PaddingPolicy:
317
+ :sym: :padding_policy
318
+ :type: :string
319
+ AlbumArtFormat:
320
+ :sym: :album_art_format
321
+ :type: :string
229
322
  Outputs:
230
323
  :sym: :outputs
231
324
  :type: :hash
@@ -273,6 +366,35 @@
273
366
  InputKey:
274
367
  :sym: :input_key
275
368
  :type: :string
369
+ AlbumArt:
370
+ :sym: :album_art
371
+ :type: :hash
372
+ :members:
373
+ MergePolicy:
374
+ :sym: :merge_policy
375
+ :type: :string
376
+ Artwork:
377
+ :sym: :artwork
378
+ :type: :hash
379
+ :members:
380
+ InputKey:
381
+ :sym: :input_key
382
+ :type: :string
383
+ MaxWidth:
384
+ :sym: :max_width
385
+ :type: :string
386
+ MaxHeight:
387
+ :sym: :max_height
388
+ :type: :string
389
+ SizingPolicy:
390
+ :sym: :sizing_policy
391
+ :type: :string
392
+ PaddingPolicy:
393
+ :sym: :padding_policy
394
+ :type: :string
395
+ AlbumArtFormat:
396
+ :sym: :album_art_format
397
+ :type: :string
276
398
  OutputKeyPrefix:
277
399
  :sym: :output_key_prefix
278
400
  :type: :string
@@ -893,6 +1015,35 @@
893
1015
  InputKey:
894
1016
  :sym: :input_key
895
1017
  :type: :string
1018
+ AlbumArt:
1019
+ :sym: :album_art
1020
+ :type: :hash
1021
+ :members:
1022
+ MergePolicy:
1023
+ :sym: :merge_policy
1024
+ :type: :string
1025
+ Artwork:
1026
+ :sym: :artwork
1027
+ :type: :hash
1028
+ :members:
1029
+ InputKey:
1030
+ :sym: :input_key
1031
+ :type: :string
1032
+ MaxWidth:
1033
+ :sym: :max_width
1034
+ :type: :string
1035
+ MaxHeight:
1036
+ :sym: :max_height
1037
+ :type: :string
1038
+ SizingPolicy:
1039
+ :sym: :sizing_policy
1040
+ :type: :string
1041
+ PaddingPolicy:
1042
+ :sym: :padding_policy
1043
+ :type: :string
1044
+ AlbumArtFormat:
1045
+ :sym: :album_art_format
1046
+ :type: :string
896
1047
  Outputs:
897
1048
  :sym: :outputs
898
1049
  :type: :hash
@@ -940,6 +1091,35 @@
940
1091
  InputKey:
941
1092
  :sym: :input_key
942
1093
  :type: :string
1094
+ AlbumArt:
1095
+ :sym: :album_art
1096
+ :type: :hash
1097
+ :members:
1098
+ MergePolicy:
1099
+ :sym: :merge_policy
1100
+ :type: :string
1101
+ Artwork:
1102
+ :sym: :artwork
1103
+ :type: :hash
1104
+ :members:
1105
+ InputKey:
1106
+ :sym: :input_key
1107
+ :type: :string
1108
+ MaxWidth:
1109
+ :sym: :max_width
1110
+ :type: :string
1111
+ MaxHeight:
1112
+ :sym: :max_height
1113
+ :type: :string
1114
+ SizingPolicy:
1115
+ :sym: :sizing_policy
1116
+ :type: :string
1117
+ PaddingPolicy:
1118
+ :sym: :padding_policy
1119
+ :type: :string
1120
+ AlbumArtFormat:
1121
+ :sym: :album_art_format
1122
+ :type: :string
943
1123
  OutputKeyPrefix:
944
1124
  :sym: :output_key_prefix
945
1125
  :type: :string
@@ -1061,6 +1241,35 @@
1061
1241
  InputKey:
1062
1242
  :sym: :input_key
1063
1243
  :type: :string
1244
+ AlbumArt:
1245
+ :sym: :album_art
1246
+ :type: :hash
1247
+ :members:
1248
+ MergePolicy:
1249
+ :sym: :merge_policy
1250
+ :type: :string
1251
+ Artwork:
1252
+ :sym: :artwork
1253
+ :type: :hash
1254
+ :members:
1255
+ InputKey:
1256
+ :sym: :input_key
1257
+ :type: :string
1258
+ MaxWidth:
1259
+ :sym: :max_width
1260
+ :type: :string
1261
+ MaxHeight:
1262
+ :sym: :max_height
1263
+ :type: :string
1264
+ SizingPolicy:
1265
+ :sym: :sizing_policy
1266
+ :type: :string
1267
+ PaddingPolicy:
1268
+ :sym: :padding_policy
1269
+ :type: :string
1270
+ AlbumArtFormat:
1271
+ :sym: :album_art_format
1272
+ :type: :string
1064
1273
  Outputs:
1065
1274
  :sym: :outputs
1066
1275
  :type: :hash
@@ -1108,6 +1317,35 @@
1108
1317
  InputKey:
1109
1318
  :sym: :input_key
1110
1319
  :type: :string
1320
+ AlbumArt:
1321
+ :sym: :album_art
1322
+ :type: :hash
1323
+ :members:
1324
+ MergePolicy:
1325
+ :sym: :merge_policy
1326
+ :type: :string
1327
+ Artwork:
1328
+ :sym: :artwork
1329
+ :type: :hash
1330
+ :members:
1331
+ InputKey:
1332
+ :sym: :input_key
1333
+ :type: :string
1334
+ MaxWidth:
1335
+ :sym: :max_width
1336
+ :type: :string
1337
+ MaxHeight:
1338
+ :sym: :max_height
1339
+ :type: :string
1340
+ SizingPolicy:
1341
+ :sym: :sizing_policy
1342
+ :type: :string
1343
+ PaddingPolicy:
1344
+ :sym: :padding_policy
1345
+ :type: :string
1346
+ AlbumArtFormat:
1347
+ :sym: :album_art_format
1348
+ :type: :string
1111
1349
  OutputKeyPrefix:
1112
1350
  :sym: :output_key_prefix
1113
1351
  :type: :string
@@ -1472,6 +1710,35 @@
1472
1710
  InputKey:
1473
1711
  :sym: :input_key
1474
1712
  :type: :string
1713
+ AlbumArt:
1714
+ :sym: :album_art
1715
+ :type: :hash
1716
+ :members:
1717
+ MergePolicy:
1718
+ :sym: :merge_policy
1719
+ :type: :string
1720
+ Artwork:
1721
+ :sym: :artwork
1722
+ :type: :hash
1723
+ :members:
1724
+ InputKey:
1725
+ :sym: :input_key
1726
+ :type: :string
1727
+ MaxWidth:
1728
+ :sym: :max_width
1729
+ :type: :string
1730
+ MaxHeight:
1731
+ :sym: :max_height
1732
+ :type: :string
1733
+ SizingPolicy:
1734
+ :sym: :sizing_policy
1735
+ :type: :string
1736
+ PaddingPolicy:
1737
+ :sym: :padding_policy
1738
+ :type: :string
1739
+ AlbumArtFormat:
1740
+ :sym: :album_art_format
1741
+ :type: :string
1475
1742
  Outputs:
1476
1743
  :sym: :outputs
1477
1744
  :type: :hash
@@ -1519,6 +1786,35 @@
1519
1786
  InputKey:
1520
1787
  :sym: :input_key
1521
1788
  :type: :string
1789
+ AlbumArt:
1790
+ :sym: :album_art
1791
+ :type: :hash
1792
+ :members:
1793
+ MergePolicy:
1794
+ :sym: :merge_policy
1795
+ :type: :string
1796
+ Artwork:
1797
+ :sym: :artwork
1798
+ :type: :hash
1799
+ :members:
1800
+ InputKey:
1801
+ :sym: :input_key
1802
+ :type: :string
1803
+ MaxWidth:
1804
+ :sym: :max_width
1805
+ :type: :string
1806
+ MaxHeight:
1807
+ :sym: :max_height
1808
+ :type: :string
1809
+ SizingPolicy:
1810
+ :sym: :sizing_policy
1811
+ :type: :string
1812
+ PaddingPolicy:
1813
+ :sym: :padding_policy
1814
+ :type: :string
1815
+ AlbumArtFormat:
1816
+ :sym: :album_art_format
1817
+ :type: :string
1522
1818
  OutputKeyPrefix:
1523
1819
  :sym: :output_key_prefix
1524
1820
  :type: :string
@@ -42,6 +42,8 @@ module AWS
42
42
  #
43
43
  # @attr_reader [String] spot_price
44
44
  #
45
+ # @attr_reader [Boolean] associate_public_ip_address
46
+ #
45
47
  class LaunchConfiguration < Core::Resource
46
48
 
47
49
  # @api private
@@ -92,6 +94,8 @@ module AWS
92
94
  :from => :security_groups,
93
95
  :static => true
94
96
 
97
+ attribute :associate_public_ip_address, :static => true
98
+
95
99
  protected :security_group_details
96
100
 
97
101
  populates_from(:describe_launch_configurations) do |resp|
@@ -62,6 +62,11 @@ module AWS
62
62
  #
63
63
  # @option options [String] :spot_price
64
64
  #
65
+ # @option options [Boolean] :associate_public_ip_address
66
+ # Used for Auto Scaling groups that launch instances into an
67
+ # Amazon Virtual Private Cloud (Amazon VPC). Specifies whether
68
+ # to assign a public IP address to each instance launched in a Amazon VPC.
69
+ #
65
70
  # @return [LaunchConfiguration]
66
71
  #
67
72
  def create name, image, instance_type, options = {}
@@ -83,6 +88,7 @@ module AWS
83
88
  :kernel_id,
84
89
  :ramdisk_id,
85
90
  :block_device_mappings,
91
+ :associate_public_ip_address
86
92
  ].each do |opt|
87
93
  client_opts[opt] = options[opt] if options.key?(opt)
88
94
  end
@@ -16,16 +16,16 @@ module AWS
16
16
 
17
17
  class Client < Core::RESTXMLClient
18
18
 
19
- API_VERSION = '2013-08-26'
19
+ API_VERSION = '2013-09-27'
20
20
 
21
21
  # @api private
22
22
  CACHEABLE_REQUESTS = Set[]
23
23
 
24
24
  end
25
25
 
26
- class Client::V20130826 < Client
26
+ class Client::V20130927 < Client
27
27
 
28
- define_client_methods('2013-08-26')
28
+ define_client_methods('2013-09-27')
29
29
 
30
30
  end
31
31
  end
@@ -619,13 +619,14 @@ module AWS
619
619
 
620
620
  def client_api_version(options)
621
621
  api_version = options[:api_version]
622
- api_version ||= configured_version
622
+ api_version ||= configured_version(options[:config]) if options[:config]
623
+ api_version ||= configured_version(AWS.config)
623
624
  api_version || const_get(:API_VERSION)
624
625
  end
625
626
 
626
- def configured_version
627
+ def configured_version(config = AWS.config)
627
628
  svc_opt = AWS::SERVICES[name.split('::')[1]].method_name
628
- AWS.config.send(svc_opt)[:api_version]
629
+ config.send(svc_opt)[:api_version]
629
630
  end
630
631
 
631
632
  protected
@@ -128,12 +128,16 @@ module AWS
128
128
  request.body = nil
129
129
  elsif payload = streaming_param # streaming request
130
130
  request.body_stream = params[payload]
131
- request.headers['Content-Length'] = params[payload].size
131
+ request.headers['Content-Length'] = size(params[payload])
132
132
  else
133
133
  request.body = @serializer.serialize(params)
134
134
  end
135
135
  end
136
136
 
137
+ def size(payload)
138
+ payload.respond_to?(:size) ? payload.size : File.size(payload.path)
139
+ end
140
+
137
141
  def streaming_param
138
142
  if payload = @http[:request_payload]
139
143
  @rules[payload][:type] == :blob ? payload : nil