feat(client-bedrock-agent): Introducing the ability to create multiple data sources per knowledge base, specify S3 buckets as data sources from external accounts, and exposing levers to define the deletion behavior of the underlying vector store data.

awstools · awstools · commit bf837dc3551b · 2024-04-23T18:21:38.000Z
diff --git a/clients/client-bedrock-agent/src/commands/CreateDataSourceCommand.ts b/clients/client-bedrock-agent/src/commands/CreateDataSourceCommand.ts
@@ -49,8 +49,10 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
  *       inclusionPrefixes: [ // S3Prefixes
  *         "STRING_VALUE",
  *       ],
+ *       bucketOwnerAccountId: "STRING_VALUE",
  *     },
  *   },
+ *   dataDeletionPolicy: "RETAIN" || "DELETE",
  *   serverSideEncryptionConfiguration: { // ServerSideEncryptionConfiguration
  *     kmsKeyArn: "STRING_VALUE",
  *   },
@@ -71,7 +73,7 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
  * //     knowledgeBaseId: "STRING_VALUE", // required
  * //     dataSourceId: "STRING_VALUE", // required
  * //     name: "STRING_VALUE", // required
- * //     status: "AVAILABLE" || "DELETING", // required
+ * //     status: "AVAILABLE" || "DELETING" || "DELETE_UNSUCCESSFUL", // required
  * //     description: "STRING_VALUE",
  * //     dataSourceConfiguration: { // DataSourceConfiguration
  * //       type: "S3", // required
@@ -80,6 +82,7 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
  * //         inclusionPrefixes: [ // S3Prefixes
  * //           "STRING_VALUE",
  * //         ],
+ * //         bucketOwnerAccountId: "STRING_VALUE",
  * //       },
  * //     },
  * //     serverSideEncryptionConfiguration: { // ServerSideEncryptionConfiguration
@@ -94,8 +97,12 @@ export interface CreateDataSourceCommandOutput extends CreateDataSourceResponse,
  * //         },
  * //       },
  * //     },
+ * //     dataDeletionPolicy: "RETAIN" || "DELETE",
  * //     createdAt: new Date("TIMESTAMP"), // required
  * //     updatedAt: new Date("TIMESTAMP"), // required
+ * //     failureReasons: [ // FailureReasons
+ * //       "STRING_VALUE",
+ * //     ],
  * //   },
  * // };
  *
diff --git a/clients/client-bedrock-agent/src/commands/CreateKnowledgeBaseCommand.ts b/clients/client-bedrock-agent/src/commands/CreateKnowledgeBaseCommand.ts
@@ -181,7 +181,7 @@ export interface CreateKnowledgeBaseCommandOutput extends CreateKnowledgeBaseRes
  * //         },
  * //       },
  * //     },
- * //     status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED", // required
+ * //     status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED" || "DELETE_UNSUCCESSFUL", // required
  * //     createdAt: new Date("TIMESTAMP"), // required
  * //     updatedAt: new Date("TIMESTAMP"), // required
  * //     failureReasons: [ // FailureReasons
diff --git a/clients/client-bedrock-agent/src/commands/DeleteDataSourceCommand.ts b/clients/client-bedrock-agent/src/commands/DeleteDataSourceCommand.ts
@@ -43,7 +43,7 @@ export interface DeleteDataSourceCommandOutput extends DeleteDataSourceResponse,
  * // { // DeleteDataSourceResponse
  * //   knowledgeBaseId: "STRING_VALUE", // required
  * //   dataSourceId: "STRING_VALUE", // required
- * //   status: "AVAILABLE" || "DELETING", // required
+ * //   status: "AVAILABLE" || "DELETING" || "DELETE_UNSUCCESSFUL", // required
  * // };
  *
  * ```
diff --git a/clients/client-bedrock-agent/src/commands/DeleteKnowledgeBaseCommand.ts b/clients/client-bedrock-agent/src/commands/DeleteKnowledgeBaseCommand.ts
@@ -41,7 +41,7 @@ export interface DeleteKnowledgeBaseCommandOutput extends DeleteKnowledgeBaseRes
  * const response = await client.send(command);
  * // { // DeleteKnowledgeBaseResponse
  * //   knowledgeBaseId: "STRING_VALUE", // required
- * //   status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED", // required
+ * //   status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED" || "DELETE_UNSUCCESSFUL", // required
  * // };
  *
  * ```
