aws-sdk-v1 1.64.0 → 1.65.0

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: b42b5f39cf93c4272099c12cc84eea29bd3b814e
4
- data.tar.gz: b7f81bda456adfbd0f7b3b7507de2b7c3d47d730
3
+ metadata.gz: b7e4fed855b8c1c08be328ca0417dedf9f1f80bd
4
+ data.tar.gz: c8d8b47169e803822c8440e73ef145ad3a7f8483
5
5
  SHA512:
6
- metadata.gz: 4576088dc41d99414c9e36a1d7990190a71bdfa3e23ee43a7ec6abc8e4678acab6d5e22f65c83d5b24b510875252850b09ef8151ad61b02eb2d4690f63cb301c
7
- data.tar.gz: 35c07f9453f6204f68f15aa2946f9a755948bf570f73202b67da189510cfa86e6d1041962b82002449dd5feedcbfc6911cd290eed22bd0ae33ce41d1539e61c0
6
+ metadata.gz: ff70ca83866d1aa33d40657a43faaffc7f4b64060d22e2d8f7b90c66780a9ba8a61c3bffb67ce2a9d1151804e1fd5be5b8abca4a04d9823abecb9ff882dab368
7
+ data.tar.gz: 6c1a5fcf43226cde5ce29f2029b11e52dfd3ca92c21609db72fce3874341211d7d11b80b060c37b01ea165632e5f17ea96f38d35e3bcb93f79d052c0abc0ea83
@@ -1,21 +1,19 @@
1
- # Copyright 2011-2014 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
1
  ---
15
2
  :json_version: '1.1'
16
3
  :target_prefix: OpsWorks_20130218.
17
4
  :api_version: '2013-02-18'
18
5
  :operations:
6
+ - :name: AssignInstance
7
+ :method: :assign_instance
8
+ :inputs:
9
+ InstanceId:
10
+ - :string
11
+ - :required
12
+ LayerIds:
13
+ - :list:
14
+ - :string
15
+ - :required
16
+ :outputs: {}
19
17
  - :name: AssignVolume
20
18
  :method: :assign_volume
21
19
  :inputs:
@@ -116,6 +114,8 @@
116
114
  - :string
117
115
  DefaultRootDeviceType:
118
116
  - :string
117
+ AgentVersion:
118
+ - :string
119
119
  :outputs:
120
120
  StackId:
121
121
  :sym: :stack_id
@@ -260,10 +260,33 @@
260
260
  - :string
261
261
  RootDeviceType:
262
262
  - :string
263
+ BlockDeviceMappings:
264
+ - :list:
265
+ - :structure:
266
+ DeviceName:
267
+ - :string
268
+ NoDevice:
269
+ - :string
270
+ VirtualName:
271
+ - :string
272
+ Ebs:
273
+ - :structure:
274
+ SnapshotId:
275
+ - :string
276
+ Iops:
277
+ - :integer
278
+ VolumeSize:
279
+ - :integer
280
+ VolumeType:
281
+ - :string
282
+ DeleteOnTermination:
283
+ - :boolean
263
284
  InstallUpdatesOnBoot:
264
285
  - :boolean
265
286
  EbsOptimized:
266
287
  - :boolean
288
+ AgentVersion:
289
+ - :string
267
290
  :outputs:
268
291
  InstanceId:
269
292
  :sym: :instance_id
@@ -342,6 +365,14 @@
342
365
  - :boolean
343
366
  UseEbsOptimizedInstances:
344
367
  - :boolean
368
+ LifecycleEventConfiguration:
369
+ - :structure:
370
+ Shutdown:
371
+ - :structure:
372
+ ExecutionTimeout:
373
+ - :integer
374
+ DelayUntilElbConnectionsDrained:
375
+ - :boolean
345
376
  :outputs:
346
377
  LayerId:
347
378
  :sym: :layer_id
@@ -413,6 +444,8 @@
413
444
  - :string
414
445
  DefaultRootDeviceType:
415
446
  - :string
447
+ AgentVersion:
448
+ - :string
416
449
  :outputs:
417
450
  StackId:
418
451
  :sym: :stack_id
@@ -479,6 +512,13 @@
479
512
  - :string
480
513
  - :required
481
514
  :outputs: {}
