aws-sdk-core 2.0.0.rc4 → 2.0.0.rc5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (158) hide show
  1. checksums.yaml +4 -4
  2. data/apis/CloudFront-2013-11-11.json +5502 -0
  3. data/apis/CloudWatch-2010-08-01.json +186 -1
  4. data/apis/DirectConnect-2012-10-25.json +758 -140
  5. data/apis/DynamoDB-2012-08-10.json +860 -2
  6. data/apis/EC2-2013-10-15.json +14698 -0
  7. data/apis/EMR-2009-03-31.json +86 -0
  8. data/apis/ElastiCache-2013-06-15.json +13 -5
  9. data/apis/ElasticBeanstalk-2010-12-01.json +141 -16
  10. data/apis/ElasticLoadBalancing-2012-06-01.json +0 -72
  11. data/apis/IAM-2010-05-08.json +156 -0
  12. data/apis/Kinesis-2013-12-02.json +9 -1
  13. data/apis/OpsWorks-2013-02-18.json +180 -6
  14. data/apis/RDS-2013-02-12.json +2 -1
  15. data/apis/RDS-2013-09-09.json +7963 -0
  16. data/apis/Redshift-2012-12-01.json +3273 -702
  17. data/apis/Route53-2012-12-12.json +2 -2
  18. data/apis/S3-2006-03-01.json +579 -538
  19. data/apis/SNS-2010-03-31.json +14 -0
  20. data/apis/SQS-2012-11-05.json +43 -6
  21. data/apis/STS-2011-06-15.json +81 -0
  22. data/apis/StorageGateway-2013-06-30.json +28 -28
  23. data/apis/source/cloudformation-2010-05-15.json +199 -199
  24. data/apis/source/cloudfront-2013-11-11.json +8828 -0
  25. data/apis/source/cloudfront-2013-11-11.paginators.json +32 -0
  26. data/apis/source/cloudfront-2013-11-11.waiters.json +29 -0
  27. data/apis/source/cloudsearch-2011-02-01.json +16 -23
  28. data/apis/source/datapipeline-2012-10-29.paginators.json +3 -2
  29. data/apis/source/directconnect-2012-10-25.json +1302 -363
  30. data/apis/source/dynamodb-2011-12-05.paginators.json +4 -1
  31. data/apis/source/dynamodb-2011-12-05.waiters.json +27 -0
  32. data/apis/source/dynamodb-2012-08-10.json +1634 -417
  33. data/apis/source/dynamodb-2012-08-10.paginators.json +4 -1
  34. data/apis/source/dynamodb-2012-08-10.waiters.json +25 -0
  35. data/apis/source/ec2-2013-10-15.json +19911 -0
  36. data/apis/source/ec2-2013-10-15.paginators.json +126 -0
  37. data/apis/source/ec2-2013-10-15.waiters.json +146 -0
  38. data/apis/source/elasticache-2013-06-15.json +10 -8
  39. data/apis/source/elasticache-2013-06-15.paginators.json +8 -2
  40. data/apis/source/elasticbeanstalk-2010-12-01.json +186 -32
  41. data/apis/source/elasticloadbalancing-2012-06-01.json +166 -293
  42. data/apis/source/elasticmapreduce-2009-03-31.json +229 -134
  43. data/apis/source/elastictranscoder-2012-09-25.json +1 -1
  44. data/apis/source/glacier-2012-06-01.paginators.json +3 -3
  45. data/apis/source/glacier-2012-06-01.waiters.json +23 -0
  46. data/apis/source/iam-2010-05-08.json +1306 -626
  47. data/apis/source/iam-2010-05-08.paginators.json +3 -0
  48. data/apis/source/kinesis-2013-12-02.json +4 -4
  49. data/apis/source/kinesis-2013-12-02.paginators.json +10 -4
  50. data/apis/source/monitoring-2010-08-01.json +336 -28
  51. data/apis/source/opsworks-2013-02-18.json +385 -102
  52. data/apis/source/rds-2013-01-10.paginators.json +6 -2
  53. data/apis/source/rds-2013-02-12.paginators.json +6 -2
  54. data/apis/source/rds-2013-09-09.json +10658 -0
  55. data/apis/source/rds-2013-09-09.paginators.json +110 -0
  56. data/apis/source/rds-2013-09-09.waiters.json +36 -0
  57. data/apis/source/redshift-2012-12-01.json +4759 -1237
  58. data/apis/source/redshift-2012-12-01.paginators.json +20 -1
  59. data/apis/source/redshift-2012-12-01.waiters.json +43 -0
  60. data/apis/source/route53-2012-12-12.paginators.json +2 -2
  61. data/apis/source/s3-2006-03-01.json +1032 -985
  62. data/apis/source/s3-2006-03-01.paginators.json +14 -3
  63. data/apis/source/s3-2006-03-01.waiters.json +27 -0
  64. data/apis/source/sns-2010-03-31.paginators.json +10 -0
  65. data/apis/source/sqs-2012-11-05.json +153 -101
  66. data/apis/source/storagegateway-2013-06-30.json +403 -442
  67. data/apis/source/storagegateway-2013-06-30.paginators.json +24 -0
  68. data/apis/source/sts-2011-06-15.json +258 -75
  69. data/apis/source/support-2013-04-15.paginators.json +0 -6
  70. data/apis/source/swf-2012-01-25.paginators.json +7 -7
  71. data/features/autoscaling/client.feature +6 -10
  72. data/features/autoscaling/{setup.rb → step_definitions.rb} +1 -1
  73. data/features/cloudformation/client.feature +5 -6
  74. data/features/cloudformation/{setup.rb → step_definitions.rb} +1 -1
  75. data/features/cloudfront/client.feature +5 -9
  76. data/features/cloudfront/{setup.rb → step_definitions.rb} +1 -1
  77. data/features/cloudsearch/client.feature +4 -6
  78. data/features/cloudsearch/{setup.rb → step_definitions.rb} +1 -1
  79. data/features/cloudwatch/client.feature +7 -9
  80. data/features/cloudwatch/{setup.rb → step_definitions.rb} +1 -1
  81. data/features/datapipeline/client.feature +5 -7
  82. data/features/datapipeline/{setup.rb → step_definitions.rb} +1 -1
  83. data/features/directconnect/client.feature +5 -7
  84. data/features/directconnect/{setup.rb → step_definitions.rb} +1 -1
  85. data/features/dynamodb/client.feature +6 -10
  86. data/features/dynamodb/simplified.feature +5 -9
  87. data/features/dynamodb/step_definitions.rb +9 -1
  88. data/features/ec2/client.feature +4 -9
  89. data/features/ec2/step_definitions.rb +3 -16
  90. data/features/elasticache/client.feature +4 -6
  91. data/features/elasticache/{setup.rb → step_definitions.rb} +1 -1
  92. data/features/elasticbeanstalk/client.feature +4 -6
  93. data/features/elasticbeanstalk/{setup.rb → step_definitions.rb} +1 -1
  94. data/features/elasticloadbalancing/client.feature +4 -6
  95. data/features/elasticloadbalancing/{setup.rb → step_definitions.rb} +1 -1
  96. data/features/elastictranscoder/client.feature +4 -6
  97. data/features/elastictranscoder/{setup.rb → step_definitions.rb} +1 -1
  98. data/features/emr/client.feature +4 -6
  99. data/features/emr/{setup.rb → step_definitions.rb} +1 -1
  100. data/features/env.rb +0 -2
  101. data/features/glacier/client.feature +10 -34
  102. data/features/glacier/step_definitions.rb +25 -8
  103. data/features/glacier/upload.feature +27 -0
  104. data/features/iam/client.feature +4 -6
  105. data/features/iam/{setup.rb → step_definitions.rb} +1 -1
  106. data/features/importexport/client.feature +4 -6
  107. data/features/importexport/{setup.rb → step_definitions.rb} +1 -1
  108. data/features/kinesis/client.feature +4 -6
  109. data/features/kinesis/{setup.rb → step_definitions.rb} +1 -1
  110. data/features/opsworks/client.feature +4 -6
  111. data/features/opsworks/{setup.rb → step_definitions.rb} +1 -1
  112. data/features/rds/client.feature +4 -6
  113. data/features/rds/{setup.rb → step_definitions.rb} +1 -1
  114. data/features/redshift/client.feature +4 -6
  115. data/features/redshift/{setup.rb → step_definitions.rb} +1 -1
  116. data/features/route53/client.feature +4 -6
  117. data/features/route53/{setup.rb → step_definitions.rb} +1 -1
  118. data/features/s3/buckets.feature +8 -0
  119. data/features/s3/step_definitions.rb +42 -3
  120. data/features/sdb/client.feature +4 -6
  121. data/features/sdb/{setup.rb → step_definitions.rb} +1 -1
  122. data/features/ses/client.feature +4 -6
  123. data/features/ses/{setup.rb → step_definitions.rb} +1 -1
  124. data/features/sns/client.feature +5 -6
  125. data/features/sns/{setup.rb → step_definitions.rb} +1 -1
  126. data/features/sqs/client.feature +5 -7
  127. data/features/sqs/step_definitions.rb +11 -0
  128. data/features/step_definitions.rb +88 -0
  129. data/features/storagegateway/client.feature +4 -6
  130. data/features/storagegateway/{setup.rb → step_definitions.rb} +1 -1
  131. data/features/sts/client.feature +5 -6
  132. data/features/sts/{setup.rb → step_definitions.rb} +1 -1
  133. data/features/swf/client.feature +5 -9
  134. data/features/swf/{setup.rb → step_definitions.rb} +1 -1
  135. data/lib/aws/api/shape_translator.rb +1 -0
  136. data/lib/aws/errors.rb +35 -11
  137. data/lib/aws/plugins/credentials.rb +11 -5
  138. data/lib/aws/plugins/regional_endpoint.rb +7 -3
  139. data/lib/aws/plugins/s3_regional_endpoint.rb +0 -2
  140. data/lib/aws/request_handler.rb +8 -3
  141. data/lib/aws/signers/s3.rb +14 -18
  142. data/lib/aws/version.rb +1 -1
  143. data/spec/aws/errors_spec.rb +39 -0
  144. data/spec/aws/plugins/credentials_spec.rb +12 -0
  145. data/spec/aws/plugins/region_endpoint_spec.rb +16 -4
  146. data/spec/aws/plugins/retry_errors_spec.rb +26 -26
  147. data/spec/aws/service_spec.rb +1 -1
  148. data/spec/fixtures/operations/route53/change_resource_record_sets.yml +18 -0
  149. data/tasks/test.rake +6 -18
  150. data/vendor/seahorse/lib/seahorse/client/http/headers.rb +20 -0
  151. data/vendor/seahorse/tasks/test.rake +2 -15
  152. metadata +77 -64
  153. data/features/common/step_definitions.rb +0 -63
  154. data/features/dynamodb/setup.rb +0 -8
  155. data/features/ec2/setup.rb +0 -6
  156. data/features/glacier/setup.rb +0 -16
  157. data/features/s3/setup.rb +0 -17
  158. data/features/sqs/setup.rb +0 -10
