cdk-rds-sql 6.1.2 → 6.1.3

package/.jsii

@@ -5013,6 +5013,6 @@
       "symbolId": "src/sql:SqlProps"
     }
   },
-  "version": "6.1.2",
-  "fingerprint": "FQIXsw6jGjZF4hbnqoBdGnn4gH67Zc1OmM9Xs2QqDoQ="
+  "version": "6.1.3",
+  "fingerprint": "OSWQkBKuUvytrwDYuqWb51S4Qwasx2Cvb/b4clwJ2EQ="
 }

package/CLAUDE.md

@@ -73,7 +73,7 @@ npm run package-all
 
 - **Framework**: Jest with TypeScript support
 - **Test Files**: Located in `test/` and `lambda/` directories
-- **Configuration**: Max 2 concurrent workers for database tests
+- **Configuration**: See `jestOptions` in `.projenrc.ts`.
 - **Coverage**: Enabled with multiple reporters (json, lcov, clover, cobertura, text)
 
 ## Database Engine Support
@@ -92,7 +92,13 @@ npm run package-all
 
 ## Build Process
 
-The project uses projen for build management. Do not change files managed by projen, but instead change `.projenrc.ts`
+The project uses projen for build management. Do not change files
+managed by projen, but instead change `.projenrc.ts`. After changing
+`.projenrc.ts` run `npx projen`.
+
+In particular:
+
+1. Do not change `package.json`.
 
 Projen tasks:
 

package/lambda/handler.mysql.test.ts

@@ -18,7 +18,7 @@ let mysqlContainer: StartedTestContainer
 let mysqlHost: string
 let mysqlPort: number
 
-beforeEach(async () => {
+beforeAll(async () => {
   process.env.LOGGER = "true"
   process.env.SSL = "false"
   process.env.CONNECTION_TIMEOUT = "5000"
@@ -47,15 +47,44 @@ beforeEach(async () => {
       }),
     }
   })
-}, 30000)
+}, 60000)
 