515
+ - :name: DeregisterInstance
516
+ :method: :deregister_instance
517
+ :inputs:
518
+ InstanceId:
519
+ - :string
520
+ - :required
521
+ :outputs: {}
482
522
  - :name: DeregisterRdsDbInstance
483
523
  :method: :deregister_rds_db_instance
484
524
  :inputs:
@@ -493,6 +533,35 @@
493
533
  - :string
494
534
  - :required
495
535
  :outputs: {}
536
+ - :name: DescribeAgentVersions
537
+ :method: :describe_agent_versions
538
+ :inputs:
539
+ StackId:
540
+ - :string
541
+ ConfigurationManager:
542
+ - :structure:
543
+ Name:
544
+ - :string
545
+ Version:
546
+ - :string
547
+ :outputs:
548
+ AgentVersions:
549
+ :sym: :agent_versions
550
+ :type: :hash
551
+ :members:
552
+ Version:
553
+ :sym: :version
554
+ :type: :string
555
+ ConfigurationManager:
556
+ :sym: :configuration_manager
557
+ :type: :hash
558
+ :members:
559
+ Name:
560
+ :sym: :name
561
+ :type: :string
562
+ Version:
563
+ :sym: :version
564
+ :type: :string
496
565
  - :name: DescribeApps
497
566
  :method: :describe_apps
498
567
  :inputs:
@@ -791,96 +860,156 @@
791
860
  :sym: :instances
792
861
  :type: :hash
793
862
  :members:
794
- InstanceId:
795
- :sym: :instance_id
863
+ AgentVersion:
864
+ :sym: :agent_version
796
865
  :type: :string
866
+ AmiId:
867
+ :sym: :ami_id
868
+ :type: :string
869
+ Architecture:
870
+ :sym: :architecture
871
+ :type: :string
872
+ AutoScalingType:
873
+ :sym: :auto_scaling_type
874
+ :type: :string
875
+ AvailabilityZone:
876
+ :sym: :availability_zone
877
+ :type: :string
878
+ BlockDeviceMappings:
879
+ :sym: :block_device_mappings
880
+ :type: :hash
881
+ :members:
882
+ DeviceName:
883
+ :sym: :device_name
884
+ :type: :string
885
+ NoDevice:
886
+ :sym: :no_device
887
+ :type: :string
888
+ VirtualName:
889
+ :sym: :virtual_name
890
+ :type: :string
891
+ Ebs:
892
+ :sym: :ebs
893
+ :type: :hash
894
+ :members:
895
+ SnapshotId:
896
+ :sym: :snapshot_id
897
+ :type: :string
898
+ Iops:
899
+ :sym: :iops
900
+ :type: :integer
901
+ VolumeSize:
902
+ :sym: :volume_size
903
+ :type: :integer
904
+ VolumeType:
905
+ :sym: :volume_type
906
+ :type: :string
907
+ DeleteOnTermination:
908
+ :sym: :delete_on_termination
909
+ :type: :boolean
910
+ CreatedAt:
911
+ :sym: :created_at
912
+ :type: :string
913
+ EbsOptimized:
914
+ :sym: :ebs_optimized
915
+ :type: :boolean
797
916
  Ec2InstanceId:
798
917
  :sym: :ec2_instance_id
799
918
  :type: :string
800
- VirtualizationType:
801
- :sym: :virtualization_type
919
+ ElasticIp:
920
+ :sym: :elastic_ip
802
921
  :type: :string
803
922
  Hostname:
804
923
  :sym: :hostname
805
924
  :type: :string
806
- StackId:
807
- :sym: :stack_id
925
+ InfrastructureClass:
926
+ :sym: :infrastructure_class
808
927
  :type: :string
809
- LayerIds:
810
- :sym: :layer_ids
928
+ InstallUpdatesOnBoot:
929
+ :sym: :install_updates_on_boot
930
+ :type: :boolean
931
+ InstanceId:
932
+ :sym: :instance_id
811
933
  :type: :string
812
- SecurityGroupIds:
813
- :sym: :security_group_ids
934
+ InstanceProfileArn:
935
+ :sym: :instance_profile_arn
814
936
  :type: :string
815
937
  InstanceType:
816
938
  :sym: :instance_type
817
939
  :type: :string
818
- InstanceProfileArn:
819
- :sym: :instance_profile_arn
940
+ LastServiceErrorId:
941
+ :sym: :last_service_error_id
820
942
  :type: :string
