Merge branch 'version-3' into s3-crc32

aws · Aug 20, 2024 · 3bd5e23 · 3bd5e23
2 parents 64539c6 + c07c9fd
commit 3bd5e23
Show file tree

Hide file tree

Showing 38 changed files with 1,247 additions and 668 deletions.
diff --git a/apis/ecs/2014-11-13/docs-2.json b/apis/ecs/2014-11-13/docs-2.json
diff --git a/apis/opensearchserverless/2021-11-01/api-2.json b/apis/opensearchserverless/2021-11-01/api-2.json
@@ -5,12 +5,14 @@
     "endpointPrefix":"aoss",
     "jsonVersion":"1.0",
     "protocol":"json",
+    "protocols":["json"],
     "serviceFullName":"OpenSearch Service Serverless",
     "serviceId":"OpenSearchServerless",
     "signatureVersion":"v4",
     "signingName":"aoss",
     "targetPrefix":"OpenSearchServerless",
-    "uid":"opensearchserverless-2021-11-01"
+    "uid":"opensearchserverless-2021-11-01",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "BatchGetCollection":{
@@ -687,6 +689,8 @@
         "createdDate":{"shape":"Long"},
         "dashboardEndpoint":{"shape":"String"},
         "description":{"shape":"String"},
+        "failureCode":{"shape":"String"},
+        "failureMessage":{"shape":"String"},
         "id":{"shape":"CollectionId"},
         "kmsKeyArn":{"shape":"String"},
         "lastModifiedDate":{"shape":"Long"},
@@ -1497,7 +1501,7 @@
     "Resource":{"type":"string"},
     "ResourceName":{
       "type":"string",
-      "pattern":"^index/[a-z][a-z0-9-]{3,32}/([a-z;0-9&$%][+.~=\\-_a-z;0-9&$%]*|\\*)$"
+      "pattern":"^index/[a-z][a-z0-9-]{3,32}/([a-z;0-9&$%][+.~=\\-_a-z;0-9&$%]*)$"
     },
     "ResourceNotFoundException":{
       "type":"structure",
@@ -1915,6 +1919,8 @@
       "type":"structure",
       "members":{
         "createdDate":{"shape":"Long"},
+        "failureCode":{"shape":"String"},
+        "failureMessage":{"shape":"String"},
         "id":{"shape":"VpcEndpointId"},
         "name":{"shape":"VpcEndpointName"},
         "securityGroupIds":{"shape":"SecurityGroupIds"},

diff --git a/apis/opensearchserverless/2021-11-01/docs-2.json b/apis/opensearchserverless/2021-11-01/docs-2.json
@@ -1024,6 +1024,8 @@
         "CollectionDetail$collectionEndpoint": "<p>Collection-specific endpoint used to submit index, search, and data upload requests to an OpenSearch Serverless collection.</p>",
         "CollectionDetail$dashboardEndpoint": "<p>Collection-specific endpoint used to access OpenSearch Dashboards.</p>",
         "CollectionDetail$description": "<p>A description of the collection.</p>",
+        "CollectionDetail$failureCode": "<p>A failure code associated with the request.</p>",
+        "CollectionDetail$failureMessage": "<p>A message associated with the failure code.</p>",
         "CollectionDetail$kmsKeyArn": "<p>The ARN of the Amazon Web Services KMS key used to encrypt the collection.</p>",
         "CollectionErrorDetail$errorCode": "<p>The error code for the request. For example, <code>NOT_FOUND</code>.</p>",
         "CollectionErrorDetail$errorMessage": "<p>A description of the error. For example, <code>The specified Collection is not found.</code> </p>",
@@ -1060,6 +1062,8 @@
         "UpdateCollectionDetail$arn": "<p>The Amazon Resource Name (ARN) of the collection.</p>",
         "UpdateCollectionDetail$description": "<p>The description of the collection.</p>",
         "ValidationException$message": null,
+        "VpcEndpointDetail$failureCode": "<p>A failure code associated with the request.</p>",
+        "VpcEndpointDetail$failureMessage": "<p>A message associated with the failure code.</p>",
         "VpcEndpointErrorDetail$errorCode": "<p>The error code for the failed request.</p>",
         "VpcEndpointErrorDetail$errorMessage": "<p>An error message describing the reason for the failure.</p>"
       }

diff --git a/apis/opensearchserverless/2021-11-01/endpoint-tests-1.json b/apis/opensearchserverless/2021-11-01/endpoint-tests-1.json
@@ -308,17 +308,6 @@
             "expect": {
                 "error": "Invalid Configuration: Missing Region"
             }
-        },
-        {
-            "documentation": "Partition doesn't support DualStack",
-            "expect": {
-                "error": "DualStack is enabled but this partition does not support DualStack"
-            },
-            "params": {
-                "Region": "us-isob-east-1",
-                "UseFIPS": false,
-                "UseDualStack": true
-            }
         }
     ],
     "version": "1.0"