diff --git a/clients/client-bedrock-agent/src/commands/GetDataSourceCommand.ts b/clients/client-bedrock-agent/src/commands/GetDataSourceCommand.ts
@@ -45,7 +45,7 @@ export interface GetDataSourceCommandOutput extends GetDataSourceResponse, __Met
  * //     knowledgeBaseId: "STRING_VALUE", // required
  * //     dataSourceId: "STRING_VALUE", // required
  * //     name: "STRING_VALUE", // required
- * //     status: "AVAILABLE" || "DELETING", // required
+ * //     status: "AVAILABLE" || "DELETING" || "DELETE_UNSUCCESSFUL", // required
  * //     description: "STRING_VALUE",
  * //     dataSourceConfiguration: { // DataSourceConfiguration
  * //       type: "S3", // required
@@ -54,6 +54,7 @@ export interface GetDataSourceCommandOutput extends GetDataSourceResponse, __Met
  * //         inclusionPrefixes: [ // S3Prefixes
  * //           "STRING_VALUE",
  * //         ],
+ * //         bucketOwnerAccountId: "STRING_VALUE",
  * //       },
  * //     },
  * //     serverSideEncryptionConfiguration: { // ServerSideEncryptionConfiguration
@@ -68,8 +69,12 @@ export interface GetDataSourceCommandOutput extends GetDataSourceResponse, __Met
  * //         },
  * //       },
  * //     },
+ * //     dataDeletionPolicy: "RETAIN" || "DELETE",
  * //     createdAt: new Date("TIMESTAMP"), // required
  * //     updatedAt: new Date("TIMESTAMP"), // required
+ * //     failureReasons: [ // FailureReasons
+ * //       "STRING_VALUE",
+ * //     ],
  * //   },
  * // };
  *
diff --git a/clients/client-bedrock-agent/src/commands/GetKnowledgeBaseCommand.ts b/clients/client-bedrock-agent/src/commands/GetKnowledgeBaseCommand.ts
@@ -95,7 +95,7 @@ export interface GetKnowledgeBaseCommandOutput extends GetKnowledgeBaseResponse,
  * //         },
  * //       },
  * //     },
- * //     status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED", // required
+ * //     status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED" || "DELETE_UNSUCCESSFUL", // required
  * //     createdAt: new Date("TIMESTAMP"), // required
  * //     updatedAt: new Date("TIMESTAMP"), // required
  * //     failureReasons: [ // FailureReasons
diff --git a/clients/client-bedrock-agent/src/commands/ListDataSourcesCommand.ts b/clients/client-bedrock-agent/src/commands/ListDataSourcesCommand.ts
@@ -47,7 +47,7 @@ export interface ListDataSourcesCommandOutput extends ListDataSourcesResponse, _
  * //       knowledgeBaseId: "STRING_VALUE", // required
  * //       dataSourceId: "STRING_VALUE", // required
  * //       name: "STRING_VALUE", // required
- * //       status: "AVAILABLE" || "DELETING", // required
+ * //       status: "AVAILABLE" || "DELETING" || "DELETE_UNSUCCESSFUL", // required
  * //       description: "STRING_VALUE",
  * //       updatedAt: new Date("TIMESTAMP"), // required
  * //     },
diff --git a/clients/client-bedrock-agent/src/commands/ListKnowledgeBasesCommand.ts b/clients/client-bedrock-agent/src/commands/ListKnowledgeBasesCommand.ts
@@ -46,7 +46,7 @@ export interface ListKnowledgeBasesCommandOutput extends ListKnowledgeBasesRespo
  * //       knowledgeBaseId: "STRING_VALUE", // required
  * //       name: "STRING_VALUE", // required
  * //       description: "STRING_VALUE",
- * //       status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED", // required
+ * //       status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED" || "DELETE_UNSUCCESSFUL", // required
  * //       updatedAt: new Date("TIMESTAMP"), // required
  * //     },
  * //   ],
diff --git a/clients/client-bedrock-agent/src/commands/UpdateDataSourceCommand.ts b/clients/client-bedrock-agent/src/commands/UpdateDataSourceCommand.ts
@@ -49,8 +49,10 @@ export interface UpdateDataSourceCommandOutput extends UpdateDataSourceResponse,
  *       inclusionPrefixes: [ // S3Prefixes
  *         "STRING_VALUE",
  *       ],
+ *       bucketOwnerAccountId: "STRING_VALUE",
  *     },
  *   },