@@ -681,7 +681,7 @@
681
681
  "metadata": {
682
682
  "paging": {
683
683
  "tokens": {
684
- "marker": "marker"
684
+ "marker": "next_marker"
685
685
  },
686
686
  "truncated_if": "is_truncated"
687
687
  }
@@ -776,7 +776,7 @@
776
776
  "metadata": {
777
777
  "paging": {
778
778
  "tokens": {
779
- "marker": "marker"
779
+ "marker": "next_marker"
780
780
  },
781
781
  "truncated_if": "is_truncated"
782
782
  }
@@ -117,26 +117,26 @@
117
117
  "output": {
118
118
  "type": "output",
119
119
  "members": {
120
- "location": {
121
- "type": "string",
122
- "serialized_name": "Location"
123
- },
124
120
  "bucket": {
125
121
  "type": "string",
126
122
  "serialized_name": "Bucket"
127
123
  },
128
- "key": {
124
+ "etag": {
129
125
  "type": "string",
130
- "serialized_name": "Key"
126
+ "serialized_name": "ETag"
131
127
  },
132
128
  "expiration": {
133
129
  "type": "rfc822_timestamp",
134
130
  "location": "header",
135
131
  "serialized_name": "x-amz-expiration"
136
132
  },
137
- "etag": {
133
+ "key": {
138
134
  "type": "string",
139
- "serialized_name": "ETag"
135
+ "serialized_name": "Key"
136
+ },
137
+ "location": {
138
+ "type": "string",
139
+ "serialized_name": "Location"
140
140
  },
141
141
  "server_side_encryption": {
142
142
  "type": "string",
@@ -321,15 +321,15 @@
321
321
  }
322
322
  }
323
323
  },
324
- "expiration": {
324
+ "copy_source_version_id": {
325
325
  "type": "string",
326
326
  "location": "header",
327
- "serialized_name": "x-amz-expiration"
327
+ "serialized_name": "x-amz-copy-source-version-id"
328
328
  },
329
- "copy_source_version_id": {
329
+ "expiration": {
330
330
  "type": "string",
331
331
  "location": "header",
332
- "serialized_name": "x-amz-copy-source-version-id"
332
+ "serialized_name": "x-amz-expiration"
333
333
  },
334
334
  "server_side_encryption": {
335
335
  "type": "string",
@@ -557,10 +557,6 @@
557
557
  "type": "string",
558
558
  "serialized_name": "Key"
559
559
  },
560
- "upload_id": {
561
- "type": "string",
562
- "serialized_name": "UploadId"
563
- },
564
560
  "server_side_encryption": {
565
561
  "type": "string",
566
562
  "location": "header",
@@ -568,6 +564,10 @@
568
564
  "enum": [
569
565
  "AES256"
570
566
  ]
567
+ },
568
+ "upload_id": {
569
+ "type": "string",
570
+ "serialized_name": "UploadId"
571
571
  }
572
572
  }
573
573
  }
@@ -768,14 +768,6 @@
768
768
  "members": {
769
769
  "type": "structure",
770
770
  "members": {
771
- "key": {
772
- "type": "string",
773
- "serialized_name": "Key"
774
- },
775
- "version_id": {
776
- "type": "string",
777
- "serialized_name": "VersionId"
778
- },
779
771
  "delete_marker": {
780
772
  "type": "boolean",
781
773
  "serialized_name": "DeleteMarker"
@@ -783,6 +775,14 @@
783
775
  "delete_marker_version_id": {
784
776
  "type": "string",
785
777
  "serialized_name": "DeleteMarkerVersionId"
778
+ },
779
+ "key": {
780
+ "type": "string",
781
+ "serialized_name": "Key"
782
+ },
783
+ "version_id": {
784
+ "type": "string",
785
+ "serialized_name": "VersionId"
786
786
  }
787
787
  }
788
788
  }
@@ -793,21 +793,21 @@
793
793
  "members": {
794
794
  "type": "structure",
795
795
  "members": {
796
- "key": {
797
- "type": "string",
798
- "serialized_name": "Key"
799
- },
800
- "version_id": {
801
- "type": "string",
802
- "serialized_name": "VersionId"
803
- },
804
796
  "code": {
805
797
  "type": "string",
806
798
  "serialized_name": "Code"
807
799
  },
800
+ "key": {
801
+ "type": "string",
802
+ "serialized_name": "Key"
803
+ },
808
804
  "message": {
809
805
  "type": "string",
810
806
  "serialized_name": "Message"
807
+ },
808
+ "version_id": {
809
+ "type": "string",
810
+ "serialized_name": "VersionId"
811
811
  }
812
812
  }
813
813
  }
@@ -832,20 +832,6 @@
832
832
  "output": {
833
833
  "type": "output",
834
834
  "members": {
835
- "owner": {
836
- "type": "structure",
837
- "serialized_name": "Owner",
838
- "members": {
839
- "id": {
840
- "type": "string",
841
- "serialized_name": "ID"
842
- },
843
- "display_name": {
844
- "type": "string",
845
- "serialized_name": "DisplayName"
846
- }
847
- }
848
- },
849
835
  "grants": {
850
836
  "type": "list",
851
837
  "serialized_name": "AccessControlList",
@@ -861,6 +847,18 @@
861
847
  "xmlns_prefix": "xsi"
862
848
  },
863
849
  "members": {
850
+ "display_name": {
851
+ "type": "string",
852
+ "serialized_name": "DisplayName"
853
+ },
854
+ "email_address": {
855
+ "type": "string",
856
+ "serialized_name": "EmailAddress"
857
+ },
858
+ "id": {
859
+ "type": "string",
860
+ "serialized_name": "ID"
861
+ },
864
862
  "type": {
865
863
  "type": "string",
866
864
  "serialized_name": "xsi:type",
@@ -873,18 +871,6 @@
873
871
  "Group"
874
872
  ]
875
873
  },
876
- "id": {
877
- "type": "string",
878
- "serialized_name": "ID"
879
- },
880
- "display_name": {
881
- "type": "string",
882
- "serialized_name": "DisplayName"
883
- },
884
- "email_address": {
885
- "type": "string",
886
- "serialized_name": "EmailAddress"
887
- },
888
874
  "uri": {
889
875
  "type": "string",
890
876
  "serialized_name": "URI"
@@ -904,6 +890,20 @@
904
890
  }
905
891
  }
906
892
  }
893
+ },
894
+ "owner": {
895
+ "type": "structure",
896
+ "serialized_name": "Owner",
897
+ "members": {
898
+ "display_name": {
899
+ "type": "string",
900
+ "serialized_name": "DisplayName"
901
+ },
902
+ "id": {
903
+ "type": "string",
904
+ "serialized_name": "ID"
905
+ }
906
+ }
907
907
  }
908
908
  }
909
909
  }
@@ -938,30 +938,30 @@
938
938
  "type": "string"
939
939
  }
940
940
  },
