feat!: upgrade to aws-sdk-v3 (#18)

sst · Mar 1, 2023 · 5d2417c · 5d2417c
1 parent f09b3b7
commit 5d2417c
Show file tree

Hide file tree

Showing 5 changed files with 746 additions and 125 deletions.
diff --git a/package.json b/package.json
@@ -18,17 +18,17 @@
     "build:cjs": "tsc -p tsconfig-cjs.json"
   },
   "devDependencies": {
+    "@aws-sdk/client-rds-data": "^3.218.0",
     "@changesets/changelog-github": "^0.4.5",
     "@changesets/cli": "^2.23.2",
     "@tsconfig/node14": "^1.0.1",
     "@types/node": "^16.11.0",
-    "aws-sdk": "^2.1008.0",
     "kysely": "^0.19.3",
     "perf_hooks": "^0.0.1",
     "vitest": "^0.18.1"
   },
   "peerDependencies": {
-    "aws-sdk": "2.x",
+    "@aws-sdk/client-rds-data": "3.x",
     "kysely": "0.x"
   },
   "files": [

diff --git a/src/data-api-driver.ts b/src/data-api-driver.ts
@@ -1,10 +1,8 @@
-import { DatabaseConnection, QueryResult } from "kysely";
-import { Driver } from "kysely";
-import { CompiledQuery } from "kysely";
-import RDSDataService, { SqlParametersList } from "aws-sdk/clients/rdsdataservice.js";
+import { RDSData, SqlParameter } from "@aws-sdk/client-rds-data";
+import { CompiledQuery, DatabaseConnection, Driver, QueryResult } from "kysely";
 
 export type DataApiDriverConfig = {
-  client: RDSDataService;
+  client: RDSData;
   secretArn: string;
   resourceArn: string;
   database: string;
@@ -60,8 +58,7 @@ class DataApiConnection implements DatabaseConnection {
         secretArn: this.#config.secretArn,
         resourceArn: this.#config.resourceArn,
         database: this.#config.database,
-      })
-      .promise();
+      });
     this.#transactionId = r.transactionId;
   }
 
@@ -73,8 +70,7 @@ class DataApiConnection implements DatabaseConnection {
         secretArn: this.#config.secretArn,
         resourceArn: this.#config.resourceArn,
         transactionId: this.#transactionId,
-      })
-      .promise();
+      });
   }
 
   public async rollbackTransaction() {
@@ -85,8 +81,7 @@ class DataApiConnection implements DatabaseConnection {
         secretArn: this.#config.secretArn,
         resourceArn: this.#config.resourceArn,
         transactionId: this.#transactionId,
-      })
-      .promise();
+      });
   }
 
   async executeQuery<O>(compiledQuery: CompiledQuery): Promise<QueryResult<O>> {
@@ -96,11 +91,10 @@ class DataApiConnection implements DatabaseConnection {
         secretArn: this.#config.secretArn,
         resourceArn: this.#config.resourceArn,
         sql: compiledQuery.sql,
-        parameters: compiledQuery.parameters as SqlParametersList,
+        parameters: compiledQuery.parameters as SqlParameter[],
         database: this.#config.database,
         includeResultMetadata: true,
-      })
-      .promise();
+      });
     if (!r.columnMetadata) {
       return {
         numUpdatedOrDeletedRows: BigInt(r.numberOfRecordsUpdated || 0),

diff --git a/src/data-api-query-compiler.ts b/src/data-api-query-compiler.ts
@@ -1,4 +1,4 @@
-import { SqlParameter } from "aws-sdk/clients/rdsdataservice";
+import { SqlParameter } from "@aws-sdk/client-rds-data";
 import { MysqlQueryCompiler, PostgresQueryCompiler } from "kysely";
 
 export class PostgresDataApiQueryCompiler extends PostgresQueryCompiler {

diff --git a/test/harness.ts b/test/harness.ts
@@ -1,4 +1,4 @@
-import RDSDataService from "aws-sdk/clients/rdsdataservice";
+import { RDSData } from "@aws-sdk/client-rds-data";
 import { ColumnType, Generated, Kysely } from "kysely";
 import { DataApiDialect } from "../src";
 import { DataApiDriverConfig } from "../src/data-api-driver";
@@ -7,15 +7,14 @@ import path from "path";
 const TEST_DATABASE = "scratch";
 
 const opts: DataApiDriverConfig = {
-  client: new RDSDataService(),
+  client: new RDSData({}),
   database: TEST_DATABASE,
   secretArn: process.env.RDS_SECRET,
   resourceArn: process.env.RDS_ARN,
 };
 const dialect = new DataApiDialect({
   mode: "postgres",
   driver: opts,
-  mode: "postgres",
 });
 
 export interface Person {
@@ -54,26 +53,23 @@ export async function migrate() {
       database: "postgres",
       secretArn: opts.secretArn,
       resourceArn: opts.resourceArn,
-    })
-    .promise();
+    });
 
   await opts.client
     .executeStatement({
       sql: `DROP DATABASE IF EXISTS ${TEST_DATABASE}`,
       database: "postgres",
       secretArn: opts.secretArn,
       resourceArn: opts.resourceArn,
-    })
-    .promise();
+    });
 
   await opts.client
     .executeStatement({
       sql: `CREATE DATABASE ${TEST_DATABASE}`,
       database: "postgres",
       secretArn: opts.secretArn,
       resourceArn: opts.resourceArn,
-    })
-    .promise();
+    });
 
   await db.migration.migrateToLatest(path.resolve("./test/migrations"));
 }