+ *   dataDeletionPolicy: "RETAIN" || "DELETE",
  *   serverSideEncryptionConfiguration: { // ServerSideEncryptionConfiguration
  *     kmsKeyArn: "STRING_VALUE",
  *   },
@@ -71,7 +73,7 @@ export interface UpdateDataSourceCommandOutput extends UpdateDataSourceResponse,
  * //     knowledgeBaseId: "STRING_VALUE", // required
  * //     dataSourceId: "STRING_VALUE", // required
  * //     name: "STRING_VALUE", // required
- * //     status: "AVAILABLE" || "DELETING", // required
+ * //     status: "AVAILABLE" || "DELETING" || "DELETE_UNSUCCESSFUL", // required
  * //     description: "STRING_VALUE",
  * //     dataSourceConfiguration: { // DataSourceConfiguration
  * //       type: "S3", // required
@@ -80,6 +82,7 @@ export interface UpdateDataSourceCommandOutput extends UpdateDataSourceResponse,
  * //         inclusionPrefixes: [ // S3Prefixes
  * //           "STRING_VALUE",
  * //         ],
+ * //         bucketOwnerAccountId: "STRING_VALUE",
  * //       },
  * //     },
  * //     serverSideEncryptionConfiguration: { // ServerSideEncryptionConfiguration
@@ -94,8 +97,12 @@ export interface UpdateDataSourceCommandOutput extends UpdateDataSourceResponse,
  * //         },
  * //       },
  * //     },
+ * //     dataDeletionPolicy: "RETAIN" || "DELETE",
  * //     createdAt: new Date("TIMESTAMP"), // required
  * //     updatedAt: new Date("TIMESTAMP"), // required
+ * //     failureReasons: [ // FailureReasons
+ * //       "STRING_VALUE",
+ * //     ],
  * //   },
  * // };
  *
diff --git a/clients/client-bedrock-agent/src/commands/UpdateKnowledgeBaseCommand.ts b/clients/client-bedrock-agent/src/commands/UpdateKnowledgeBaseCommand.ts
@@ -166,7 +166,7 @@ export interface UpdateKnowledgeBaseCommandOutput extends UpdateKnowledgeBaseRes
  * //         },
  * //       },
  * //     },
- * //     status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED", // required
+ * //     status: "CREATING" || "ACTIVE" || "DELETING" || "UPDATING" || "FAILED" || "DELETE_UNSUCCESSFUL", // required
  * //     createdAt: new Date("TIMESTAMP"), // required
  * //     updatedAt: new Date("TIMESTAMP"), // required
  * //     failureReasons: [ // FailureReasons
diff --git a/clients/client-bedrock-agent/src/models/models_0.ts b/clients/client-bedrock-agent/src/models/models_0.ts
@@ -2190,6 +2190,20 @@ export interface UpdateAgentAliasResponse {
   agentAlias: AgentAlias | undefined;
 }
 
+/**
+ * @public
+ * @enum
+ */
+export const DataDeletionPolicy = {
+  DELETE: "DELETE",
+  RETAIN: "RETAIN",
+} as const;
+
+/**
+ * @public
+ */
+export type DataDeletionPolicy = (typeof DataDeletionPolicy)[keyof typeof DataDeletionPolicy];
+
 /**
  * <p>Contains information about the S3 configuration of the data source.</p>
  * @public
@@ -2206,6 +2220,12 @@ export interface S3DataSourceConfiguration {
    * @public
    */
   inclusionPrefixes?: string[];
+
+  /**
+   * <p>The account ID for the owner of the S3 bucket.</p>
+   * @public
+   */
+  bucketOwnerAccountId?: string;
 }
 
 /**
@@ -2358,6 +2378,12 @@ export interface CreateDataSourceRequest {
    */
   dataSourceConfiguration: DataSourceConfiguration | undefined;
 
+  /**
+   * <p>The deletion policy for the requested data source</p>
+   * @public
+   */
+  dataDeletionPolicy?: DataDeletionPolicy;
+
   /**
    * <p>Contains details about the server-side encryption for the data source.</p>
    * @public
@@ -2377,6 +2403,7 @@ export interface CreateDataSourceRequest {
  */
 export const DataSourceStatus = {
   AVAILABLE: "AVAILABLE",
+  DELETE_UNSUCCESSFUL: "DELETE_UNSUCCESSFUL",
   DELETING: "DELETING",
 } as const;
 