941
- "allowed_origins": {
941
+ "allowed_methods": {
942
942
  "type": "flat_list",
943
- "serialized_name": "AllowedOrigin",
943
+ "serialized_name": "AllowedMethod",
944
944
  "members": {
945
945
  "type": "string"
946
946
  }
947
947
  },
948
- "allowed_methods": {
948
+ "allowed_origins": {
949
949
  "type": "flat_list",
950
- "serialized_name": "AllowedMethod",
950
+ "serialized_name": "AllowedOrigin",
951
951
  "members": {
952
952
  "type": "string"
953
953
  }
954
954
  },
955
- "max_age_seconds": {
956
- "type": "integer",
957
- "serialized_name": "MaxAgeSeconds"
958
- },
959
955
  "expose_headers": {
960
956
  "type": "flat_list",
961
957
  "serialized_name": "ExposeHeader",
962
958
  "members": {
963
959
  "type": "string"
964
960
  }
961
+ },
962
+ "max_age_seconds": {
963
+ "type": "integer",
964
+ "serialized_name": "MaxAgeSeconds"
965
965
  }
966
966
  }
967
967
  }
@@ -992,6 +992,20 @@
992
992
  "members": {
993
993
  "type": "structure",
994
994
  "members": {
995
+ "expiration": {
996
+ "type": "structure",
997
+ "serialized_name": "Expiration",
998
+ "members": {
999
+ "date": {
1000
+ "type": "iso8601_timestamp",
1001
+ "serialized_name": "Date"
1002
+ },
1003
+ "days": {
1004
+ "type": "integer",
1005
+ "serialized_name": "Days"
1006
+ }
1007
+ }
1008
+ },
995
1009
  "id": {
996
1010
  "type": "string",
997
1011
  "serialized_name": "ID"
@@ -1012,14 +1026,14 @@
1012
1026
  "type": "structure",
1013
1027
  "serialized_name": "Transition",
1014
1028
  "members": {
1015
- "days": {
1016
- "type": "integer",
1017
- "serialized_name": "Days"
1018
- },
1019
1029
  "date": {
1020
1030
  "type": "iso8601_timestamp",
1021
1031
  "serialized_name": "Date"
1022
1032
  },
1033
+ "days": {
1034
+ "type": "integer",
1035
+ "serialized_name": "Days"
1036
+ },
1023
1037
  "storage_class": {
1024
1038
  "type": "string",
1025
1039
  "serialized_name": "StorageClass",
@@ -1030,20 +1044,6 @@
1030
1044
  ]
1031
1045
  }
1032
1046
  }
1033
- },
1034
- "expiration": {
1035
- "type": "structure",
1036
- "serialized_name": "Expiration",
1037
- "members": {
1038
- "days": {
1039
- "type": "integer",
1040
- "serialized_name": "Days"
1041
- },
1042
- "date": {
1043
- "type": "iso8601_timestamp",
1044
- "serialized_name": "Date"
1045
- }
1046
- }
1047
1047
  }
1048
1048
  }
1049
1049
  }
@@ -1100,10 +1100,6 @@
1100
1100
  "type": "string",
1101
1101
  "serialized_name": "TargetBucket"
1102
1102
  },
1103
- "target_prefix": {
1104
- "type": "string",
1105
- "serialized_name": "TargetPrefix"
1106
- },
1107
1103
  "target_grants": {
1108
1104
  "type": "list",
1109
1105
  "serialized_name": "TargetGrants",
@@ -1119,6 +1115,18 @@
1119
1115
  "xmlns_prefix": "xsi"
1120
1116
  },
1121
1117
  "members": {
1118
+ "display_name": {
1119
+ "type": "string",
1120
+ "serialized_name": "DisplayName"
1121
+ },
1122
+ "email_address": {
1123
+ "type": "string",
1124
+ "serialized_name": "EmailAddress"
1125
+ },
1126
+ "id": {
1127
+ "type": "string",
1128
+ "serialized_name": "ID"
1129
+ },
1122
1130
  "type": {
1123
1131
  "type": "string",
1124
1132
  "serialized_name": "xsi:type",
@@ -1131,18 +1139,6 @@
1131
1139
  "Group"
1132
1140
  ]
1133
1141
  },
1134
- "id": {
1135
- "type": "string",
1136
- "serialized_name": "ID"
1137
- },
1138
- "display_name": {
1139
- "type": "string",
1140
- "serialized_name": "DisplayName"
1141
- },
1142
- "email_address": {
1143
- "type": "string",
1144
- "serialized_name": "EmailAddress"
1145
- },
1146
1142
  "uri": {
1147
1143
  "type": "string",
1148
1144
  "serialized_name": "URI"
@@ -1155,6 +1151,10 @@
1155
1151
  }
1156
1152
  }
1157
1153
  }
1154
+ },
1155
+ "target_prefix": {
1156
+ "type": "string",
1157
+ "serialized_name": "TargetPrefix"
1158
1158
  }
1159
1159
  }
1160
1160
  }
@@ -1182,16 +1182,16 @@
1182
1182
  "type": "structure",
1183
1183
  "serialized_name": "TopicConfiguration",
1184
1184
  "members": {
1185
- "topic": {
1186
- "type": "string",
1187
- "serialized_name": "Topic"
1188
- },
1189
1185
  "event": {
1190
1186
  "type": "string",
1191
1187
  "serialized_name": "Event",
1192
1188
  "enum": [
1193
1189
  "s3:ReducedRedundancyLostObject"
1194
1190
  ]
1191
+ },
1192
+ "topic": {
1193
+ "type": "string",
1194
+ "serialized_name": "Topic"
1195
1195
  }
1196
1196
  }
1197
1197
  }
