Update samples to use DSQL connectors

javascript/node-postgres/README.md

@@ -11,12 +11,12 @@ you to interact with PostgreSQL databases using JavaScript code.
 
 ## About the code example
 
+This example uses the [Aurora DSQL Node.js Connector](https://github.com/awslabs/aurora-dsql-nodejs-connector) which automatically handles IAM token generation for authentication.
+
 The example demonstrates a flexible connection approach that works for both admin and non-admin users:
 
-* When connecting as an **admin user**, the example uses the `public` schema and generates an admin authentication
-  token.
-* When connecting as a **non-admin user**, the example uses a custom `myschema` schema and generates a standard
-  authentication token.
+* When connecting as an **admin user**, the example uses the `public` schema and generates an admin authentication token.
+* When connecting as a **non-admin user**, the example uses a custom `myschema` schema and generates a standard authentication token.
 
 The code automatically detects the user type and adjusts its behavior accordingly.
 
@@ -76,9 +76,6 @@ export CLUSTER_USER="<your user>"
 
 # e.g. "foo0bar1baz2quux3quuux4.dsql.us-east-1.on.aws"
 export CLUSTER_ENDPOINT="<your endpoint>"
-
-# e.g. "us-east-1"
-export REGION="<your region>"
 ```
 
 Run the example:
@@ -93,8 +90,10 @@ The example contains comments explaining the code and the operations being perfo
 ## Additional resources
 
 * [Amazon Aurora DSQL Documentation](https://docs.aws.amazon.com/aurora-dsql/latest/userguide/what-is-aurora-dsql.html)
+* [Aurora DSQL Node.js Connector](https://github.com/awslabs/aurora-dsql-nodejs-connector/tree/main/packages/node-postgres)
 * [node-postgres Documentation](https://node-postgres.com/)
-* [AWS SDK for JavaScript Documentation](https://docs.aws.amazon.com/sdk-for-javascript/)
+
+**Note:** The connector automatically extracts the region from the cluster endpoint and defaults to the `postgres` database.
 
 ---
 

javascript/node-postgres/package.json

@@ -10,9 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@aws-sdk/dsql-signer": "^3.705.0",
+    "@aws/aurora-dsql-node-postgres-connector": "^0.1.5",
     "assert": "2.1.0",
-    "pg": "^8.13.1",
     "uuid": "^11.0.2"
   },
   "devDependencies": {

javascript/node-postgres/src/index.js

@@ -1,58 +1,32 @@
-import { DsqlSigner } from "@aws-sdk/dsql-signer";
-import pg from "pg";
+import { AuroraDSQLClient } from "@aws/aurora-dsql-node-postgres-connector";
 import assert from "node:assert";
-const { Client } = pg;
 
 const ADMIN = "admin";
 const NON_ADMIN_SCHEMA = "myschema";
 
-async function getConnection(clusterEndpoint, user, region) {
-      const signer = new DsqlSigner({
-        hostname: clusterEndpoint,
-        region,
-      });
-      let token;
-      // Generate a fresh password token for each connection, to ensure the token is
-      // not expired when the connection is established
-      if (user === ADMIN) {
-        token = await signer.getDbConnectAdminAuthToken();
-      }
-      else {
-        signer.user = user;
-        token = await signer.getDbConnectAuthToken()
-      }
-      let client = new Client({
-        host: clusterEndpoint,
-        user: user,
-        password: token,
-        database: "postgres",
-        port: 5432,
-        ssl: {
-          rejectUnauthorized: true,
-        }
-      });
-
-      // Connect
-      await client.connect();
-      console.log("Successfully opened connection");
-      return client;
+async function getConnection(clusterEndpoint, user) {
+  const client = new AuroraDSQLClient({
+    host: clusterEndpoint,
+    user: user,
+  });
+
+  await client.connect();
+  console.log("Successfully opened connection");
+  return client;
 }
 
 async function example() {
-
   const clusterEndpoint = process.env.CLUSTER_ENDPOINT;
   assert(clusterEndpoint);
   const user = process.env.CLUSTER_USER;
   assert(user);
-  const region = process.env.REGION;
-  assert(region);
 
   let client;
   try {
-    client = await getConnection(clusterEndpoint, user, region);
+    client = await getConnection(clusterEndpoint, user);
 
     if (user !== ADMIN) {
-      await client.query("SET search_path=" + NON_ADMIN_SCHEMA)
+      await client.query("SET search_path=" + NON_ADMIN_SCHEMA);
     }
 
     // Create a new table
@@ -64,24 +38,25 @@ async function example() {
     )`);
 
     // Insert some data
-    await client.query("INSERT INTO owner(name, city, telephone) VALUES($1, $2, $3)", 
+    await client.query(
+      "INSERT INTO owner(name, city, telephone) VALUES($1, $2, $3)",
       ["John Doe", "Anytown", "555-555-1900"]
     );
 
     // Check that data is inserted by reading it back
-    const result = await client.query("SELECT id, city FROM owner where name='John Doe'");
-    assert.deepEqual(result.rows[0].city, "Anytown")
-    assert.notEqual(result.rows[0].id, null)
+    const result = await client.query(
+      "SELECT id, city FROM owner where name='John Doe'"
+    );
+    assert.deepEqual(result.rows[0].city, "Anytown");
+    assert.notEqual(result.rows[0].id, null);
 
     await client.query("DELETE FROM owner where name='John Doe'");
-
   } catch (error) {
     console.error(error);
-    raise
+    throw error;
   } finally {
-    client?.end()
+    client?.end();
   }
-  Promise.resolve()
 }
 
-export { example }
+export { example };

javascript/postgres-js/README.md

@@ -11,12 +11,12 @@ you to interact with PostgreSQL databases using JavaScript code.
 
 ## About the code example
 
+This example uses the [Aurora DSQL Node.js Connector](https://github.com/awslabs/aurora-dsql-nodejs-connector) which automatically handles IAM token generation for authentication.
+
 The example demonstrates a flexible connection approach that works for both admin and non-admin users:
 
-* When connecting as an **admin user**, the example uses the `public` schema and generates an admin authentication
-  token.
-* When connecting as a **non-admin user**, the example uses a custom `myschema` schema and generates a standard
-  authentication token.
+* When connecting as an **admin user**, the example uses the `public` schema and generates an admin authentication token.
+* When connecting as a **non-admin user**, the example uses a custom `myschema` schema and generates a standard authentication token.
 
 The code automatically detects the user type and adjusts its behavior accordingly.
 
@@ -76,9 +76,6 @@ export CLUSTER_USER="<your user>"
 
 # e.g. "foo0bar1baz2quux3quuux4.dsql.us-east-1.on.aws"
 export CLUSTER_ENDPOINT="<your endpoint>"
-
-# e.g. "us-east-1"
-export REGION="<your region>"
 ```
 
 Run the example:
@@ -102,8 +99,10 @@ interactions.
 ## Additional resources
 
 * [Amazon Aurora DSQL Documentation](https://docs.aws.amazon.com/aurora-dsql/latest/userguide/what-is-aurora-dsql.html)
+* [Aurora DSQL Node.js Connector](https://github.com/awslabs/aurora-dsql-nodejs-connector/tree/main/packages/postgres-js)
 * [Postgres.js Documentation](https://github.com/porsager/postgres)
-* [AWS SDK for JavaScript Documentation](https://docs.aws.amazon.com/sdk-for-javascript/)
+
+**Note:** The connector automatically extracts the region from the cluster endpoint and defaults to the `postgres` database.
 
 ---