diff --git a/apis/s3/2006-03-01/api-2.json b/apis/s3/2006-03-01/api-2.json
@@ -1856,6 +1856,11 @@
           "location":"header",
           "locationName":"x-amz-expected-bucket-owner"
         },
+        "IfNoneMatch":{
+          "shape":"IfNoneMatch",
+          "location":"header",
+          "locationName":"If-None-Match"
+        },
         "SSECustomerAlgorithm":{
           "shape":"SSECustomerAlgorithm",
           "location":"header",
@@ -7561,6 +7566,11 @@
           "location":"header",
           "locationName":"Expires"
         },
+        "IfNoneMatch":{
+          "shape":"IfNoneMatch",
+          "location":"header",
+          "locationName":"If-None-Match"
+        },
         "GrantFullControl":{
           "shape":"GrantFullControl",
           "location":"header",

diff --git a/apis/s3/2006-03-01/docs-2.json b/apis/s3/2006-03-01/docs-2.json
diff --git a/apis/s3/2006-03-01/examples-1.json b/apis/s3/2006-03-01/examples-1.json
@@ -292,39 +292,39 @@
       {
         "input": {
           "Bucket": "examplebucket",
-          "Key": "HappyFace.jpg"
+          "Key": "HappyFace.jpg",
+          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
         },
         "output": {
-          "VersionId": "null"
+          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example removes tag set associated with the specified object. If the bucket is versioning enabled, the operation removes tag set from the latest object version.",
-        "id": "to-remove-tag-set-from-an-object-1483145342862",
-        "title": "To remove tag set from an object"
+        "description": "The following example removes tag set associated with the specified object version. The request specifies both the object key and object version.",
+        "id": "to-remove-tag-set-from-an-object-version-1483145285913",
+        "title": "To remove tag set from an object version"
       },
       {
         "input": {
           "Bucket": "examplebucket",
-          "Key": "HappyFace.jpg",
-          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
+          "Key": "HappyFace.jpg"
         },
         "output": {
-          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
+          "VersionId": "null"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example removes tag set associated with the specified object version. The request specifies both the object key and object version.",
-        "id": "to-remove-tag-set-from-an-object-version-1483145285913",
-        "title": "To remove tag set from an object version"
+        "description": "The following example removes tag set associated with the specified object. If the bucket is versioning enabled, the operation removes tag set from the latest object version.",
+        "id": "to-remove-tag-set-from-an-object-1483145342862",
+        "title": "To remove tag set from an object"
       }
     ],
     "DeleteObjects": [
@@ -840,55 +840,55 @@
       {
         "input": {
           "Bucket": "examplebucket",
-          "Key": "exampleobject",
-          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
+          "Key": "HappyFace.jpg"
         },
         "output": {
           "TagSet": [
             {
-              "Key": "Key1",
-              "Value": "Value1"
+              "Key": "Key4",
+              "Value": "Value4"
+            },
+            {
+              "Key": "Key3",
+              "Value": "Value3"
             }
           ],
-          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
+          "VersionId": "null"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example retrieves tag set of an object. The request specifies object version.",
-        "id": "to-retrieve-tag-set-of-a-specific-object-version-1483400283663",
-        "title": "To retrieve tag set of a specific object version"
+        "description": "The following example retrieves tag set of an object.",
+        "id": "to-retrieve-tag-set-of-an-object-1481833847896",
+        "title": "To retrieve tag set of an object"
       },
       {
         "input": {
           "Bucket": "examplebucket",
-          "Key": "HappyFace.jpg"
+          "Key": "exampleobject",
+          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
         },
         "output": {
           "TagSet": [
             {
-              "Key": "Key4",
-              "Value": "Value4"
-            },
-            {
-              "Key": "Key3",
-              "Value": "Value3"
+              "Key": "Key1",
+              "Value": "Value1"
             }
           ],
-          "VersionId": "null"
+          "VersionId": "ydlaNkwWm0SfKJR.T1b1fIdPRbldTYRI"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example retrieves tag set of an object.",
-        "id": "to-retrieve-tag-set-of-an-object-1481833847896",
-        "title": "To retrieve tag set of an object"
+        "description": "The following example retrieves tag set of an object. The request specifies object version.",
+        "id": "to-retrieve-tag-set-of-a-specific-object-version-1483400283663",
+        "title": "To retrieve tag set of a specific object version"
       }
     ],
     "GetObjectTorrent": [
@@ -1565,6 +1565,29 @@
       }
     ],
     "PutObject": [
+      {
+        "input": {
+          "Body": "HappyFace.jpg",
+          "Bucket": "examplebucket",
+          "Key": "HappyFace.jpg",
+          "ServerSideEncryption": "AES256",
+          "StorageClass": "STANDARD_IA"
+        },
+        "output": {
+          "ETag": "\"6805f2cfc46c0f04559748bb039d69ae\"",
+          "ServerSideEncryption": "AES256",
+          "VersionId": "CG612hodqujkf8FaaNfp8U..FIhLROcp"
+        },
+        "comments": {
+          "input": {
+          },
+          "output": {
+          }
+        },
+        "description": "The following example uploads an object. The request specifies optional request headers to directs S3 to use specific storage class and use server-side encryption.",
+        "id": "to-upload-an-object-(specify-optional-headers)",
+        "title": "To upload an object (specify optional headers)"
+      },
       {
         "input": {
           "Body": "filetoupload",
@@ -1589,68 +1612,63 @@
         "input": {
           "Body": "HappyFace.jpg",
           "Bucket": "examplebucket",
-          "Key": "HappyFace.jpg",
-          "ServerSideEncryption": "AES256",
-          "StorageClass": "STANDARD_IA"
+          "Key": "HappyFace.jpg"
         },
         "output": {
           "ETag": "\"6805f2cfc46c0f04559748bb039d69ae\"",
-          "ServerSideEncryption": "AES256",
-          "VersionId": "CG612hodqujkf8FaaNfp8U..FIhLROcp"
+          "VersionId": "tpf3zF08nBplQK1XLOefGskR7mGDwcDk"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example uploads an object. The request specifies optional request headers to directs S3 to use specific storage class and use server-side encryption.",
-        "id": "to-upload-an-object-(specify-optional-headers)",
-        "title": "To upload an object (specify optional headers)"
+        "description": "The following example uploads an object to a versioning-enabled bucket. The source file is specified using Windows file syntax. S3 returns VersionId of the newly created object.",
+        "id": "to-upload-an-object-1481760101010",
+        "title": "To upload an object"
       },
       {
         "input": {
-          "ACL": "authenticated-read",
-          "Body": "filetoupload",
+          "Body": "c:\\HappyFace.jpg",
           "Bucket": "examplebucket",
-          "Key": "exampleobject"
+          "Key": "HappyFace.jpg",
+          "Tagging": "key1=value1&key2=value2"
         },
         "output": {
           "ETag": "\"6805f2cfc46c0f04559748bb039d69ae\"",
-          "VersionId": "Kirh.unyZwjQ69YxcQLA8z4F5j3kJJKr"
+          "VersionId": "psM2sYY4.o1501dSx8wMvnkOzSBB.V4a"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example uploads and object. The request specifies optional canned ACL (access control list) to all READ access to authenticated users. If the bucket is versioning enabled, S3 returns version ID in response.",
-        "id": "to-upload-an-object-and-specify-canned-acl-1483397779571",
-        "title": "To upload an object and specify canned ACL."
+        "description": "The following example uploads an object. The request specifies optional object tags. The bucket is versioned, therefore S3 returns version ID of the newly created object.",
+        "id": "to-upload-an-object-and-specify-optional-tags-1481762310955",
+        "title": "To upload an object and specify optional tags"
       },
       {
         "input": {
+          "ACL": "authenticated-read",
           "Body": "filetoupload",
           "Bucket": "examplebucket",
-          "Key": "exampleobject",
-          "ServerSideEncryption": "AES256",
-          "Tagging": "key1=value1&key2=value2"
+          "Key": "exampleobject"
         },
         "output": {
           "ETag": "\"6805f2cfc46c0f04559748bb039d69ae\"",
-          "ServerSideEncryption": "AES256",
-          "VersionId": "Ri.vC6qVlA4dEnjgRV4ZHsHoFIjqEMNt"
+          "VersionId": "Kirh.unyZwjQ69YxcQLA8z4F5j3kJJKr"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example uploads an object. The request specifies the optional server-side encryption option. The request also specifies optional object tags. If the bucket is versioning enabled, S3 returns version ID in response.",
-        "id": "to-upload-an-object-and-specify-server-side-encryption-and-object-tags-1483398331831",
-        "title": "To upload an object and specify server-side encryption and object tags"
+        "description": "The following example uploads and object. The request specifies optional canned ACL (access control list) to all READ access to authenticated users. If the bucket is versioning enabled, S3 returns version ID in response.",
+        "id": "to-upload-an-object-and-specify-canned-acl-1483397779571",
+        "title": "To upload an object and specify canned ACL."
       },
       {
         "input": {
@@ -1678,44 +1696,26 @@
       },
       {
         "input": {
-          "Body": "HappyFace.jpg",
-          "Bucket": "examplebucket",
-          "Key": "HappyFace.jpg"
-        },
-        "output": {
-          "ETag": "\"6805f2cfc46c0f04559748bb039d69ae\"",
-          "VersionId": "tpf3zF08nBplQK1XLOefGskR7mGDwcDk"
-        },
-        "comments": {
-          "input": {
-          },
-          "output": {
-          }
-        },
-        "description": "The following example uploads an object to a versioning-enabled bucket. The source file is specified using Windows file syntax. S3 returns VersionId of the newly created object.",
-        "id": "to-upload-an-object-1481760101010",
-        "title": "To upload an object"
-      },
-      {
-        "input": {
-          "Body": "c:\\HappyFace.jpg",
+          "Body": "filetoupload",
           "Bucket": "examplebucket",
-          "Key": "HappyFace.jpg",
+          "Key": "exampleobject",
+          "ServerSideEncryption": "AES256",
           "Tagging": "key1=value1&key2=value2"
         },
         "output": {
           "ETag": "\"6805f2cfc46c0f04559748bb039d69ae\"",
-          "VersionId": "psM2sYY4.o1501dSx8wMvnkOzSBB.V4a"
+          "ServerSideEncryption": "AES256",
+          "VersionId": "Ri.vC6qVlA4dEnjgRV4ZHsHoFIjqEMNt"
         },
         "comments": {
           "input": {
           },
           "output": {
           }
         },
-        "description": "The following example uploads an object. The request specifies optional object tags. The bucket is versioned, therefore S3 returns version ID of the newly created object.",
-        "id": "to-upload-an-object-and-specify-optional-tags-1481762310955",
-        "title": "To upload an object and specify optional tags"
+        "description": "The following example uploads an object. The request specifies the optional server-side encryption option. The request also specifies optional object tags. If the bucket is versioning enabled, S3 returns version ID in response.",
+        "id": "to-upload-an-object-and-specify-server-side-encryption-and-object-tags-1483398331831",
+        "title": "To upload an object and specify server-side encryption and object tags"
       }
     ],
     "PutObjectAcl": [