821
- Status:
822
- :sym: :status
943
+ LayerIds:
944
+ :sym: :layer_ids
823
945
  :type: :string
824
946
  Os:
825
947
  :sym: :os
826
948
  :type: :string
827
- AmiId:
828
- :sym: :ami_id
949
+ Platform:
950
+ :sym: :platform
829
951
  :type: :string
830
- AvailabilityZone:
831
- :sym: :availability_zone
952
+ PrivateDns:
953
+ :sym: :private_dns
832
954
  :type: :string
833
- SubnetId:
834
- :sym: :subnet_id
955
+ PrivateIp:
956
+ :sym: :private_ip
835
957
  :type: :string
836
958
  PublicDns:
837
959
  :sym: :public_dns
838
960
  :type: :string
839
- PrivateDns:
840
- :sym: :private_dns
841
- :type: :string
842
961
  PublicIp:
843
962
  :sym: :public_ip
844
963
  :type: :string
845
- PrivateIp:
846
- :sym: :private_ip
964
+ RegisteredBy:
965
+ :sym: :registered_by
847
966
  :type: :string
848
- ElasticIp:
849
- :sym: :elastic_ip
967
+ ReportedAgentVersion:
968
+ :sym: :reported_agent_version
850
969
  :type: :string
851
- AutoScalingType:
852
- :sym: :auto_scaling_type
970
+ ReportedOs:
971
+ :sym: :reported_os
972
+ :type: :hash
973
+ :members:
974
+ Family:
975
+ :sym: :family
976
+ :type: :string
977
+ Name:
978
+ :sym: :name
979
+ :type: :string
980
+ Version:
981
+ :sym: :version
982
+ :type: :string
983
+ RootDeviceType:
984
+ :sym: :root_device_type
853
985
  :type: :string
854
- SshKeyName:
855
- :sym: :ssh_key_name
986
+ RootDeviceVolumeId:
987
+ :sym: :root_device_volume_id
856
988
  :type: :string
857
- SshHostRsaKeyFingerprint:
858
- :sym: :ssh_host_rsa_key_fingerprint
989
+ SecurityGroupIds:
990
+ :sym: :security_group_ids
859
991
  :type: :string
860
992
  SshHostDsaKeyFingerprint:
861
993
  :sym: :ssh_host_dsa_key_fingerprint
862
994
  :type: :string
863
- CreatedAt:
864
- :sym: :created_at
995
+ SshHostRsaKeyFingerprint:
996
+ :sym: :ssh_host_rsa_key_fingerprint
865
997
  :type: :string
866
- LastServiceErrorId:
867
- :sym: :last_service_error_id
998
+ SshKeyName:
999
+ :sym: :ssh_key_name
868
1000
  :type: :string
869
- Architecture:
870
- :sym: :architecture
1001
+ StackId:
1002
+ :sym: :stack_id
871
1003
  :type: :string
872
- RootDeviceType:
873
- :sym: :root_device_type
1004
+ Status:
1005
+ :sym: :status
874
1006
  :type: :string
875
- RootDeviceVolumeId:
876
- :sym: :root_device_volume_id
1007
+ SubnetId:
1008
+ :sym: :subnet_id
1009
+ :type: :string
1010
+ VirtualizationType:
1011
+ :sym: :virtualization_type
877
1012
  :type: :string
878
- InstallUpdatesOnBoot:
879
- :sym: :install_updates_on_boot
880
- :type: :boolean
881
- EbsOptimized:
882
- :sym: :ebs_optimized
883
- :type: :boolean
884
1013
  - :name: DescribeLayers
885
1014
  :method: :describe_layers
886
1015
  :inputs:
@@ -1005,6 +1134,20 @@
1005
1134
  UseEbsOptimizedInstances:
1006
1135
  :sym: :use_ebs_optimized_instances
1007
1136
  :type: :boolean
1137
+ LifecycleEventConfiguration:
1138
+ :sym: :lifecycle_event_configuration
1139
+ :type: :hash
1140
+ :members:
1141
+ Shutdown:
1142
+ :sym: :shutdown
1143
+ :type: :hash
1144
+ :members:
1145
+ ExecutionTimeout:
1146
+ :sym: :execution_timeout
1147
+ :type: :integer
1148
+ DelayUntilElbConnectionsDrained:
1149
+ :sym: :delay_until_elb_connections_drained
1150
+ :type: :boolean
1008
1151
  - :name: DescribeLoadBasedAutoScaling