@@ -2446,6 +2473,12 @@ export interface DataSource {
    */
   vectorIngestionConfiguration?: VectorIngestionConfiguration;
 
+  /**
+   * <p>The deletion policy for the data source.</p>
+   * @public
+   */
+  dataDeletionPolicy?: DataDeletionPolicy;
+
   /**
    * <p>The time at which the data source was created.</p>
    * @public
@@ -2457,6 +2490,12 @@ export interface DataSource {
    * @public
    */
   updatedAt: Date | undefined;
+
+  /**
+   * <p>The details of the failure reasons related to the data source.</p>
+   * @public
+   */
+  failureReasons?: string[];
 }
 
 /**
@@ -2654,6 +2693,12 @@ export interface UpdateDataSourceRequest {
    */
   dataSourceConfiguration: DataSourceConfiguration | undefined;
 
+  /**
+   * <p>The data deletion policy of the updated data source.</p>
+   * @public
+   */
+  dataDeletionPolicy?: DataDeletionPolicy;
+
   /**
    * <p>Contains details about server-side encryption of the data source.</p>
    * @public
@@ -3517,6 +3562,7 @@ export interface CreateKnowledgeBaseRequest {
 export const KnowledgeBaseStatus = {
   ACTIVE: "ACTIVE",
   CREATING: "CREATING",
+  DELETE_UNSUCCESSFUL: "DELETE_UNSUCCESSFUL",
   DELETING: "DELETING",
   FAILED: "FAILED",
   UPDATING: "UPDATING",
diff --git a/clients/client-bedrock-agent/src/protocols/Aws_restJson1.ts b/clients/client-bedrock-agent/src/protocols/Aws_restJson1.ts
@@ -302,6 +302,7 @@ export const se_CreateDataSourceCommand = async (
   body = JSON.stringify(
     take(input, {
       clientToken: [true, (_) => _ ?? generateIdempotencyToken()],
+      dataDeletionPolicy: [],
       dataSourceConfiguration: (_) => _json(_),
       description: [],
       name: [],
@@ -1033,6 +1034,7 @@ export const se_UpdateDataSourceCommand = async (
   let body: any;
   body = JSON.stringify(
     take(input, {
+      dataDeletionPolicy: [],
       dataSourceConfiguration: (_) => _json(_),
       description: [],
       name: [],
@@ -2476,9 +2478,11 @@ const de_AgentVersionSummary = (output: any, context: __SerdeContext): AgentVers
 const de_DataSource = (output: any, context: __SerdeContext): DataSource => {
   return take(output, {
     createdAt: (_: any) => __expectNonNull(__parseRfc3339DateTimeWithOffset(_)),
+    dataDeletionPolicy: __expectString,
     dataSourceConfiguration: _json,
     dataSourceId: __expectString,
     description: __expectString,
+    failureReasons: _json,
     knowledgeBaseId: __expectString,
     name: __expectString,
     serverSideEncryptionConfiguration: _json,
diff --git a/codegen/sdk-codegen/aws-models/bedrock-agent.json b/codegen/sdk-codegen/aws-models/bedrock-agent.json

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export interface DeleteDataSourceCommandOutput extends DeleteDataSourceResponse,`
`43`	`43`	`* // { // DeleteDataSourceResponse`
`44`	`44`	`* // knowledgeBaseId: "STRING_VALUE", // required`
`45`	`45`	`* // dataSourceId: "STRING_VALUE", // required`
`46`		`- * // status: "AVAILABLE" \|\| "DELETING", // required`
	`46`	`+ * // status: "AVAILABLE" \|\| "DELETING" \|\| "DELETE_UNSUCCESSFUL", // required`
`47`	`47`	`* // };`
`48`	`48`	`*`
`49`	`49`	* ```
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ export interface DeleteKnowledgeBaseCommandOutput extends DeleteKnowledgeBaseRes`
`41`	`41`	`* const response = await client.send(command);`
`42`	`42`	`* // { // DeleteKnowledgeBaseResponse`
`43`	`43`	`* // knowledgeBaseId: "STRING_VALUE", // required`
`44`		`- * // status: "CREATING" \|\| "ACTIVE" \|\| "DELETING" \|\| "UPDATING" \|\| "FAILED", // required`
	`44`	`+ * // status: "CREATING" \|\| "ACTIVE" \|\| "DELETING" \|\| "UPDATING" \|\| "FAILED" \|\| "DELETE_UNSUCCESSFUL", // required`
`45`	`45`	`* // };`
`46`	`46`	`*`
`47`	`47`	* ```