@@ -1306,20 +1306,20 @@
1306
1306
  "output": {
1307
1307
  "type": "output",
1308
1308
  "members": {
1309
- "status": {
1309
+ "mfa_delete": {
1310
1310
  "type": "string",
1311
- "serialized_name": "Status",
1311
+ "serialized_name": "MFADelete",
1312
1312
  "enum": [
1313
1313
  "Enabled",
1314
- "Suspended"
1314
+ "Disabled"
1315
1315
  ]
1316
1316
  },
1317
- "mfa_delete": {
1317
+ "status": {
1318
1318
  "type": "string",
1319
- "serialized_name": "MFADelete",
1319
+ "serialized_name": "Status",
1320
1320
  "enum": [
1321
1321
  "Enabled",
1322
- "Disabled"
1322
+ "Suspended"
1323
1323
  ]
1324
1324
  }
1325
1325
  }
@@ -1342,21 +1342,13 @@
1342
1342
  "output": {
1343
1343
  "type": "output",
1344
1344
  "members": {
1345
- "redirect_all_requests_to": {
1345
+ "error_document": {
1346
1346
  "type": "structure",
1347
- "serialized_name": "RedirectAllRequestsTo",
1347
+ "serialized_name": "ErrorDocument",
1348
1348
  "members": {
1349
- "host_name": {
1350
- "type": "string",
1351
- "serialized_name": "HostName"
1352
- },
1353
- "protocol": {
1349
+ "key": {
1354
1350
  "type": "string",
1355
- "serialized_name": "Protocol",
1356
- "enum": [
1357
- "http",
1358
- "https"
1359
- ]
1351
+ "serialized_name": "Key"
1360
1352
  }
1361
1353
  }
1362
1354
  },
@@ -1370,13 +1362,21 @@
1370
1362
  }
1371
1363
  }
1372
1364
  },
1373
- "error_document": {
1365
+ "redirect_all_requests_to": {
1374
1366
  "type": "structure",
1375
- "serialized_name": "ErrorDocument",
1367
+ "serialized_name": "RedirectAllRequestsTo",
1376
1368
  "members": {
1377
- "key": {
1369
+ "host_name": {
1378
1370
  "type": "string",
1379
- "serialized_name": "Key"
1371
+ "serialized_name": "HostName"
1372
+ },
1373
+ "protocol": {
1374
+ "type": "string",
1375
+ "serialized_name": "Protocol",
1376
+ "enum": [
1377
+ "http",
1378
+ "https"
1379
+ ]
1380
1380
  }
1381
1381
  }
1382
1382
  },
@@ -1391,13 +1391,13 @@
1391
1391
  "type": "structure",
1392
1392
  "serialized_name": "Condition",
1393
1393
  "members": {
1394
- "key_prefix_equals": {
1395
- "type": "string",
1396
- "serialized_name": "KeyPrefixEquals"
1397
- },
1398
1394
  "http_error_code_returned_equals": {
1399
1395
  "type": "string",
1400
1396
  "serialized_name": "HttpErrorCodeReturnedEquals"
1397
+ },
1398
+ "key_prefix_equals": {
1399
+ "type": "string",
1400
+ "serialized_name": "KeyPrefixEquals"
1401
1401
  }
1402
1402
  }
1403
1403
  },
@@ -1409,14 +1409,6 @@
1409
1409
  "type": "string",
1410
1410
  "serialized_name": "HostName"
1411
1411
  },
1412
- "replace_key_prefix_with": {
1413
- "type": "string",
1414
- "serialized_name": "ReplaceKeyPrefixWith"
1415
- },
1416
- "replace_key_with": {
1417
- "type": "string",
1418
- "serialized_name": "ReplaceKeyWith"
1419
- },
1420
1412
  "http_redirect_code": {
1421
1413
  "type": "string",
1422
1414
  "serialized_name": "HttpRedirectCode"
@@ -1428,6 +1420,14 @@
1428
1420
  "http",
1429
1421
  "https"
1430
1422
  ]
1423
+ },
1424
+ "replace_key_prefix_with": {
1425
+ "type": "string",
1426
+ "serialized_name": "ReplaceKeyPrefixWith"
1427
+ },
1428
+ "replace_key_with": {
1429
+ "type": "string",
1430
+ "serialized_name": "ReplaceKeyWith"
1431
1431
  }
1432
1432
  }
1433
1433
  }
@@ -1512,89 +1512,90 @@
1512
1512
  "output": {
1513
1513
  "type": "output",
1514
1514
  "members": {
1515
+ "accept_ranges": {
1516
+ "type": "string",
1517
+ "location": "header",
1518
+ "serialized_name": "accept-ranges"
1519
+ },
1515
1520
  "body": {
1516
1521
  "type": "blob",
1517
1522
  "serialized_name": "Body"
1518
1523
  },
1519
- "delete_marker": {
1520
- "type": "boolean",
1521
- "location": "header",
1522
- "serialized_name": "x-amz-delete-marker"
1523
- },
1524
- "accept_ranges": {
1524
+ "cache_control": {
1525
1525
  "type": "string",
1526
1526
  "location": "header",
1527
- "serialized_name": "accept-ranges"
1527
+ "serialized_name": "Cache-Control"
1528
1528
  },
1529
- "expiration": {
1529
+ "content_disposition": {
1530
1530
  "type": "string",
1531
1531
  "location": "header",
1532
- "serialized_name": "x-amz-expiration"
1532
+ "serialized_name": "Content-Disposition"
1533
1533
  },
1534
- "restore": {
1534
+ "content_encoding": {
1535
1535
  "type": "string",
1536
1536
  "location": "header",
1537
- "serialized_name": "x-amz-restore"
1537
+ "serialized_name": "Content-Encoding"
1538
1538
  },
1539
- "last_modified": {
1540
- "type": "rfc822_timestamp",
1539
+ "content_language": {
1540
+ "type": "string",
1541
1541
  "location": "header",
1542
- "serialized_name": "Last-Modified"
1542
+ "serialized_name": "Content-Language"
1543
1543
  },
1544
1544
  "content_length": {
1545
1545
  "type": "integer",
1546
1546
  "location": "header",
1547
1547
  "serialized_name": "Content-Length"
1548
1548
  },
1549
- "etag": {
1549
+ "content_type": {
1550
1550
  "type": "string",
1551
1551
  "location": "header",
1552
- "serialized_name": "ETag"
1553
- },
1554
- "missing_meta": {
1555
- "type": "integer",
1556
- "location": "header",
1557
- "serialized_name": "x-amz-missing-meta"
1552
+ "serialized_name": "Content-Type"
1558
1553
  },
1559
- "version_id": {
1560
- "type": "string",
1554
+ "delete_marker": {
1555
+ "type": "boolean",
1561
1556
  "location": "header",
1562
- "serialized_name": "x-amz-version-id"
1557
+ "serialized_name": "x-amz-delete-marker"
1563
1558
  },
1564
- "cache_control": {
1559
+ "etag": {
1565
1560
  "type": "string",
1566
1561
  "location": "header",
1567
- "serialized_name": "Cache-Control"
1562
+ "serialized_name": "ETag"
1568
1563
  },
1569
- "content_disposition": {
1564
+ "expiration": {
1570
1565
  "type": "string",
1571
1566
  "location": "header",
1572
- "serialized_name": "Content-Disposition"
1567
+ "serialized_name": "x-amz-expiration"
1573
1568
  },
1574
- "content_encoding": {
1575
- "type": "string",
1569
+ "expires": {
1570
+ "type": "rfc822_timestamp",
1576
1571
  "location": "header",
1577
- "serialized_name": "Content-Encoding"
1572
+ "serialized_name": "Expires"
1578
1573
  },
1579
- "content_language": {
1580
- "type": "string",
1574
+ "last_modified": {
1575
+ "type": "rfc822_timestamp",
1581
1576
  "location": "header",
1582
- "serialized_name": "Content-Language"
1577
+ "serialized_name": "Last-Modified"
1583
1578
  },
1584
- "content_type": {
1585
- "type": "string",
1579
+ "metadata": {
1580
+ "type": "map",
1586
1581
  "location": "header",
1587
- "serialized_name": "Content-Type"
1582
+ "serialized_name": "x-amz-meta-",
1583
+ "keys": {
1584
+ "type": "string"
1585
+ },
1586
+ "members": {
1587
+ "type": "string"
1588
+ }
1588
1589
  },
1589
- "expires": {
1590
- "type": "rfc822_timestamp",
1590
+ "missing_meta": {
1591
+ "type": "integer",
1591
1592
  "location": "header",
1592
- "serialized_name": "Expires"
1593
+ "serialized_name": "x-amz-missing-meta"
1593
1594
  },
1594
- "website_redirect_location": {
1595
+ "restore": {
1595
1596
  "type": "string",
1596
1597
  "location": "header",
1597
- "serialized_name": "x-amz-website-redirect-location"
1598
+ "serialized_name": "x-amz-restore"
1598
1599
  },
1599
1600
  "server_side_encryption": {
1600
1601
  "type": "string",
@@ -1604,16 +1605,15 @@
1604
1605
  "AES256"
1605
1606
  ]
1606
1607
  },
1607
- "metadata": {
1608
- "type": "map",
1608
+ "version_id": {
1609
+ "type": "string",
1609
1610
  "location": "header",
1610
- "serialized_name": "x-amz-meta-",
1611
- "keys": {
1612
- "type": "string"
1613
- },
1614
- "members": {
1615
- "type": "string"
1616
- }
1611
+ "serialized_name": "x-amz-version-id"
1612
+ },
1613
+ "website_redirect_location": {
1614
+ "type": "string",
1615
+ "location": "header",
1616
+ "serialized_name": "x-amz-website-redirect-location"
1617
1617
  }
1618
1618
  },
1619
1619
  "payload": "body"
@@ -1645,20 +1645,6 @@
1645
1645
  "output": {
1646
1646
  "type": "output",
1647
1647
  "members": {
1648
- "owner": {
1649
- "type": "structure",
1650
- "serialized_name": "Owner",
1651
- "members": {
1652
- "id": {
1653
- "type": "string",
1654
- "serialized_name": "ID"
1655
- },
1656
- "display_name": {
1657
- "type": "string",
1658
- "serialized_name": "DisplayName"
1659
- }
1660
- }
1661
- },
1662
1648
  "grants": {
1663
1649
  "type": "list",
1664
1650
  "serialized_name": "AccessControlList",
@@ -1674,6 +1660,18 @@
1674
1660
  "xmlns_prefix": "xsi"
1675
1661
  },
1676
1662
  "members": {
1663
+ "display_name": {
1664
+ "type": "string",
1665
+ "serialized_name": "DisplayName"
1666
+ },
1667
+ "email_address": {
1668
+ "type": "string",
1669
+ "serialized_name": "EmailAddress"
1670
+ },
1671
+ "id": {
1672
+ "type": "string",
1673
+ "serialized_name": "ID"
1674
+ },
1677
1675
  "type": {
1678
1676
  "type": "string",
1679
1677
  "serialized_name": "xsi:type",
@@ -1686,18 +1684,6 @@
1686
1684
  "Group"
1687
1685
  ]
1688
1686
  },
1689
- "id": {
1690
- "type": "string",
1691
- "serialized_name": "ID"
1692
- },
1693
- "display_name": {
1694
- "type": "string",
1695
- "serialized_name": "DisplayName"
1696
- },
1697
- "email_address": {
1698
- "type": "string",
1699
- "serialized_name": "EmailAddress"
1700
- },
1701
1687
  "uri": {
1702
1688
  "type": "string",
1703
1689
  "serialized_name": "URI"
@@ -1717,6 +1703,20 @@
1717
1703
  }
1718
1704
  }
1719
1705
  }
1706
+ },
1707
+ "owner": {
1708
+ "type": "structure",
1709
+ "serialized_name": "Owner",
1710
+ "members": {
1711
+ "display_name": {
1712
+ "type": "string",
1713
+ "serialized_name": "DisplayName"
1714
+ },
1715
+ "id": {
1716
+ "type": "string",
1717
+ "serialized_name": "ID"
1718
+ }
1719
+ }
1720
1720
  }
1721
1721
  }
1722
1722
  }
@@ -1817,51 +1817,11 @@
1817
1817
  "output": {
1818
1818
  "type": "output",
1819
1819
  "members": {
1820
- "delete_marker": {
1821
- "type": "boolean",
1822
- "location": "header",
1823
- "serialized_name": "x-amz-delete-marker"
1824
- },
1825
1820
  "accept_ranges": {
1826
1821
  "type": "string",
1827
1822
  "location": "header",
1828
1823
  "serialized_name": "accept-ranges"
1829
1824
  },
1830
- "expiration": {
1831
- "type": "string",
1832
- "location": "header",
1833
- "serialized_name": "x-amz-expiration"
1834
- },
1835
- "restore": {
1836
- "type": "string",
1837
- "location": "header",
1838
- "serialized_name": "x-amz-restore"
1839
- },
1840
- "last_modified": {
1841
- "type": "rfc822_timestamp",
1842
- "location": "header",
1843
- "serialized_name": "Last-Modified"
1844
- },
1845
- "content_length": {
1846
- "type": "integer",
1847
- "location": "header",
1848
- "serialized_name": "Content-Length"
1849
- },
1850
- "etag": {
1851
- "type": "string",
1852
- "location": "header",
1853
- "serialized_name": "ETag"
1854
- },
1855
- "missing_meta": {
1856
- "type": "integer",
1857
- "location": "header",
1858
- "serialized_name": "x-amz-missing-meta"
1859
- },
1860
- "version_id": {
1861
- "type": "string",
1862
- "location": "header",
1863
- "serialized_name": "x-amz-version-id"
1864
- },
1865
1825
  "cache_control": {
1866
1826
  "type": "string",
1867
1827
  "location": "header",
@@ -1882,28 +1842,40 @@
1882
1842
  "location": "header",
1883
1843
  "serialized_name": "Content-Language"
1884
1844
  },
1845
+ "content_length": {
1846
+ "type": "integer",
1847
+ "location": "header",
1848
+ "serialized_name": "Content-Length"
1849
+ },
1885
1850
  "content_type": {
1886
1851
  "type": "string",
1887
1852
  "location": "header",
1888
1853
  "serialized_name": "Content-Type"
1889
1854
  },
1890
- "expires": {
1891
- "type": "rfc822_timestamp",
1855
+ "delete_marker": {
1856
+ "type": "boolean",
1892
1857
  "location": "header",
1893
- "serialized_name": "Expires"
1858
+ "serialized_name": "x-amz-delete-marker"
1894
1859
  },
1895
- "website_redirect_location": {
1860
+ "etag": {
1896
1861
  "type": "string",
1897
1862
  "location": "header",
1898
- "serialized_name": "x-amz-website-redirect-location"
1863
+ "serialized_name": "ETag"
1899
1864
  },
1900
- "server_side_encryption": {
1865
+ "expiration": {
1901
1866
  "type": "string",
1902
1867
  "location": "header",
1903
- "serialized_name": "x-amz-server-side-encryption",
1904
- "enum": [
1905
- "AES256"
1906
- ]
1868
+ "serialized_name": "x-amz-expiration"
1869
+ },
1870
+ "expires": {
1871
+ "type": "rfc822_timestamp",
1872
+ "location": "header",
1873
+ "serialized_name": "Expires"
1874
+ },
1875
+ "last_modified": {
1876
+ "type": "rfc822_timestamp",
1877
+ "location": "header",
1878
+ "serialized_name": "Last-Modified"
1907
1879
  },
1908
1880
  "metadata": {
1909
1881
  "type": "map",
@@ -1915,16 +1887,44 @@
1915
1887
  "members": {
1916
1888
  "type": "string"
1917
1889
  }
1918
- }
1919
- }
1920
- }
1921
- },
1922
- "list_buckets": {
1923
- "name": "ListBuckets",
1924
- "http_method": "GET",
1925
- "http_path": "/",
1926
- "output": {
1927
- "type": "output",
1890
+ },
1891
+ "missing_meta": {
1892
+ "type": "integer",
1893
+ "location": "header",
1894
+ "serialized_name": "x-amz-missing-meta"
1895
+ },
1896
+ "restore": {
1897
+ "type": "string",
1898
+ "location": "header",
1899
+ "serialized_name": "x-amz-restore"
1900
+ },
1901
+ "server_side_encryption": {
1902
+ "type": "string",
1903
+ "location": "header",
1904
+ "serialized_name": "x-amz-server-side-encryption",
1905
+ "enum": [
1906
+ "AES256"
1907
+ ]
1908
+ },
1909
+ "version_id": {
1910
+ "type": "string",
1911
+ "location": "header",
1912
+ "serialized_name": "x-amz-version-id"
1913
+ },
1914
+ "website_redirect_location": {
1915
+ "type": "string",
1916
+ "location": "header",
1917
+ "serialized_name": "x-amz-website-redirect-location"
1918
+ }
1919
+ }
1920
+ }
1921
+ },
1922
+ "list_buckets": {
1923
+ "name": "ListBuckets",
1924
+ "http_method": "GET",
1925
+ "http_path": "/",
1926
+ "output": {
1927
+ "type": "output",
1928
1928
  "members": {
1929
1929
  "buckets": {
1930
1930
  "type": "list",
@@ -1933,13 +1933,13 @@
1933
1933
  "type": "structure",
1934
1934
  "serialized_name": "Bucket",
1935
1935
  "members": {
1936
- "name": {
1937
- "type": "string",
1938
- "serialized_name": "Name"
1939
- },
1940
1936
  "creation_date": {
1941
1937
  "type": "rfc822_timestamp",
1942
1938
  "serialized_name": "CreationDate"
1939
+ },
1940
+ "name": {
1941
+ "type": "string",
1942
+ "serialized_name": "Name"
1943
1943
  }
1944
1944
  }
1945
1945
  }
@@ -1948,13 +1948,13 @@
1948
1948
  "type": "structure",
1949
1949
  "serialized_name": "Owner",
1950
1950
  "members": {
1951
- "id": {
1952
- "type": "string",
1953
- "serialized_name": "ID"
1954
- },
1955
1951
  "display_name": {
1956
1952
  "type": "string",
1957
1953
  "serialized_name": "DisplayName"
1954
+ },
1955
+ "id": {
1956
+ "type": "string",
1957
+ "serialized_name": "ID"
1958
1958
  }
1959
1959
  }
1960
1960
  }
@@ -1964,7 +1964,7 @@
1964
1964
  "list_multipart_uploads": {
1965
1965
  "name": "ListMultipartUploads",
1966
1966
  "http_method": "GET",
1967
- "http_path": "/{bucket}?uploads&prefix={prefix}&delimiter={delimiter}&max-uploads={max_uploads}&key-marker={key_marker}&upload-id-marker={upload_id_marker}",
1967
+ "http_path": "/{bucket}?uploads&prefix={prefix}&delimiter={delimiter}&max-uploads={max_uploads}&key-marker={key_marker}&upload-id-marker={upload_id_marker}&encoding-type={encoding_type}",
1968
1968
  "metadata": {
1969
1969
  "paging": {
1970
1970
  "tokens": {
@@ -1986,6 +1986,13 @@
1986
1986
  "type": "string",
1987
1987
  "location": "uri"
1988
1988
  },
1989
+ "encoding_type": {
1990
+ "type": "string",
1991
+ "location": "uri",
1992
+ "enum": [
1993
+ "url"
1994
+ ]
1995
+ },
1989
1996
  "key_marker": {
1990
1997
  "type": "string",
1991
1998
  "location": "uri"
@@ -2011,33 +2018,51 @@
2011
2018
  "type": "string",
2012
2019
  "serialized_name": "Bucket"
2013
2020
  },
2021
+ "common_prefixes": {
2022
+ "type": "flat_list",
2023
+ "serialized_name": "CommonPrefixes",
2024
+ "members": {
2025
+ "type": "structure",
2026
+ "members": {
2027
+ "prefix": {
2028
+ "type": "string",
2029
+ "serialized_name": "Prefix"
2030
+ }
2031
+ }
2032
+ }
2033
+ },
2034
+ "encoding_type": {
2035
+ "type": "string",
2036
+ "location": "header",
2037
+ "serialized_name": "Encoding-Type"
2038
+ },
2039
+ "is_truncated": {
2040
+ "type": "boolean",
2041
+ "serialized_name": "IsTruncated"
2042
+ },
2014
2043
  "key_marker": {
2015
2044
  "type": "string",
2016
2045
  "serialized_name": "KeyMarker"
2017
2046
  },
2018
- "upload_id_marker": {
2019
- "type": "string",
2020
- "serialized_name": "UploadIdMarker"
2047
+ "max_uploads": {
2048
+ "type": "integer",
2049
+ "serialized_name": "MaxUploads"
2021
2050
  },
2022
2051
  "next_key_marker": {
2023
2052
  "type": "string",
2024
2053
  "serialized_name": "NextKeyMarker"
2025
2054
  },
2026
- "prefix": {
2027
- "type": "string",
2028
- "serialized_name": "Prefix"
2029
- },
2030
2055
  "next_upload_id_marker": {
2031
2056
  "type": "string",
2032
2057
  "serialized_name": "NextUploadIdMarker"
2033
2058
  },
2034
- "max_uploads": {
2035
- "type": "integer",
2036
- "serialized_name": "MaxUploads"
2059
+ "prefix": {
2060
+ "type": "string",
2061
+ "serialized_name": "Prefix"
2037
2062
  },
2038
- "is_truncated": {
2039
- "type": "boolean",
2040
- "serialized_name": "IsTruncated"
2063
+ "upload_id_marker": {
2064
+ "type": "string",
2065
+ "serialized_name": "UploadIdMarker"
2041
2066
  },
2042
2067
  "uploads": {
2043
2068
  "type": "flat_list",
@@ -2045,67 +2070,54 @@
2045
2070
  "members": {
2046
2071
  "type": "structure",
2047
2072
  "members": {
2048
- "upload_id": {
2049
- "type": "string",
2050
- "serialized_name": "UploadId"
2051
- },
2052
- "key": {
2053
- "type": "string",
2054
- "serialized_name": "Key"
2055
- },
2056
2073
  "initiated": {
2057
2074
  "type": "rfc822_timestamp",
2058
2075
  "serialized_name": "Initiated"
2059
2076
  },
2060
- "storage_class": {
2061
- "type": "string",
2062
- "serialized_name": "StorageClass",
2063
- "enum": [
2064
- "STANDARD",
2065
- "REDUCED_REDUNDANCY",
2066
- "GLACIER"
2067
- ]
2068
- },
2069
- "owner": {
2077
+ "initiator": {
2070
2078
  "type": "structure",
2071
- "serialized_name": "Owner",
2079
+ "serialized_name": "Initiator",
2072
2080
  "members": {
2073
- "id": {
2074
- "type": "string",
2075
- "serialized_name": "ID"
2076
- },
2077
2081
  "display_name": {
2078
2082
  "type": "string",
2079
2083
  "serialized_name": "DisplayName"
2084
+ },
2085
+ "id": {
2086
+ "type": "string",
2087
+ "serialized_name": "ID"
2080
2088
  }
2081
2089
  }
2082
2090
  },
2083
- "initiator": {
2091
+ "key": {
2092
+ "type": "string",
2093
+ "serialized_name": "Key"
2094
+ },
2095
+ "owner": {
2084
2096
  "type": "structure",
2085
- "serialized_name": "Initiator",
2097
+ "serialized_name": "Owner",
2086
2098
  "members": {
2087
- "id": {
2088
- "type": "string",
2089
- "serialized_name": "ID"
2090
- },
2091
2099
  "display_name": {
2092
2100
  "type": "string",
2093
2101
  "serialized_name": "DisplayName"
2102
+ },
2103
+ "id": {
2104
+ "type": "string",
2105
+ "serialized_name": "ID"
2094
2106
  }
2095
2107
  }
2096
- }
2097
- }
2098
- }
2099
- },
2100
- "common_prefixes": {
2101
- "type": "flat_list",
2102
- "serialized_name": "CommonPrefixes",
2103
- "members": {
2104
- "type": "structure",
2105
- "members": {
2106
- "prefix": {
2108
+ },
2109
+ "storage_class": {
2107
2110
  "type": "string",
2108
- "serialized_name": "Prefix"
2111
+ "serialized_name": "StorageClass",
2112
+ "enum": [
2113
+ "STANDARD",
2114
+ "REDUCED_REDUNDANCY",
2115
+ "GLACIER"
2116
+ ]
2117
+ },
2118
+ "upload_id": {
2119
+ "type": "string",
2120
+ "serialized_name": "UploadId"
2109
2121
  }
2110
2122
  }
2111
2123
  }
@@ -2116,7 +2128,7 @@
2116
2128
  "list_object_versions": {
2117
2129
  "name": "ListObjectVersions",
2118
2130
  "http_method": "GET",
2119
- "http_path": "/{bucket}?versions&delimiter={delimiter}&key-marker={key_marker}&max-keys={max_keys}&prefix={prefix}&version-id-marker={version_id_marker}",
2131
+ "http_path": "/{bucket}?versions&delimiter={delimiter}&key-marker={key_marker}&max-keys={max_keys}&prefix={prefix}&version-id-marker={version_id_marker}&encoding-type={encoding_type}",
2120
2132
  "metadata": {
2121
2133
  "paging": {
2122
2134
  "tokens": {
@@ -2138,6 +2150,13 @@
2138
2150
  "type": "string",
2139
2151
  "location": "uri"
2140
2152
  },
2153
+ "encoding_type": {
2154
+ "type": "string",
2155
+ "location": "uri",
2156
+ "enum": [
2157
+ "url"
2158
+ ]
2159
+ },
2141
2160
  "key_marker": {
2142
2161
  "type": "string",
2143
2162
  "location": "uri"
@@ -2159,61 +2178,33 @@
2159
2178
  "output": {
2160
2179
  "type": "output",
2161
2180
  "members": {
2162
- "is_truncated": {
2163
- "type": "boolean",
2164
- "serialized_name": "IsTruncated"
2165
- },
2166
- "key_marker": {
2167
- "type": "string",
2168
- "serialized_name": "KeyMarker"
2169
- },
2170
- "version_id_marker": {
2171
- "type": "string",
2172
- "serialized_name": "VersionIdMarker"
2173
- },
2174
- "next_key_marker": {
2175
- "type": "string",
2176
- "serialized_name": "NextKeyMarker"
2177
- },
2178
- "next_version_id_marker": {
2179
- "type": "string",
2180
- "serialized_name": "NextVersionIdMarker"
2181
- },
2182
- "versions": {
2181
+ "common_prefixes": {
2183
2182
  "type": "flat_list",
2184
- "serialized_name": "Version",
2183
+ "serialized_name": "CommonPrefixes",
2185
2184
  "members": {
2186
2185
  "type": "structure",
2187
2186
  "members": {
2188
- "etag": {
2189
- "type": "string",
2190
- "serialized_name": "ETag"
2191
- },
2192
- "size": {
2193
- "type": "string",
2194
- "serialized_name": "Size"
2195
- },
2196
- "storage_class": {
2187
+ "prefix": {
2197
2188
  "type": "string",
2198
- "serialized_name": "StorageClass",
2199
- "enum": [
2200
- "STANDARD",
2201
- "REDUCED_REDUNDANCY",
2202
- "GLACIER"
2203
- ]
2189
+ "serialized_name": "Prefix"
2190
+ }
2191
+ }
2192
+ }
2193
+ },
2194
+ "delete_markers": {
2195
+ "type": "flat_list",
2196
+ "serialized_name": "DeleteMarker",
2197
+ "members": {
2198
+ "type": "structure",
2199
+ "members": {
2200
+ "is_latest": {
2201
+ "type": "boolean",
2202
+ "serialized_name": "IsLatest"
2204
2203
  },
2205
2204
  "key": {
2206
2205
  "type": "string",
2207
2206
  "serialized_name": "Key"
2208
2207
  },
2209
- "version_id": {
2210
- "type": "string",
2211
- "serialized_name": "VersionId"
2212
- },
2213
- "is_latest": {
2214
- "type": "boolean",
2215
- "serialized_name": "IsLatest"
2216
- },
2217
2208
  "last_modified": {
2218
2209
  "type": "rfc822_timestamp",
2219
2210
  "serialized_name": "LastModified"
@@ -2222,79 +2213,112 @@
2222
2213
  "type": "structure",
2223
2214
  "serialized_name": "Owner",
2224
2215
  "members": {
2225
- "id": {
2226
- "type": "string",
2227
- "serialized_name": "ID"
2228
- },
2229
2216
  "display_name": {
2230
2217
  "type": "string",
2231
2218
  "serialized_name": "DisplayName"
2232
- }
2233
- }
2234
- }
2235
- }
2236
- }
2237
- },
2238
- "delete_markers": {
2239
- "type": "flat_list",
2240
- "serialized_name": "DeleteMarker",
2241
- "members": {
2242
- "type": "structure",
2243
- "members": {
2244
- "owner": {
2245
- "type": "structure",
2246
- "serialized_name": "Owner",
2247
- "members": {
2219
+ },
2248
2220
  "id": {
2249
2221
  "type": "string",
2250
2222
  "serialized_name": "ID"
2251
- },
2252
- "display_name": {
2253
- "type": "string",
2254
- "serialized_name": "DisplayName"
2255
2223
  }
2256
2224
  }
2257
2225
  },
2258
- "key": {
2259
- "type": "string",
2260
- "serialized_name": "Key"
2261
- },
2262
2226
  "version_id": {
2263
2227
  "type": "string",
2264
2228
  "serialized_name": "VersionId"
2265
- },
2266
- "is_latest": {
2267
- "type": "boolean",
2268
- "serialized_name": "IsLatest"
2269
- },
2270
- "last_modified": {
2271
- "type": "rfc822_timestamp",
2272
- "serialized_name": "LastModified"
2273
2229
  }
2274
2230
  }
2275
2231
  }
2276
2232
  },
2233
+ "encoding_type": {
2234
+ "type": "string",
2235
+ "location": "header",
2236
+ "serialized_name": "Encoding-Type"
2237
+ },
2238
+ "is_truncated": {
2239
+ "type": "boolean",
2240
+ "serialized_name": "IsTruncated"
2241
+ },
2242
+ "key_marker": {
2243
+ "type": "string",
2244
+ "serialized_name": "KeyMarker"
2245
+ },
2246
+ "max_keys": {
2247
+ "type": "integer",
2248
+ "serialized_name": "MaxKeys"
2249
+ },
2277
2250
  "name": {
2278
2251
  "type": "string",
2279
2252
  "serialized_name": "Name"
2280
2253
  },
2254
+ "next_key_marker": {
2255
+ "type": "string",
2256
+ "serialized_name": "NextKeyMarker"
2257
+ },
2258
+ "next_version_id_marker": {
2259
+ "type": "string",
2260
+ "serialized_name": "NextVersionIdMarker"
2261
+ },
2281
2262
  "prefix": {
2282
2263
  "type": "string",
2283
2264
  "serialized_name": "Prefix"
2284
2265
  },
2285
- "max_keys": {
2286
- "type": "integer",
2287
- "serialized_name": "MaxKeys"
2266
+ "version_id_marker": {
2267
+ "type": "string",
2268
+ "serialized_name": "VersionIdMarker"
2288
2269
  },
2289
- "common_prefixes": {
2270
+ "versions": {
2290
2271
  "type": "flat_list",
2291
- "serialized_name": "CommonPrefixes",
2272
+ "serialized_name": "Version",
2292
2273
  "members": {
2293
2274
  "type": "structure",
2294
2275
  "members": {
2295
- "prefix": {
2276
+ "etag": {
2277
+ "type": "string",
2278
+ "serialized_name": "ETag"
2279
+ },
2280
+ "is_latest": {
2281
+ "type": "boolean",
2282
+ "serialized_name": "IsLatest"
2283
+ },
2284
+ "key": {
2285
+ "type": "string",
2286
+ "serialized_name": "Key"
2287
+ },
2288
+ "last_modified": {
2289
+ "type": "rfc822_timestamp",
2290
+ "serialized_name": "LastModified"
2291
+ },
2292
+ "owner": {
2293
+ "type": "structure",
2294
+ "serialized_name": "Owner",
2295
+ "members": {
2296
+ "display_name": {
2297
+ "type": "string",
2298
+ "serialized_name": "DisplayName"
2299
+ },
2300
+ "id": {
2301
+ "type": "string",
2302
+ "serialized_name": "ID"
2303
+ }
2304
+ }
2305
+ },
2306
+ "size": {
2296
2307
  "type": "string",
2297
- "serialized_name": "Prefix"
2308
+ "serialized_name": "Size"
2309
+ },
2310
+ "storage_class": {
2311
+ "type": "string",
2312
+ "serialized_name": "StorageClass",
2313
+ "enum": [
2314
+ "STANDARD",
2315
+ "REDUCED_REDUNDANCY",
2316
+ "GLACIER"
2317
+ ]
2318
+ },
2319
+ "version_id": {
2320
+ "type": "string",
2321
+ "serialized_name": "VersionId"
2298
2322
  }
2299
2323
  }
2300
2324
  }
@@ -2305,7 +2329,7 @@
2305
2329
  "list_objects": {
2306
2330
  "name": "ListObjects",
2307
2331
  "http_method": "GET",
2308
- "http_path": "/{bucket}?delimiter={delimiter}&marker={marker}&max-keys={max_keys}&prefix={prefix}",
2332
+ "http_path": "/{bucket}?delimiter={delimiter}&marker={marker}&max-keys={max_keys}&prefix={prefix}&encoding-type={encoding_type}",
2309
2333
  "metadata": {
2310
2334
  "paging": {
2311
2335
  "tokens": {
@@ -2326,6 +2350,13 @@
2326
2350
  "type": "string",
2327
2351
  "location": "uri"
2328
2352
  },
2353
+ "encoding_type": {
2354
+ "type": "string",
2355
+ "location": "uri",
2356
+ "enum": [
2357
+ "url"
2358
+ ]
2359
+ },
2329
2360
  "marker": {
2330
2361
  "type": "string",
2331
2362
  "location": "uri"
@@ -2343,17 +2374,18 @@
2343
2374
  "output": {
2344
2375
  "type": "output",
2345
2376
  "members": {
2346
- "is_truncated": {
2347
- "type": "boolean",
2348
- "serialized_name": "IsTruncated"
2349
- },
2350
- "marker": {
2351
- "type": "string",
2352
- "serialized_name": "Marker"
2353
- },
2354
- "next_marker": {
2355
- "type": "string",
2356
- "serialized_name": "NextMarker"
2377
+ "common_prefixes": {
2378
+ "type": "flat_list",
2379
+ "serialized_name": "CommonPrefixes",
2380
+ "members": {
2381
+ "type": "structure",
2382
+ "members": {
2383
+ "prefix": {
2384
+ "type": "string",
2385
+ "serialized_name": "Prefix"
2386
+ }
2387
+ }
2388
+ }
2357
2389
  },
2358
2390
  "contents": {
2359
2391
  "type": "flat_list",
@@ -2361,6 +2393,10 @@
2361
2393
  "members": {
2362
2394
  "type": "structure",
2363
2395
  "members": {
2396
+ "etag": {
2397
+ "type": "string",
2398
+ "serialized_name": "ETag"
2399
+ },
2364
2400
  "key": {
2365
2401
  "type": "string",
2366
2402
  "serialized_name": "Key"
@@ -2369,9 +2405,19 @@
2369
2405
  "type": "rfc822_timestamp",
2370
2406
  "serialized_name": "LastModified"
2371
2407
  },
2372
- "etag": {
2373
- "type": "string",
2374
- "serialized_name": "ETag"
2408
+ "owner": {
2409
+ "type": "structure",
2410
+ "serialized_name": "Owner",
2411
+ "members": {
2412
+ "display_name": {
2413
+ "type": "string",
2414
+ "serialized_name": "DisplayName"
2415
+ },
2416
+ "id": {
2417
+ "type": "string",
2418
+ "serialized_name": "ID"
2419
+ }
2420
+ }
2375
2421
  },
2376
2422
  "size": {
2377
2423
  "type": "integer",
@@ -2385,48 +2431,38 @@
2385
2431
  "REDUCED_REDUNDANCY",
2386
2432
  "GLACIER"
2387
2433
  ]
2388
- },
2389
- "owner": {
2390
- "type": "structure",
2391
- "serialized_name": "Owner",
2392
- "members": {
2393
- "id": {
2394
- "type": "string",
2395
- "serialized_name": "ID"
2396
- },
2397
- "display_name": {
2398
- "type": "string",
2399
- "serialized_name": "DisplayName"
2400
- }
2401
- }
2402
2434
  }
2403
2435
  }
2404
2436
  }
2405
2437
  },
2406
- "name": {
2438
+ "encoding_type": {
2407
2439
  "type": "string",
2408
- "serialized_name": "Name"
2440
+ "location": "header",
2441
+ "serialized_name": "Encoding-Type"
2409
2442
  },
2410
- "prefix": {
2443
+ "is_truncated": {
2444
+ "type": "boolean",
2445
+ "serialized_name": "IsTruncated"
2446
+ },
2447
+ "marker": {
2411
2448
  "type": "string",
2412
- "serialized_name": "Prefix"
2449
+ "serialized_name": "Marker"
2413
2450
  },
2414
2451
  "max_keys": {
2415
2452
  "type": "integer",
2416
2453
  "serialized_name": "MaxKeys"
2417
2454
  },
2418
- "common_prefixes": {
2419
- "type": "flat_list",
2420
- "serialized_name": "CommonPrefixes",
2421
- "members": {
2422
- "type": "structure",
2423
- "members": {
2424
- "prefix": {
2425
- "type": "string",
2426
- "serialized_name": "Prefix"
2427
- }
2428
- }
2429
- }
2455
+ "name": {
2456
+ "type": "string",
2457
+ "serialized_name": "Name"
2458
+ },
2459
+ "next_marker": {
2460
+ "type": "string",
2461
+ "serialized_name": "NextMarker"
2462
+ },
2463
+ "prefix": {
2464
+ "type": "string",
2465
+ "serialized_name": "Prefix"
2430
2466
  }
2431
2467
  }
2432
2468
  }
@@ -2439,7 +2475,8 @@
2439
2475
  "paging": {
2440
2476
  "tokens": {
2441
2477
  "part_number_marker": "next_part_number_marker"
2442
- }
2478
+ },
2479
+ "truncated_if": "is_truncated"
2443
2480
  }
2444
2481
  },
2445
2482
  "input": {
@@ -2460,7 +2497,7 @@
2460
2497
  "location": "uri"
2461
2498
  },
2462
2499
  "part_number_marker": {
2463
- "type": "string",
2500
+ "type": "integer",
2464
2501
  "location": "uri"
2465
2502
  },
2466
2503
  "upload_id": {
@@ -2477,29 +2514,53 @@
2477
2514
  "type": "string",
2478
2515
  "serialized_name": "Bucket"
2479
2516
  },
2517
+ "initiator": {
2518
+ "type": "structure",
2519
+ "serialized_name": "Initiator",
2520
+ "members": {
2521
+ "display_name": {
2522
+ "type": "string",
2523
+ "serialized_name": "DisplayName"
2524
+ },
2525
+ "id": {
2526
+ "type": "string",
2527
+ "serialized_name": "ID"
2528
+ }
2529
+ }
2530
+ },
2531
+ "is_truncated": {
2532
+ "type": "boolean",
2533
+ "serialized_name": "IsTruncated"
2534
+ },
2480
2535
  "key": {
2481
2536
  "type": "string",
2482
2537
  "serialized_name": "Key"
2483
2538
  },
2484
- "upload_id": {
2485
- "type": "string",
2486
- "serialized_name": "UploadId"
2487
- },
2488
- "part_number_marker": {
2539
+ "max_parts": {
2489
2540
  "type": "integer",
2490
- "serialized_name": "PartNumberMarker"
2541
+ "serialized_name": "MaxParts"
2491
2542
  },
2492
2543
  "next_part_number_marker": {
2493
2544
  "type": "integer",
2494
2545
  "serialized_name": "NextPartNumberMarker"
2495
2546
  },
2496
- "max_parts": {
2497
- "type": "integer",
2498
- "serialized_name": "MaxParts"
2547
+ "owner": {
2548
+ "type": "structure",
2549
+ "serialized_name": "Owner",
2550
+ "members": {
2551
+ "display_name": {
2552
+ "type": "string",
2553
+ "serialized_name": "DisplayName"
2554
+ },
2555
+ "id": {
2556
+ "type": "string",
2557
+ "serialized_name": "ID"
2558
+ }
2559
+ }
2499
2560
  },
2500
- "is_truncated": {
2501
- "type": "boolean",
2502
- "serialized_name": "IsTruncated"
2561
+ "part_number_marker": {
2562
+ "type": "integer",
2563
+ "serialized_name": "PartNumberMarker"
2503
2564
  },
2504
2565
  "parts": {
2505
2566
  "type": "flat_list",
@@ -2507,17 +2568,17 @@
2507
2568
  "members": {
2508
2569
  "type": "structure",
2509
2570
  "members": {
2510
- "part_number": {
2511
- "type": "integer",
2512
- "serialized_name": "PartNumber"
2571
+ "etag": {
2572
+ "type": "string",
2573
+ "serialized_name": "ETag"
2513
2574
  },
2514
2575
  "last_modified": {
2515
2576
  "type": "rfc822_timestamp",
2516
2577
  "serialized_name": "LastModified"
2517
2578
  },
2518
- "etag": {
2519
- "type": "string",
2520
- "serialized_name": "ETag"
2579
+ "part_number": {
2580
+ "type": "integer",
2581
+ "serialized_name": "PartNumber"
2521
2582
  },
2522
2583
  "size": {
2523
2584
  "type": "integer",
@@ -2526,34 +2587,6 @@
2526
2587
  }
2527
2588
  }
2528
2589
  },
2529
- "initiator": {
2530
- "type": "structure",
2531
- "serialized_name": "Initiator",
2532
- "members": {
2533
- "id": {
2534
- "type": "string",
2535
- "serialized_name": "ID"
2536
- },
2537
- "display_name": {
2538
- "type": "string",
2539
- "serialized_name": "DisplayName"
2540
- }
2541
- }
2542
- },
2543
- "owner": {
2544
- "type": "structure",
2545
- "serialized_name": "Owner",
2546
- "members": {
2547
- "id": {
2548
- "type": "string",
2549
- "serialized_name": "ID"
2550
- },
2551
- "display_name": {
2552
- "type": "string",
2553
- "serialized_name": "DisplayName"
2554
- }
2555
- }
2556
- },
2557
2590
  "storage_class": {
2558
2591
  "type": "string",
2559
2592
  "serialized_name": "StorageClass",
@@ -2562,6 +2595,10 @@
2562
2595
  "REDUCED_REDUNDANCY",
2563
2596
  "GLACIER"
2564
2597
  ]
2598
+ },
2599
+ "upload_id": {
2600
+ "type": "string",
2601
+ "serialized_name": "UploadId"
2565
2602
  }
2566
2603
  }
2567
2604
  }
@@ -2896,7 +2933,6 @@
2896
2933
  "members": {
2897
2934
  "logging_enabled": {
2898
2935
  "type": "structure",
2899
- "required": false,
2900
2936
  "serialized_name": "LoggingEnabled",
2901
2937
  "members": {
2902
2938
  "target_bucket": {
@@ -3459,16 +3495,16 @@
3459
3495
  "output": {
3460
3496
  "type": "output",
3461
3497
  "members": {
3462
- "expiration": {
3463
- "type": "rfc822_timestamp",
3464
- "location": "header",
3465
- "serialized_name": "x-amz-expiration"
3466
- },
3467
3498
  "etag": {
3468
3499
  "type": "string",
3469
3500
  "location": "header",
3470
3501
  "serialized_name": "ETag"
3471
3502
  },
3503
+ "expiration": {
3504
+ "type": "rfc822_timestamp",
3505
+ "location": "header",
3506
+ "serialized_name": "x-amz-expiration"
3507
+ },
3472
3508
  "server_side_encryption": {
3473
3509
  "type": "string",
3474
3510
  "location": "header",
@@ -3691,13 +3727,18 @@
3691
3727
  "location": "header",
3692
3728
  "serialized_name": "Content-Length"
3693
3729
  },
3730
+ "content_md5": {
3731
+ "type": "string",
3732
+ "location": "header",
3733
+ "serialized_name": "Content-MD5"
3734
+ },
3694
3735
  "key": {
3695
3736
  "type": "string",
3696
3737
  "required": true,
3697
3738
  "location": "uri"
3698
3739
  },
3699
3740
  "part_number": {
3700
- "type": "string",
3741
+ "type": "integer",
3701
3742
  "required": true,
3702
3743
  "location": "uri"
3703
3744
  },
@@ -3712,6 +3753,11 @@
3712
3753
  "output": {
3713
3754
  "type": "output",
3714
3755
  "members": {
3756
+ "etag": {
3757
+ "type": "string",
3758
+ "location": "header",
3759
+ "serialized_name": "ETag"
3760
+ },
3715
3761
  "server_side_encryption": {
3716
3762
  "type": "string",
3717
3763
  "location": "header",
@@ -3719,11 +3765,6 @@
3719
3765
  "enum": [
3720
3766
  "AES256"
3721
3767
  ]
3722
- },
3723
- "etag": {
3724
- "type": "string",
3725
- "location": "header",
3726
- "serialized_name": "ETag"
3727
3768
  }
3728
3769
  }
3729
3770
  }
@@ -3777,7 +3818,7 @@
3777
3818
  "location": "uri"
3778
3819
  },
3779
3820
  "part_number": {
3780
- "type": "string",
3821
+ "type": "integer",
3781
3822
  "required": true,
3782
3823
  "location": "uri"
3783
3824
  },
@@ -3791,11 +3832,6 @@
3791
3832
  "output": {
3792
3833
  "type": "output",
3793
3834
  "members": {
3794
- "copy_source_version_id": {
3795
- "type": "string",
3796
- "location": "header",
3797
- "serialized_name": "x-amz-copy-source-version-id"
3798
- },
3799
3835
  "copy_part_result": {
3800
3836
  "type": "structure",
3801
3837
  "serialized_name": "CopyPartResult",
@@ -3810,6 +3846,11 @@
3810
3846
  }
3811
3847
  }
3812
3848
  },
3849
+ "copy_source_version_id": {
3850
+ "type": "string",
3851
+ "location": "header",
3852
+ "serialized_name": "x-amz-copy-source-version-id"
3853
+ },
3813
3854
  "server_side_encryption": {
3814
3855
  "type": "string",
3815
3856
  "location": "header",