Merge branch 'version-3' into client-plugin

aws · Jun 20, 2024 · 59f5a9d · 59f5a9d
2 parents 070ac2f + e10c7ee
commit 59f5a9d
Show file tree

Hide file tree

Showing 113 changed files with 7,582 additions and 3,173 deletions.
diff --git a/apis/bedrock-runtime/2023-09-30/api-2.json b/apis/bedrock-runtime/2023-09-30/api-2.json
@@ -129,6 +129,7 @@
       "members":{
         "text":{"shape":"String"},
         "image":{"shape":"ImageBlock"},
+        "document":{"shape":"DocumentBlock"},
         "toolUse":{"shape":"ToolUseBlock"},
         "toolResult":{"shape":"ToolResultBlock"},
         "guardContent":{"shape":"GuardrailConverseContentBlock"}
@@ -355,6 +356,49 @@
       },
       "document":true
     },
+    "DocumentBlock":{
+      "type":"structure",
+      "required":[
+        "format",
+        "name",
+        "source"
+      ],
+      "members":{
+        "format":{"shape":"DocumentFormat"},
+        "name":{"shape":"DocumentBlockNameString"},
+        "source":{"shape":"DocumentSource"}
+      }
+    },
+    "DocumentBlockNameString":{
+      "type":"string",
+      "max":64,
+      "min":1
+    },
+    "DocumentFormat":{
+      "type":"string",
+      "enum":[
+        "pdf",
+        "csv",
+        "doc",
+        "docx",
+        "xls",
+        "xlsx",
+        "html",
+        "txt",
+        "md"
+      ]
+    },
+    "DocumentSource":{
+      "type":"structure",
+      "members":{
+        "bytes":{"shape":"DocumentSourceBytesBlob"}
+      },
+      "union":true
+    },
+    "DocumentSourceBytesBlob":{
+      "type":"blob",
+      "min":1
+    },
     "GuardrailAssessment":{
       "type":"structure",
       "members":{
@@ -1143,7 +1187,8 @@
       "members":{
         "json":{"shape":"Document"},
         "text":{"shape":"String"},
-        "image":{"shape":"ImageBlock"}
+        "image":{"shape":"ImageBlock"},
+        "document":{"shape":"DocumentBlock"}
       },
       "union":true
     },

diff --git a/apis/bedrock-runtime/2023-09-30/docs-2.json b/apis/bedrock-runtime/2023-09-30/docs-2.json
@@ -187,6 +187,37 @@
         "ToolUseBlock$input": "<p>The input to pass to the tool. </p>"
       }
     },
+    "DocumentBlock": {
+      "base": "<p>A document to include in a message when sending a <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_Converse.html\">Converse</a> or <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ConverseStream.html\">ConverseStream</a> request. You can include up to 5 documents in a request. The maximum document size is 50 MB.</p>",
+      "refs": {
+        "ContentBlock$document": "<p>A document to include in the message.</p>",
+        "ToolResultContentBlock$document": "<p>A tool result that is a document.</p>"
+      }
+    },
+    "DocumentBlockNameString": {
+      "base": null,
+      "refs": {
+        "DocumentBlock$name": "<p>A name for the document.</p>"
+      }
+    },
+    "DocumentFormat": {
+      "base": null,
+      "refs": {
+        "DocumentBlock$format": "<p>The format of a document, or its extension.</p>"
+      }
+    },
+    "DocumentSource": {
+      "base": "<p>Contains the content of the document included in a message when sending a <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_Converse.html\">Converse</a> or <a href=\"https://docs.aws.amazon.com/bedrock/latest/APIReference/API_runtime_ConverseStream.html\">ConverseStream</a> request or in the response.</p>",
+      "refs": {
+        "DocumentBlock$source": "<p>Contains the content of the document.</p>"
+      }
+    },
+    "DocumentSourceBytesBlob": {
+      "base": null,
+      "refs": {
+        "DocumentSource$bytes": "<p>A base64-encoded string of a UTF-8 encoded file, that is the document to include in the message.</p>"
+      }
+    },
     "GuardrailAssessment": {
       "base": "<p>A behavior assessment of the guardrail policies used in a call to the Converse API. </p>",
       "refs": {

diff --git a/apis/codeartifact/2018-09-22/api-2.json b/apis/codeartifact/2018-09-22/api-2.json
@@ -5,11 +5,13 @@
     "endpointPrefix":"codeartifact",
     "jsonVersion":"1.1",
     "protocol":"rest-json",
+    "protocols":["rest-json"],
     "serviceFullName":"CodeArtifact",
     "serviceId":"codeartifact",
     "signatureVersion":"v4",
     "signingName":"codeartifact",
-    "uid":"codeartifact-2018-09-22"
+    "uid":"codeartifact-2018-09-22",
+    "auth":["aws.auth#sigv4"]
   },
   "operations":{
     "AssociateExternalConnection":{
@@ -2621,7 +2623,8 @@
         "nuget",
         "generic",
         "ruby",
-        "swift"
+        "swift",
+        "cargo"
       ]
     },
     "PackageGroupAllowedRepository":{

diff --git a/apis/codeartifact/2018-09-22/docs-2.json b/apis/codeartifact/2018-09-22/docs-2.json