1009
1152
  :method: :describe_load_based_auto_scaling
1010
1153
  :inputs:
@@ -1045,6 +1188,9 @@
1045
1188
  LoadThreshold:
1046
1189
  :sym: :load_threshold
1047
1190
  :type: :float
1191
+ Alarms:
1192
+ :sym: :alarms
1193
+ :type: :string
1048
1194
  DownScaling:
1049
1195
  :sym: :down_scaling
1050
1196
  :type: :hash
@@ -1067,6 +1213,9 @@
1067
1213
  LoadThreshold:
1068
1214
  :sym: :load_threshold
1069
1215
  :type: :float
1216
+ Alarms:
1217
+ :sym: :alarms
1218
+ :type: :string
1070
1219
  - :name: DescribeMyUserProfile
1071
1220
  :method: :describe_my_user_profile
1072
1221
  :inputs: {}
@@ -1242,6 +1391,22 @@
1242
1391
  CreatedAt:
1243
1392
  :sym: :created_at
1244
1393
  :type: :string
1394
+ - :name: DescribeStackProvisioningParameters
1395
+ :method: :describe_stack_provisioning_parameters
1396
+ :inputs:
1397
+ StackId:
1398
+ - :string
1399
+ - :required
1400
+ :outputs:
1401
+ AgentInstallerUrl:
1402
+ :sym: :agent_installer_url
1403
+ :type: :string
1404
+ Parameters:
1405
+ :sym: :parameters
1406
+ :type: :map
1407
+ :members:
1408
+ :sym: :map_value
1409
+ :type: :string
1245
1410
  - :name: DescribeStackSummary
1246
1411
  :method: :describe_stack_summary
1247
1412
  :inputs:
@@ -1272,12 +1437,18 @@
1272
1437
  :sym: :instances_count
1273
1438
  :type: :hash
1274
1439
  :members:
1440
+ Assigning:
1441
+ :sym: :assigning
1442
+ :type: :integer
1275
1443
  Booting:
1276
1444
  :sym: :booting
1277
1445
  :type: :integer
1278
1446
  ConnectionLost:
1279
1447
  :sym: :connection_lost
1280
1448
  :type: :integer
1449
+ Deregistering:
1450
+ :sym: :deregistering
1451
+ :type: :integer
1281
1452
  Online:
1282
1453
  :sym: :online
1283
1454
  :type: :integer
@@ -1287,6 +1458,12 @@
1287
1458
  Rebooting:
1288
1459
  :sym: :rebooting
1289
1460
  :type: :integer
1461
+ Registered:
1462
+ :sym: :registered
1463
+ :type: :integer
1464
+ Registering:
1465
+ :sym: :registering
1466
+ :type: :integer
1290
1467
  Requested:
1291
1468
  :sym: :requested
1292
1469
  :type: :integer
@@ -1314,6 +1491,9 @@
1314
1491
  Terminating:
1315
1492
  :sym: :terminating
1316
1493
  :type: :integer
1494
+ Unassigning:
1495
+ :sym: :unassigning
1496
+ :type: :integer
1317
1497
  - :name: DescribeStacks
1318
1498
  :method: :describe_stacks
1319
1499
  :inputs:
@@ -1424,6 +1604,9 @@
1424
1604
  DefaultRootDeviceType:
1425
1605
  :sym: :default_root_device_type
1426
1606
  :type: :string
1607
+ AgentVersion:
1608
+ :sym: :agent_version
1609
+ :type: :string
1427
1610
  - :name: DescribeTimeBasedAutoScaling
1428
1611
  :method: :describe_time_based_auto_scaling
1429
1612
  :inputs:
@@ -1597,6 +1780,31 @@
1597
1780
  Hostname:
1598
1781
  :sym: :hostname
1599
1782
  :type: :string
1783
+ - :name: GrantAccess
1784
+ :method: :grant_access
1785
+ :inputs:
1786
+ InstanceId:
1787
+ - :string
1788
+ - :required
1789
+ ValidForInMinutes:
1790
+ - :integer
1791
+ :outputs:
1792
+ TemporaryCredential:
1793
+ :sym: :temporary_credential
1794
+ :type: :hash
1795
+ :members:
1796
+ Username:
1797
+ :sym: :username
1798
+ :type: :string
1799
+ Password:
1800
+ :sym: :password
1801
+ :type: :string
1802
+ ValidForInMinutes:
1803
+ :sym: :valid_for_in_minutes
1804
+ :type: :integer
1805
+ InstanceId:
1806
+ :sym: :instance_id
1807
+ :type: :string
1600
1808
  - :name: RebootInstance
