Merge branch 'main' into cpp-async-put-object

Author: beqqrry-aws

.doc_gen/metadata/cross_metadata.yaml

@@ -170,6 +170,10 @@ cross_RDSDataTracker:
         - sdk_version: 3
           github: python/cross_service/aurora_item_tracker
           block_content: cross_RDSDataTracker_Python_block.xml
+    JavaScript:
+      versions:
+        - sdk_version: 3
+          block_content: cross_RDSDataTracker_JavaScriptV3_block.xml
     C++:
       versions:
         - sdk_version: 1

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

@@ -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({});
     },

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

@@ -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/statement-commands/command-helper.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/tests/command-helper.unit.test.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]);
+  });
 });

php/example_code/class_examples/CommandPool.php

@@ -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,

php/example_code/cloudfront/CreateDistributionS3.php

@@ -50,7 +50,7 @@ function createS3Distribution($cloudFrontClient, $distribution)
 function createsTheS3Distribution()
 {
     $originName = 'my-unique-origin-name';
-    $s3BucketURL = 'my-bucket-name.s3.amazonaws.com';
+    $s3BucketURL = 'amzn-s3-demo-bucket.s3.amazonaws.com';
     $callerReference = 'my-unique-caller-reference';
     $comment = 'my-comment-about-this-distribution';
     $defaultCacheBehavior = [

php/example_code/cloudfront/old_tests/CreateDistributionS3Test.php

@@ -24,7 +24,7 @@ public function testCreatesAnS3Distribution()
         require(__DIR__ . '/../CreateDistributionS3.php');
 
         $originName = 'my-unique-origin-name';
-        $s3BucketURL = 'my-bucket-name.s3.amazonaws.com';
+        $s3BucketURL = 'amzn-s3-demo-bucket.s3.amazonaws.com';
         $callerReference = 'my-unique-caller-reference';
         $comment = 'my-comment-about-this-distribution';
         $defaultCacheBehavior = [

php/example_code/cloudfront/old_tests/DisableDistributionS3Test.php

@@ -82,7 +82,7 @@ protected function setUp(): void
             'Origins' => [
                 'Items' => [
                     [
-                        'DomainName' => 'my-bucket-name.s3.amazonaws.com',
+                        'DomainName' => 'amzn-s3-demo-bucket.s3.amazonaws.com',
                         'Id' => 'my-unique-origin-name',
                         'OriginPath' => '',
                         'CustomHeaders' => [

php/example_code/cloudfront/old_tests/UpdateDistributionS3Test.php

@@ -82,7 +82,7 @@ protected function setUp(): void
             'Origins' => [
                 'Items' => [
                     [
-                        'DomainName' => 'my-bucket-name.s3.amazonaws.com',
+                        'DomainName' => 'amzn-s3-demo-bucket.s3.amazonaws.com',
                         'Id' => 'my-unique-origin-name',
                         'OriginPath' => '',
                         'CustomHeaders' => [