-afterEach(async () => {
-  jest.clearAllMocks()
+afterAll(async () => {
   if (mysqlContainer) {
     await mysqlContainer.stop()
   }
 })
 
+beforeEach(async () => {
+  jest.clearAllMocks()
+
+  // Clean up databases and users created by tests
+  const connection = await newConnection()
+
+  try {
+    // Drop all databases except system ones and default
+    const [databases] = await connection.query(
+      "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME NOT IN ('information_schema', 'mysql', 'performance_schema', 'sys', ?)",
+      [DB_DEFAULT_DB]
+    )
+
+    for (const db of databases) {
+      await connection.query(`DROP DATABASE IF EXISTS \`${db.SCHEMA_NAME}\``)
+    }
+
+    // Drop all users except system ones
+    const [users] = await connection.query(
+      "SELECT User FROM mysql.user WHERE User NOT IN ('mysql.sys', 'mysql.session', 'mysql.infoschema', 'root')"
+    )
+
+    for (const user of users) {
+      await connection.query(`DROP USER IF EXISTS '${user.User}'@'%'`)
+    }
+  } finally {
+    await connection.end()
+  }
+})
+
 // Helper functions for MySQL tests
 async function databaseExists(connection: any, dbName: string): Promise<boolean> {
   const [rows] = await connection.query(

package/lambda/handler.postgresql.test.ts

@@ -41,7 +41,7 @@ let pgContainer: StartedTestContainer
 let pgHost: string
 let pgPort: number
 
-beforeEach(async () => {
+beforeAll(async () => {
   process.env.LOGGER = "true"
   process.env.SSL = "false"
   process.env.CONNECTION_TIMEOUT = "5000"
@@ -55,15 +55,62 @@ beforeEach(async () => {
     .start()
   pgHost = pgContainer.getHost()
   pgPort = pgContainer.getMappedPort(DB_PORT)
-}, 30000)
+}, 60000)
 
-afterEach(async () => {
-  jest.clearAllMocks()
+afterAll(async () => {
   if (pgContainer) {
     await pgContainer.stop()
   }
 })
 
+beforeEach(async () => {
+  jest.clearAllMocks()
+
+  // Clean up databases, schemas, and roles created by tests
+  const client = new Client({
+    host: pgHost,
+    port: pgPort,
+    database: DB_DEFAULT_DB,
+    user: DB_MASTER_USERNAME,
+    password: DB_MASTER_PASSWORD,
+  })
+
+  await client.connect()
+
+  try {
+    // Drop all databases except system ones and default
+    const databases = await client.query(
+      "SELECT datname FROM pg_database WHERE datistemplate = false AND datname != $1",
+      [DB_DEFAULT_DB]
+    )
+
+    for (const db of databases.rows) {
+      await client.query(`DROP DATABASE IF EXISTS "${db.datname}"`)
+    }
+
+    // Drop all schemas except system ones
+    const schemas = await client.query(
+      "SELECT schema_name FROM information_schema.schemata WHERE schema_name NOT IN ('information_schema', 'pg_catalog', 'pg_toast', 'public')"
+    )
+
+    for (const schema of schemas.rows) {
+      await client.query(`DROP SCHEMA IF EXISTS "${schema.schema_name}" CASCADE`)
+    }
+
+    // Drop all roles except system ones
+    const roles = await client.query(
+      "SELECT rolname FROM pg_roles WHERE rolname NOT LIKE 'pg_%' AND rolname != $1",
+      [DB_MASTER_USERNAME]
+    )
+
+    for (const role of roles.rows) {
+      await client.query(`DROP ROLE IF EXISTS "${role.rolname}"`)
+    }
+  } finally {
+    await client.end()
+  }
+})
+
 //jest.setTimeout(ms("15s"))
 
 test("schema", async () => {

package/lib/database.js

@@ -40,5 +40,5 @@ class Database extends aws_cdk_lib_1.CustomResource {
 }
 exports.Database = Database;
 _a = JSII_RTTI_SYMBOL_1;
-Database[_a] = { fqn: "cdk-rds-sql.Database", version: "6.1.2" };
+Database[_a] = { fqn: "cdk-rds-sql.Database", version: "6.1.3" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2Q0FBNEM7QUFDNUMsMkNBQXNDO0FBQ3RDLGlDQUF1QztBQTJCdkMsTUFBTSxnQkFBaUIsU0FBUSxzQkFBUztJQUd0QyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQXlCO1FBQ2pFLEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDaEIsSUFBSSxDQUFDLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO0lBQ3hDLENBQUM7Q0FDRjtBQUVELE1BQWEsUUFBUyxTQUFRLDRCQUFjO0lBQzFDOztPQUVHO0lBQ0gsTUFBTSxDQUFDLGdCQUFnQixDQUFDLEtBQWdCLEVBQUUsRUFBVSxFQUFFLFlBQW9CO1FBQ3hFLE9BQU8sSUFBSSxnQkFBZ0IsQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ3JDLFlBQVksRUFBRSxZQUFZO1NBQzNCLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFJRCxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQW9CO1FBQzVELEtBQUssQ0FBQyxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ2YsWUFBWSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWTtZQUN6QyxVQUFVLEVBQUU7Z0JBQ1YsUUFBUSxFQUFFLHFCQUFjLENBQUMsUUFBUTtnQkFDakMsVUFBVSxFQUFFLEtBQUssQ0FBQyxZQUFZO2dCQUM5QixTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUztnQkFDMUMsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLEVBQUUsUUFBUTthQUM3QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLENBQUMsWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdEMsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDaEIsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3RDLENBQUM7SUFDSCxDQUFDOztBQTNCSCw0QkE0QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgUHJvdmlkZXIgfSBmcm9tIFwiLi9wcm92aWRlclwiXG5pbXBvcnQgeyBSb2xlIH0gZnJvbSBcIi4vcm9sZVwiXG5cbmludGVyZmFjZSBEYXRhYmFzZUF0dHJpYnV0ZXMge1xuICAvKipcbiAgICogTmFtZSBvZiBkYXRhYmFzZSB0byBjcmVhdGUuXG4gICAqL1xuICByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZSBvd25lci5cbiAgICovXG4gIHJlYWRvbmx5IG93bmVyPzogUm9sZVxufVxuXG5leHBvcnQgaW50ZXJmYWNlIERhdGFiYXNlUHJvcHMgZXh0ZW5kcyBEYXRhYmFzZUF0dHJpYnV0ZXMge1xuICAvKipcbiAgICogUHJvdmlkZXIuXG4gICAqL1xuICByZWFkb25seSBwcm92aWRlcjogUHJvdmlkZXJcbn1cblxuZXhwb3J0IGludGVyZmFjZSBJRGF0YWJhc2Uge1xuICByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xufVxuXG5jbGFzcyBJbXBvcnRlZERhdGFiYXNlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgcHVibGljIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IERhdGFiYXNlQXR0cmlidXRlcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZClcbiAgICB0aGlzLmRhdGFiYXNlTmFtZSA9IHByb3BzLmRhdGFiYXNlTmFtZVxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBEYXRhYmFzZSBleHRlbmRzIEN1c3RvbVJlc291cmNlIGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgLyoqXG4gICAqIFJldHVybiBhIERhdGFiYXNlIGJhc2VkIHVwb24gbmFtZSBvbmx5LiBVc2UgZm9yIGltcG9ydGluZyBleGlzdGluZyBkYXRhYmFzZXMuXG4gICAqL1xuICBzdGF0aWMgZnJvbURhdGFiYXNlTmFtZShzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBkYXRhYmFzZU5hbWU6IHN0cmluZyk6IElEYXRhYmFzZSB7XG4gICAgcmV0dXJuIG5ldyBJbXBvcnRlZERhdGFiYXNlKHNjb3BlLCBpZCwge1xuICAgICAgZGF0YWJhc2VOYW1lOiBkYXRhYmFzZU5hbWUsXG4gICAgfSlcbiAgfVxuXG4gIHB1YmxpYyByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBEYXRhYmFzZVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLkRBVEFCQVNFLFxuICAgICAgICBSZXNvdXJjZUlkOiBwcm9wcy5kYXRhYmFzZU5hbWUsXG4gICAgICAgIFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgT3duZXI6IHByb3BzLm93bmVyPy5yb2xlTmFtZSxcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgICB0aGlzLmRhdGFiYXNlTmFtZSA9IHByb3BzLmRhdGFiYXNlTmFtZVxuICAgIGlmIChwcm9wcy5vd25lcikge1xuICAgICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMub3duZXIpXG4gICAgfVxuICB9XG59XG4iXX0=

package/lib/provider.js

@@ -132,7 +132,7 @@ class Provider extends constructs_1.Construct {
 }
 exports.Provider = Provider;
 _a = JSII_RTTI_SYMBOL_1;
-Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "6.1.2" };
+Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "6.1.3" };
 function slugify(x) {
     return x.replace(/[^a-zA-Z0-9]/g, "");
 }

package/lib/role.js

@@ -129,5 +129,5 @@ class Role extends constructs_1.Construct {
 }
 exports.Role = Role;
 _a = JSII_RTTI_SYMBOL_1;
-Role[_a] = { fqn: "cdk-rds-sql.Role", version: "6.1.2" };
+Role[_a] = { fqn: "cdk-rds-sql.Role", version: "6.1.3" };
 //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"role.js","sourceRoot":"","sources":["../src/role.ts"],"names":[],"mappings":";;;;;AAAA,6CAAkE;AAClE,2CAA0C;AAG1C,uEAAgE;AAChE,2CAA0C;AAC1C,2CAAsC;AAEtC,iCAAuC;AAEvC,iEAAmE;AA4EnE,8CAA8C;AAC9C,MAAM,UAAW,SAAQ,sBAAS;IAChC,YACE,KAAgB,EAChB,EAAU,EACV,KAOC;QAED,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAEhB,4CAA4C;QAC5C,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACvD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,IAAI,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,aAAa,GAAG,EAAE,EAAE;oBAChD,aAAa,EAAE,GAAG,KAAK,CAAC,eAAe,GAAG,GAAG,EAAE;oBAC/C,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE;iBAC9B,CAAC,CAAA;YACJ,CAAC;QACH,CAAC,CAAC,CAAA;QAEF,6DAA6D;QAC7D,MAAM,qBAAqB,GAAG,GAAG,KAAK,CAAC,eAAe,UAAU,CAAA;QAChE,MAAM,kBAAkB,GAAG,IAAI,4BAAc,CAAC,IAAI,EAAE,mBAAmB,EAAE;YACvE,YAAY,EAAE,KAAK,CAAC,oBAAoB;YACxC,UAAU,EAAE;gBACV,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,QAAQ,EAAE,qBAAc,CAAC,kBAAkB;gBAC3C,WAAW,EAAE,KAAK,CAAC,WAAW;gBAC9B,aAAa,EAAE,qBAAqB;aACrC;SACF,CAAC,CAAA;QACF,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAErD,MAAM,QAAQ,GAAG,eAAe,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,IACnD,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OACjB,aACE,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC/C,GAAG,qBAAqB,EAAE,CAAA;QAE1B,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,eAAe,CACpC,IAAI,GAAG,CAAC,eAAe,CAAC;YACtB,OAAO,EAAE,CAAC,kBAAkB,EAAE,uBAAuB,EAAE,mBAAmB,CAAC;YAC3E,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CACH,CAAA;IACH,CAAC;CACF;AAED,MAAa,IAAK,SAAQ,sBAAS;IAWjC,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAgB;QACxD,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACzC,MAAM,yCAAyC,CAAA;QACjD,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YAC3C,oGAAoG;YACpG,yEAAyE;YACzE,sDAAsD;YACtD,MAAM,yCAAyC,CAAA;QACjD,CAAC;QACD,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAEhB,MAAM,IAAI,GAAI,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe;YACvE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe,CAAC,QAAQ;YACvE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA6B,CAAC,gBAAgB,CAAC,QAAQ,CAAA;QAE3E,MAAM,IAAI,GAAI,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe;YACvE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe,CAAC,IAAI;YACnE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA6B,CAAC,gBAAgB,CAAC,IAAI,CAAA;QAEvE,MAAM,UAAU,GAAI,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,iBAAiB;YAC/E,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,iBAAiB;YAChE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA6B,CAAC,kBAAkB,CAAA;QAEpE,MAAM,cAAc,GAAG;YACrB,mBAAmB,EAAE,UAAU;YAC/B,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;YAC7B,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY;SAC1E,CAAA;QAED,IAAI,CAAC,MAAM,GAAG,IAAI,2BAAM,CAAC,IAAI,EAAE,QAAQ,EAAE;YACvC,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;YAClC,WAAW,EAAE,wBAAwB,KAAK,CAAC,QAAQ,CAAC,MAAM,SAAS,KAAK,CAAC,QAAQ,EAAE;YACnF,GAAG,CAAC,KAAK,CAAC,aAAa;gBACrB,CAAC,CAAC;oBACE,0DAA0D;oBAC1D,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;iBACrD;gBACH,CAAC,CAAC;oBACE,uCAAuC;oBACvC,oBAAoB,EAAE;wBACpB,cAAc,EAAE,EAAE,EAAE,sDAAsD;wBAC1E,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;wBACpD,iBAAiB,EAAE,UAAU;wBAC7B,iBAAiB,EAAE,+BAA+B;qBACnD;iBACF,CAAC;YACN,aAAa,EAAE,2BAAa,CAAC,OAAO;SACrC,CAAC,CAAA;QAEF,mDAAmD;QACnD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;YAC1B,MAAM,SAAS,GAAG;gBAChB,mBAAmB,EAAE,UAAU;gBAC/B,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;gBAC7B,IAAI,EAAE,IAAI;gBACV,IAAI,EAAE,IAAI;gBACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY;aAC1E,CAAA;YAED,IAAI,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE;gBACjC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS;gBAC1C,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;gBAC7D,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,YAAY;gBACjD,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,SAAS;aACV,CAAC,CAAA;QACJ,CAAC;QAED,MAAM,IAAI,GAAG,IAAI,2BAAkB,CAAC,IAAI,EAAE,cAAc,EAAE;YACxD,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;YAC7D,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,aAAa,EAAE,KAAK,CAAC,aAAa;SACnC,CAAC,CAAA;QACF,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QACpC,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;QAC9B,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;YAC9B,gDAAgD;YAChD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;;AArGH,oBAsGC","sourcesContent":["import { CustomResource, RemovalPolicy, Stack } from \"aws-cdk-lib\"\nimport * as iam from \"aws-cdk-lib/aws-iam\"\nimport * as kms from \"aws-cdk-lib/aws-kms\"\nimport { IDatabaseCluster, IDatabaseInstance } from \"aws-cdk-lib/aws-rds\"\nimport { ISecret, Secret } from \"aws-cdk-lib/aws-secretsmanager\"\nimport * as ssm from \"aws-cdk-lib/aws-ssm\"\nimport { Construct } from \"constructs\"\nimport { IDatabase } from \"./database\"\nimport { RdsSqlResource } from \"./enum\"\nimport { Provider } from \"./provider\"\nimport { Role as CustomResourceRole } from \"./role.custom-resource\"\n\nexport interface RoleProps {\n  /**\n   * Provider.\n   */\n  readonly provider: Provider\n\n  /**\n   * SQL.\n   */\n  readonly roleName: string\n\n  /**\n   * Optional database this user is expected to use.\n   *\n   * If the database exists, connect privileges are granted.\n   *\n   * Specify one of `database` or `databaseName`. This is the name\n   * that will be stored in the role's secret as the database name to\n   * use.\n   */\n  readonly database?: IDatabase\n\n  /**\n   * Optional database name this user is expected to use.\n   *\n   * If the database exists, connect privileges are granted.\n   *\n   * Specify one of `database` or `databaseName`. This is the name\n   * that will be stored in the role's secret as the database name to\n   * use.\n   */\n  readonly databaseName?: string\n\n  /**\n   * A new secret is created for this user.\n   *\n   * Optionally encrypt it with the given key.\n   */\n  readonly encryptionKey?: kms.IKey\n\n  /**\n   * A new secret is created for this user.\n   *\n   * Optionally add secret name to the secret.\n   */\n  readonly secretName?: string\n\n  /**\n   * Prefix for SSM parameters to store credentials in Parameter Store.\n   * When defined, credentials will also be stored as parameters.\n   *\n   * The parameter names such as \"password\" is simply appended to\n   * `parameterPrefix`, so make sure the prefix ends with a slash if\n   *  you have your parameter names slash separated.\n   *\n   * Note that the password from the secret is copied just once, they\n   * are not kept in sync.\n   *\n   * @default - credentials are only stored in Secrets Manager\n   */\n  readonly parameterPrefix?: string\n\n  /**\n   * Enable IAM authentication for this role.\n   *\n   * When enabled, the role will be created without a password and\n   * configured for AWS IAM database authentication. The secret\n   * will not contain a password field.\n   *\n   * @default false - use password authentication\n   */\n  readonly enableIamAuth?: boolean\n}\n\n// Private Parameters construct (not exported)\nclass Parameters extends Construct {\n  constructor(\n    scope: Construct,\n    id: string,\n    props: {\n      provider: Provider\n      secretArn: string\n      parameterPrefix: string\n      passwordArn: string\n      providerServiceToken: string\n      paramData: Record<string, any>\n    }\n  ) {\n    super(scope, id)\n\n    // Create parameters for each key-value pair\n    Object.entries(props.paramData).forEach(([key, value]) => {\n      if (value !== undefined) {\n        new ssm.StringParameter(this, `Parameter-${key}`, {\n          parameterName: `${props.parameterPrefix}${key}`,\n          stringValue: value.toString(),\n        })\n      }\n    })\n\n    // For password, use the existing provider to store it in SSM\n    const passwordParameterName = `${props.parameterPrefix}password`\n    const password_parameter = new CustomResource(this, \"PasswordParameter\", {\n      serviceToken: props.providerServiceToken,\n      properties: {\n        SecretArn: props.secretArn,\n        Resource: RdsSqlResource.PARAMETER_PASSWORD,\n        PasswordArn: props.passwordArn,\n        ParameterName: passwordParameterName,\n      },\n    })\n    password_parameter.node.addDependency(props.provider)\n\n    const paramArn = `arn:aws:ssm:${Stack.of(this).region}:${\n      Stack.of(this).account\n    }:parameter${\n      passwordParameterName.startsWith(\"/\") ? \"\" : \"/\"\n    }${passwordParameterName}`\n\n    props.provider.handler.addToRolePolicy(\n      new iam.PolicyStatement({\n        actions: [\"ssm:PutParameter\", \"ssm:AddTagsToResource\", \"ssm:GetParameters\"],\n        resources: [paramArn],\n      })\n    )\n  }\n}\n\nexport class Role extends Construct {\n  /**\n   * The role name.\n   */\n  public readonly roleName: string\n\n  /**\n   * The generated secret.\n   */\n  public readonly secret: ISecret\n\n  constructor(scope: Construct, id: string, props: RoleProps) {\n    if (props.database && props.databaseName) {\n      throw \"Specify either database or databaseName\"\n    }\n    if (!props.database && !props.databaseName) {\n      // If neither is specified, we might need a default or throw an error depending on desired behavior.\n      // For now, let's assume it's allowed but the secret won't have a dbname.\n      // If it should be required, uncomment the line below:\n      throw \"Specify either database or databaseName\"\n    }\n    super(scope, id)\n\n    const host = (props.provider.cluster as IDatabaseCluster).clusterEndpoint\n      ? (props.provider.cluster as IDatabaseCluster).clusterEndpoint.hostname\n      : (props.provider.cluster as IDatabaseInstance).instanceEndpoint.hostname\n\n    const port = (props.provider.cluster as IDatabaseCluster).clusterEndpoint\n      ? (props.provider.cluster as IDatabaseCluster).clusterEndpoint.port\n      : (props.provider.cluster as IDatabaseInstance).instanceEndpoint.port\n\n    const identifier = (props.provider.cluster as IDatabaseCluster).clusterIdentifier\n      ? (props.provider.cluster as IDatabaseCluster).clusterIdentifier\n      : (props.provider.cluster as IDatabaseInstance).instanceIdentifier\n\n    const secretTemplate = {\n      dbClusterIdentifier: identifier,\n      engine: props.provider.engine,\n      host: host,\n      port: port,\n      username: props.roleName,\n      dbname: props.database ? props.database.databaseName : props.databaseName,\n    }\n\n    this.secret = new Secret(this, \"Secret\", {\n      secretName: props.secretName,\n      encryptionKey: props.encryptionKey,\n      description: `Generated secret for ${props.provider.engine} role ${props.roleName}`,\n      ...(props.enableIamAuth\n        ? {\n            // For IAM auth, create secret without password generation\n            secretStringTemplate: JSON.stringify(secretTemplate),\n          }\n        : {\n            // For password auth, generate password\n            generateSecretString: {\n              passwordLength: 30, // Oracle password cannot have more than 30 characters\n              secretStringTemplate: JSON.stringify(secretTemplate),\n              generateStringKey: \"password\",\n              excludeCharacters: \" %+~`#$&*()|[]{}:;<>?!'/@\\\"\\\\\",\n            },\n          }),\n      removalPolicy: RemovalPolicy.DESTROY,\n    })\n\n    // Create Parameters if parameterPrefix is provided\n    if (props.parameterPrefix) {\n      const paramData = {\n        dbClusterIdentifier: identifier,\n        engine: props.provider.engine,\n        host: host,\n        port: port,\n        username: props.roleName,\n        dbname: props.database ? props.database.databaseName : props.databaseName,\n      }\n\n      new Parameters(this, \"Parameters\", {\n        secretArn: props.provider.secret.secretArn,\n        parameterPrefix: props.parameterPrefix,\n        passwordArn: props.enableIamAuth ? \"\" : this.secret.secretArn,\n        providerServiceToken: props.provider.serviceToken,\n        provider: props.provider,\n        paramData,\n      })\n    }\n\n    const role = new CustomResourceRole(this, \"PostgresRole\", {\n      provider: props.provider,\n      roleName: props.roleName,\n      passwordArn: props.enableIamAuth ? \"\" : this.secret.secretArn,\n      database: props.database,\n      databaseName: props.databaseName,\n      enableIamAuth: props.enableIamAuth,\n    })\n    role.node.addDependency(this.secret)\n    this.roleName = props.roleName\n    this.secret.grantRead(props.provider.handler)\n    if (this.secret.encryptionKey) {\n      // It seems we need to grant explicit permission\n      this.secret.encryptionKey.grantDecrypt(props.provider.handler)\n    }\n  }\n}\n"]}

package/lib/schema.js

@@ -27,5 +27,5 @@ class Schema extends aws_cdk_lib_1.CustomResource {
 }
 exports.Schema = Schema;
 _a = JSII_RTTI_SYMBOL_1;
-Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "6.1.2" };
+Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "6.1.3" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUE0QnZDLE1BQWEsTUFBTyxTQUFRLDRCQUFjO0lBR3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxNQUFNO2dCQUMvQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQ3RFLFFBQVEsRUFBRSxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUzthQUN2RDtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLENBQUMsVUFBVSxHQUFHLEtBQUssQ0FBQyxVQUFVLENBQUE7UUFDbEMsSUFBSSxLQUFLLENBQUMsUUFBUTtZQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUMzRCxJQUFJLEtBQUssQ0FBQyxJQUFJO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3JELENBQUM7O0FBbEJILHdCQW1CQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEN1c3RvbVJlc291cmNlIH0gZnJvbSBcImF3cy1jZGstbGliXCJcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCJcbmltcG9ydCB7IElEYXRhYmFzZSB9IGZyb20gXCIuL2RhdGFiYXNlXCJcbmltcG9ydCB7IFJkc1NxbFJlc291cmNlIH0gZnJvbSBcIi4vZW51bVwiXG5pbXBvcnQgeyBQcm92aWRlciB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcbmltcG9ydCB7IFJvbGUgfSBmcm9tIFwiLi9yb2xlXCJcblxuZXhwb3J0IGludGVyZmFjZSBTY2hlbWFQcm9wcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU2NoZW1hIG5hbWUuXG4gICAqL1xuICByZWFkb25seSBzY2hlbWFOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogT3B0aW9uYWwgcm9sZSB0byBiZSBncmFudGVkIGZvciBtYW5hZ2luZyB0YWJsZXMgaW4gc2NoZW1hXG4gICAqL1xuICByZWFkb25seSByb2xlPzogUm9sZVxufVxuXG5leHBvcnQgY2xhc3MgU2NoZW1hIGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBwdWJsaWMgcmVhZG9ubHkgc2NoZW1hTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFNjaGVtYVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLlNDSEVNQSxcbiAgICAgICAgUmVzb3VyY2VJZDogcHJvcHMuc2NoZW1hTmFtZSxcbiAgICAgICAgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuLFxuICAgICAgICBEYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlID8gcHJvcHMuZGF0YWJhc2UuZGF0YWJhc2VOYW1lIDogdW5kZWZpbmVkLFxuICAgICAgICBSb2xlTmFtZTogcHJvcHMucm9sZSA/IHByb3BzLnJvbGUucm9sZU5hbWUgOiB1bmRlZmluZWQsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgdGhpcy5zY2hlbWFOYW1lID0gcHJvcHMuc2NoZW1hTmFtZVxuICAgIGlmIChwcm9wcy5kYXRhYmFzZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMuZGF0YWJhc2UpXG4gICAgaWYgKHByb3BzLnJvbGUpIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLnJvbGUpXG4gIH1cbn1cbiJdfQ==

package/lib/sql.js

@@ -24,5 +24,5 @@ class Sql extends aws_cdk_lib_1.CustomResource {
 }
 exports.Sql = Sql;
 _a = JSII_RTTI_SYMBOL_1;
-Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "6.1.2" };
+Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "6.1.3" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUEyQnZDLE1BQWEsR0FBSSxTQUFRLDRCQUFjO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZTtRQUN2RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLEdBQUc7Z0JBQzVCLFNBQVMsRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxTQUFTO2dCQUMxQyxZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDLFNBQVM7Z0JBQ3RFLFNBQVMsRUFBRSxLQUFLLENBQUMsU0FBUztnQkFDMUIsUUFBUSxFQUFFLEtBQUssQ0FBQyxRQUFRO2FBQ3pCO1NBQ0YsQ0FBQyxDQUFBO1FBQ0YsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO1FBQ3ZDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDN0QsQ0FBQzs7QUFkSCxrQkFlQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEN1c3RvbVJlc291cmNlIH0gZnJvbSBcImF3cy1jZGstbGliXCJcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCJcbmltcG9ydCB7IElEYXRhYmFzZSB9IGZyb20gXCIuL2RhdGFiYXNlXCJcbmltcG9ydCB7IFJkc1NxbFJlc291cmNlIH0gZnJvbSBcIi4vZW51bVwiXG5pbXBvcnQgeyBQcm92aWRlciB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcblxuZXhwb3J0IGludGVyZmFjZSBTcWxQcm9wcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU1FMLlxuICAgKi9cbiAgcmVhZG9ubHkgc3RhdGVtZW50Pzogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIHN0YXRtZW50IHRvIGJlIGV4ZWN1dGVkIHdoZW4gdGhlIHJlc291cmNlIGlzIGRlbGV0ZWRcbiAgICovXG4gIHJlYWRvbmx5IHJvbGxiYWNrPzogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBTcWwgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTcWxQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5TUUwsXG4gICAgICAgIFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybixcbiAgICAgICAgRGF0YWJhc2VOYW1lOiBwcm9wcy5kYXRhYmFzZSA/IHByb3BzLmRhdGFiYXNlLmRhdGFiYXNlTmFtZSA6IHVuZGVmaW5lZCxcbiAgICAgICAgU3RhdGVtZW50OiBwcm9wcy5zdGF0ZW1lbnQsXG4gICAgICAgIFJvbGxiYWNrOiBwcm9wcy5yb2xsYmFjayxcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgICBpZiAocHJvcHMuZGF0YWJhc2UpIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLmRhdGFiYXNlKVxuICB9XG59XG4iXX0=

package/package.json

@@ -101,7 +101,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "6.1.2",
+  "version": "6.1.3",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [
@@ -117,8 +117,8 @@
       "/.github/",
       "/dist/"
     ],
-    "maxConcurrency": 2,
-    "maxWorkers": 2,
+    "maxConcurrency": 4,
+    "maxWorkers": 4,
     "clearMocks": true,
     "collectCoverage": true,
     "coverageReporters": [