1601
1809
  :method: :reboot_instance
1602
1810
  :inputs:
@@ -1617,6 +1825,32 @@
1617
1825
  ElasticIp:
1618
1826
  :sym: :elastic_ip
1619
1827
  :type: :string
1828
+ - :name: RegisterInstance
1829
+ :method: :register_instance
1830
+ :inputs:
1831
+ StackId:
1832
+ - :string
1833
+ - :required
1834
+ Hostname:
1835
+ - :string
1836
+ PublicIp:
1837
+ - :string
1838
+ PrivateIp:
1839
+ - :string
1840
+ RsaPublicKey:
1841
+ - :string
1842
+ RsaPublicKeyFingerprint:
1843
+ - :string
1844
+ InstanceIdentity:
1845
+ - :structure:
1846
+ Document:
1847
+ - :string
1848
+ Signature:
1849
+ - :string
1850
+ :outputs:
1851
+ InstanceId:
1852
+ :sym: :instance_id
1853
+ :type: :string
1620
1854
  - :name: RegisterRdsDbInstance
1621
1855
  :method: :register_rds_db_instance
1622
1856
  :inputs:
@@ -1667,6 +1901,9 @@
1667
1901
  - :double
1668
1902
  LoadThreshold:
1669
1903
  - :double
1904
+ Alarms:
1905
+ - :list:
1906
+ - :string
1670
1907
  DownScaling:
1671
1908
  - :structure:
1672
1909
  InstanceCount:
@@ -1681,6 +1918,9 @@
1681
1918
  - :double
1682
1919
  LoadThreshold:
1683
1920
  - :double
1921
+ Alarms:
1922
+ - :list:
1923
+ - :string
1684
1924
  :outputs: {}
1685
1925
  - :name: SetPermission
1686
1926
  :method: :set_permission
@@ -1777,6 +2017,13 @@
1777
2017
  - :string
1778
2018
  - :required
1779
2019
  :outputs: {}
2020
+ - :name: UnassignInstance
2021
+ :method: :unassign_instance
2022
+ :inputs:
2023
+ InstanceId:
2024
+ - :string
2025
+ - :required
2026
+ :outputs: {}
1780
2027
  - :name: UnassignVolume
1781
2028
  :method: :unassign_volume
1782
2029
  :inputs:
@@ -1888,6 +2135,8 @@
1888
2135
  - :boolean
1889
2136
  EbsOptimized:
1890
2137
  - :boolean
2138
+ AgentVersion:
2139
+ - :string
1891
2140
  :outputs: {}
1892
2141
  - :name: UpdateLayer
1893
2142
  :method: :update_layer
@@ -1958,6 +2207,14 @@
1958
2207
  - :boolean
1959
2208
  UseEbsOptimizedInstances:
1960
2209
  - :boolean
2210
+ LifecycleEventConfiguration:
2211
+ - :structure:
2212
+ Shutdown:
2213
+ - :structure:
2214
+ ExecutionTimeout:
2215
+ - :integer
2216
+ DelayUntilElbConnectionsDrained:
2217
+ - :boolean
1961
2218
  :outputs: {}
1962
2219
  - :name: UpdateMyUserProfile
1963
2220
  :method: :update_my_user_profile
@@ -2038,6 +2295,8 @@
2038
2295
  - :string
2039
2296
  UseOpsworksSecurityGroups:
2040
2297
  - :boolean
2298
+ AgentVersion:
2299
+ - :string
2041
2300
  :outputs: {}
2042
2301
  - :name: UpdateUserProfile
2043
2302
  :method: :update_user_profile
@@ -400,14 +400,22 @@ module AWS
400
400
  # `:access_key_id` or the `:secret_access_key` can not be found.
401
401
  #
402
402
  def credentials
403
- if @credentials_expiration && @credentials_expiration.utc <= (Time.now.utc + (15 * 60))
404
- refresh
405
- end
403
+ refresh if near_expiration?
406
404
  super
