Merge branch 'main' into V1130698383

Author: beqqrry-aws

.doc_gen/metadata/bedrock-runtime_metadata.yaml

@@ -1321,6 +1321,14 @@ bedrock-runtime_InvokeModel_AmazonNovaImageGeneration:
             - description: Create an image with the Amazon Nova Canvas.
               snippet_tags:
                 - python.example_code.bedrock-runtime.InvokeModel_AmazonNovaImageGeneration
+    Swift:
+      versions:
+        - sdk_version: 1
+          github: swift/example_code/bedrock-runtime
+          excerpts:
+            - description: Create an image with Amazon Nova Canvas.
+              snippet_tags:
+                - swift.example_code.bedrock-runtime.InvokeModel_AmazonNovaImageGeneration
   services:
     bedrock-runtime: {InvokeModel}
 

.doc_gen/metadata/qldb_metadata.yaml

@@ -11,10 +11,17 @@ const postItemsHandler: Handler = {
     ({ rdsDataClient }) =>
     async (req, res) => {
       const { description, guide, status, name }: Item = req.body;
+      const values = {
+        description: { StringValue: description },
+        guide: { StringValue: guide },
+        status: { StringValue: status },
+        name: { StringValue: name },
+      };
       const command = buildStatementCommand(
-        `insert into items (iditem, description, guide, status, username, archived)\nvalues ("${uuidv4()}", "${description}", "${guide}", "${status}", "${name}", 0)`,
+        `insert into items (iditem, description, guide, status, username, archived)
+         values ("${uuidv4()}", ":description", ":guide", ":status", ":name", 0)`,
+        values,
       );
-
       await rdsDataClient.send(command);
       res.status(200).send({});
     },

.doc_gen/metadata/workdocs_metadata.yaml

@@ -9,9 +9,14 @@ const putItemsArchiveHandler: Handler = {
     ({ rdsDataClient }) =>
     async (req, res) => {
       const { itemId } = req.params;
-
+      const values = {
+        itemId: { StringValue: itemId },
+      };
       const command = buildStatementCommand(
-        `update items\nset archived = 1\nwhere iditem = "${itemId}"`,
+        `update items
+         set archived = 1
+         where iditem = ":itemId"`,
+        values,
       );
 
       await rdsDataClient.send(command);

javascriptv3/example_code/cross-services/aurora-serverless-app/src/handlers/post-items-handler.ts

@@ -1,14 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { ExecuteStatementCommand } from "@aws-sdk/client-rds-data";
-import env from "../../env.json" assert { type: "json" };
+import env from "../../env.json" with { type: "json" };
 
-const buildStatementCommand = (sql: string) => {
+const buildStatementCommand = (
+  sql: string,
+  parameters?: { [key: string]: { [key: string]: unknown } },
+) => {
   return new ExecuteStatementCommand({
     resourceArn: env.CLUSTER_ARN,
     secretArn: env.SECRET_ARN,
     database: env.DB_NAME,
     sql,
+    [parameters ? "parameters" : ""]: [parameters],
   });
 };
 

javascriptv3/example_code/cross-services/aurora-serverless-app/src/handlers/put-items-archive-handler.ts

@@ -12,4 +12,14 @@ describe("command-helper", () => {
       expect(command.input.sql).toBe(sql);
     });
   });
+  it("should create an ExecuteStatementCommand with the provided SQL statement and parameters", () => {
+    const sql = "select * from some_table where id = :id";
+    const parameters = {
+      id: { StringValue: "123" },
+    };
+    const command = buildStatementCommand(sql, parameters);
+    expect(command.constructor.name).toBe("ExecuteStatementCommand");
+    expect(command.input.sql).toBe(sql);
+    expect(command.input.parameters).toEqual([parameters]);
+  });
 });

javascriptv3/example_code/cross-services/aurora-serverless-app/src/statement-commands/command-helper.ts

@@ -60,7 +60,7 @@ public static void main(String[] args) {
             String presignedUrlString = presign.createPresignedGetUrl(bucketName, keyName);
             presign.useHttpUrlConnectionToGet(presignedUrlString);
             presign.useHttpClientToGet(presignedUrlString);
-            presign.useSdkHttpClientToPut(presignedUrlString);
+            presign.useSdkHttpClientToGet(presignedUrlString);
         } finally {
             PresignUrlUtils.deleteObject(bucketName, keyName, s3Client);
             PresignUrlUtils.deleteBucket(bucketName, s3Client);
@@ -142,7 +142,7 @@ public byte[] useHttpClientToGet(String presignedUrlString) {
 
     // snippet-start:[presigned.java2.generatepresignedgeturlandretrieve.sdkhttpclient]
     /* Use the AWS SDK for Java SdkHttpClient class to do the download. */
-    public byte[] useSdkHttpClientToPut(String presignedUrlString) {
+    public byte[] useSdkHttpClientToGet(String presignedUrlString) {
 
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); // Capture the response body to a byte array.
         try {

javascriptv3/example_code/cross-services/aurora-serverless-app/tests/command-helper.unit.test.ts

@@ -70,7 +70,7 @@ void testUsingJdkHttpClient() {
         GeneratePresignedGetUrlAndRetrieve presignInstanceUnderTest = new GeneratePresignedGetUrlAndRetrieve();
         final String presignedUrlString = presignInstanceUnderTest.createPresignedGetUrl(BUCKET_NAME, KEY_NAME);
 
-        final byte[] bytes = presignInstanceUnderTest.useSdkHttpClientToPut(presignedUrlString);
+        final byte[] bytes = presignInstanceUnderTest.useSdkHttpClientToGet(presignedUrlString);
         Assertions.assertTrue(bytes.length > 0);
     }
 }

javav2/example_code/s3/src/main/java/com/example/s3/GeneratePresignedGetUrlAndRetrieve.java

@@ -37,7 +37,7 @@
 
 $s3Service = new S3Service($client, true);
 
-$bucket = 'my-bucket-' . uniqid(); // This bucket will be deleted at the end of this example.
+$bucket = 'amzn-s3-demo-bucket-' . uniqid(); // This bucket will be deleted at the end of this example.
 
 $client->createBucket([
     "Bucket" => $bucket,