407
405
  end
408
406
 
409
407
  protected
410
408
 
409
+ def near_expiration?
410
+ if @credentials_expiration.nil?
411
+ true
412
+ elsif @credentials_expiration.utc <= (Time.now.utc + (15 * 60))
413
+ true
414
+ else
415
+ false
416
+ end
417
+ end
418
+
411
419
  # (see Provider#get_credentials)
412
420
  def get_credentials
413
421
  retries_left = retries
@@ -30,7 +30,9 @@ module AWS
30
30
 
31
31
  @route_table = route_table
32
32
 
33
- @destination_cidr_block = details.destination_cidr_block
33
+ if details[:destination_cidr_block]
34
+ @destination_cidr_block = details.destination_cidr_block
35
+ end
34
36
 
35
37
  if details[:gateway_id]
36
38
  @internet_gateway = InternetGateway.new(
@@ -19,19 +19,19 @@ module AWS
19
19
  # Represents a multipart upload to an S3 object. See
20
20
  # {S3Object#multipart_upload} for a convenient way to initiate a
21
21
  # multipart upload.
22
- #
23
- # Note: After you initiate multipart upload and upload one or more
24
- # parts, you must either complete or abort multipart upload in order
25
- # to stop getting charged for storage of the uploaded parts. Only
26
- # after you either complete or abort multipart upload, Amazon S3
27
- # frees up the parts storage and stops charging you for the parts
22
+ #
23
+ # Note: After you initiate multipart upload and upload one or more
24
+ # parts, you must either complete or abort multipart upload in order
25
+ # to stop getting charged for storage of the uploaded parts. Only
26
+ # after you either complete or abort multipart upload, Amazon S3
27
+ # frees up the parts storage and stops charging you for the parts
28
28
  # storage.
29
29
  class MultipartUpload
30
30
 
31
31
  include Core::Model
32
32
 
33
33
  class EmptyUploadError < StandardError; end
34
-
34
+
35
35
  # @api private
36
36
  def initialize(object, id, options = {})
37
37
  @id = id
@@ -207,10 +207,10 @@ module AWS
207
207
  @completed_mutex.synchronize do
208
208
  @completed_parts[part_number] = {
209
209
  :part_number => part_number,
210
- :etag => resp.etag
210
+ :etag => resp[:etag]
211
211
  }
212
212
  end
213
- UploadedPart.new(self, part_number)
213
+ UploadedPart.new(self, part_number, :etag => resp[:etag])
214
214
  end
215
215
 
216
216
  # Copies a part.
@@ -240,7 +240,7 @@ module AWS
240
240
  :etag => resp[:etag]
241
241
  }
242
242
  end
243
- UploadedPart.new(self, part_number)
243
+ UploadedPart.new(self, part_number, :etag => resp[:etag])
244
244
  end
245
245
 
246
246
  # Completes the upload by assembling previously uploaded
@@ -207,7 +207,7 @@ module AWS
207
207
  @content_length = range_value(opts[:content_length])
208
208
  @conditions = opts[:conditions] || {}
209
209
  @ignored_fields = [opts[:ignore]].flatten.compact
210
- @expires = opts[:expires]
210
+ @expires = opts[:expires] || Time.now.utc + 60*60
211
211
 
212
212
  super
213
213
 
@@ -397,17 +397,16 @@ module AWS
397
397
  # @api private
398
398
  private
399
399
  def format_expiration
400
- time = expires || Time.now.utc + 60*60
401
400
  time =
402
- case time
401
+ case expires
403
402
  when Time
404
- time
403
+ expires
405
404
  when DateTime
406
- Time.parse(time.to_s)
405
+ Time.parse(expires.to_s)
407
406
  when Integer
408
- (Time.now + time)
407
+ (Time.now + expires)
409
408
  when String
410
- Time.parse(time)
409
+ Time.parse(expires)
411
410
  end
412
411
  time.utc.iso8601
413
412
  end
@@ -13,5 +13,5 @@
13
13
 
14
14
  module AWS
15
15
  # Current version of the AWS SDK for Ruby
16
- VERSION = '1.64.0'
16
+ VERSION = '1.65.0'
17
17
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aws-sdk-v1
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.64.0
4
+ version: 1.65.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Amazon Web Services
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-04-03 00:00:00.000000000 Z
11
+ date: 2015-08-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: nokogiri