cdk-rds-sql 7.2.2 → 7.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,37 @@
1
+ #!/usr/bin/env bash
2
+
3
+ set -o errexit -o pipefail -o nounset
4
+
5
+ # Script claude should use for linting.
6
+
7
+ # Make sure we're in the root
8
+ if [ ! -z "${CLAUDE_PROJECT_DIR:-}" ]
9
+ then
10
+ cd $CLAUDE_PROJECT_DIR
11
+ fi
12
+
13
+ # No file edited, leave
14
+ if [ ! -e ".claude/hooks/.edited" ]
15
+ then
16
+ exit 0
17
+ fi
18
+
19
+ # Read hook input from stdin and check for stop_hook_active flag
20
+ if command -v jq >/dev/null 2>&1; then
21
+ input=$(cat)
22
+ stop_hook_active=$(echo "$input" | jq -r '.stop_hook_active // false')
23
+ if [ "$stop_hook_active" = "true" ]; then
24
+ exit 0
25
+ fi
26
+ fi
27
+
28
+ format=$(npx projen eslint)
29
+
30
+ # Capture stdout and check exit code for the main linting command
31
+ if ! output=$(npx projen typecheck 2>&1); then
32
+ echo "$output" >&2
33
+ exit 2
34
+ fi
35
+
36
+ # We're done, remove .edited
37
+ rm .claude/hooks/.edited
@@ -5,7 +5,7 @@
5
5
  "hooks": [
6
6
  {
7
7
  "type": "command",
8
- "command": "cd $CLAUDE_PROJECT_DIR && npx projen typecheck"
8
+ "command": "$CLAUDE_PROJECT_DIR/.claude/hooks/lint"
9
9
  }
10
10
  ]
11
11
  }
package/.jsii CHANGED
@@ -4447,7 +4447,7 @@
4447
4447
  },
4448
4448
  "locationInModule": {
4449
4449
  "filename": "src/iam-grant.ts",
4450
- "line": 24
4450
+ "line": 34
4451
4451
  },
4452
4452
  "parameters": [
4453
4453
  {
@@ -4473,7 +4473,7 @@
4473
4473
  "kind": "class",
4474
4474
  "locationInModule": {
4475
4475
  "filename": "src/iam-grant.ts",
4476
- "line": 23
4476
+ "line": 24
4477
4477
  },
4478
4478
  "name": "IamGrant",
4479
4479
  "symbolId": "src/iam-grant:IamGrant"
@@ -4488,7 +4488,7 @@
4488
4488
  "kind": "interface",
4489
4489
  "locationInModule": {
4490
4490
  "filename": "src/iam-grant.ts",
4491
- "line": 6
4491
+ "line": 7
4492
4492
  },
4493
4493
  "name": "IamGrantProps",
4494
4494
  "properties": [
@@ -4501,7 +4501,7 @@
4501
4501
  "immutable": true,
4502
4502
  "locationInModule": {
4503
4503
  "filename": "src/iam-grant.ts",
4504
- "line": 10
4504
+ "line": 11
4505
4505
  },
4506
4506
  "name": "provider",
4507
4507
  "type": {
@@ -4517,7 +4517,7 @@
4517
4517
  "immutable": true,
4518
4518
  "locationInModule": {
4519
4519
  "filename": "src/iam-grant.ts",
4520
- "line": 20
4520
+ "line": 21
4521
4521
  },
4522
4522
  "name": "resourceArn",
4523
4523
  "type": {
@@ -4533,7 +4533,7 @@
4533
4533
  "immutable": true,
4534
4534
  "locationInModule": {
4535
4535
  "filename": "src/iam-grant.ts",
4536
- "line": 15
4536
+ "line": 16
4537
4537
  },
4538
4538
  "name": "roleName",
4539
4539
  "type": {
@@ -5594,6 +5594,6 @@
5594
5594
  "symbolId": "src/sql:SqlProps"
5595
5595
  }
5596
5596
  },
5597
- "version": "7.2.2",
5598
- "fingerprint": "lXzxGjUqt1HQxCp9HvQtkqAYvYixY3yCM3azSxd7kEs="
5597
+ "version": "7.3.0",
5598
+ "fingerprint": "2ui58tECqN24bGWJrarg5OBFgO6a0ndTHOc1a/i7VuA="
5599
5599
  }
@@ -27,6 +27,14 @@ repos:
27
27
  exclude: (.mergify.yml|.projen/|.github|tsconfig.dev.json|.gitignore|LICENSE|.gitattributes|.eslintrc.json)
28
28
  stages:
29
29
  - pre-commit
30
+ - repo: local
31
+ hooks:
32
+ - id: projen
33
+ name: run-projen
34
+ language: system
35
+ entry: sh -c 'npx projen'
36
+ files: \.ts$
37
+ pass_filenames: false
30
38
  - repo: local
31
39
  hooks:
32
40
  - id: build-typescript
package/CLAUDE.md CHANGED
@@ -42,6 +42,9 @@ npx projen test
42
42
  # Run tests in watch mode
43
43
  npx projen test:watch
44
44
 
45
+ # Run typecheck (instead of npx tsc --noEmit)
46
+ npx projen typecheck
47
+
45
48
  # Run linting
46
49
  npx projen eslint
47
50
 
@@ -51,7 +51,10 @@ export abstract class AbstractEngine {
51
51
  props: EngineRoleProperties,
52
52
  oldProps: EngineRoleProperties
53
53
  ): Promise<string | string[]>
54
- abstract deleteRole(resourceId: string, props: EngineRoleProperties): string | string[]
54
+ abstract deleteRole(
55
+ resourceId: string,
56
+ props: EngineRoleProperties
57
+ ): Promise<string | string[]>
55
58
 
56
59
  abstract createSchema(
57
60
  resourceId: string,
@@ -37,19 +37,7 @@ export class DsqlEngine extends AbstractEngine {
37
37
  }
38
38
 
39
39
  async createRole(resourceId: string, props: EngineRoleProperties): Promise<string[]> {
40
- const sql = ["BEGIN"]
41
-
42
- // DSQL always uses IAM authentication, no passwords
43
- sql.push(pgFormat("CREATE ROLE %I WITH LOGIN", resourceId))
44
-
45
- if (props?.DatabaseName) {
46
- sql.push(
47
- pgFormat("GRANT CONNECT ON DATABASE %I TO %I", props.DatabaseName, resourceId)
48
- )
49
- }
50
-
51
- sql.push("COMMIT")
52
- return sql
40
+ return this.generateCreateRoleSql(resourceId, props?.DatabaseName)
53
41
  }
54
42
 
55
43
  async updateRole(
@@ -58,30 +46,32 @@ export class DsqlEngine extends AbstractEngine {
58
46
  props: EngineRoleProperties,
59
47
  oldProps: EngineRoleProperties
60
48
  ): Promise<string[]> {
61
- const sql = ["BEGIN"]
49
+ const sql: string[] = []
62
50
 
63
51
  if (oldResourceId !== resourceId) {
64
- // DSQL doesn't support RENAME, so we need to create new role and drop old one
65
- // First create the new role
66
- sql.push(pgFormat("CREATE ROLE %I WITH LOGIN", resourceId))
52
+ // DSQL doesn't support RENAME, so we create new role and drop old one
53
+ // Create new role with old database permissions first
54
+ sql.push(...this.generateCreateRoleSql(resourceId, oldProps?.DatabaseName))
55
+
56
+ // Add special marker for IAM grant revocation
57
+ sql.push(`-- REVOKE_IAM_GRANTS_FOR_ROLE: ${oldResourceId}`)
58
+
59
+ // Drop old role
60
+ sql.push(...this.generateDropRoleSql(oldResourceId))
67
61
 
68
- // Transfer database permissions from old to new role
69
- if (oldProps?.DatabaseName) {
62
+ // If database changed as well, grant new database permissions
63
+ if (props?.DatabaseName && props.DatabaseName !== oldProps?.DatabaseName) {
64
+ sql.push("BEGIN")
70
65
  sql.push(
71
- pgFormat(
72
- "GRANT CONNECT ON DATABASE %I TO %I",
73
- oldProps.DatabaseName,
74
- resourceId
75
- )
66
+ pgFormat("GRANT CONNECT ON DATABASE %I TO %I", props.DatabaseName, resourceId)
76
67
  )
68
+ sql.push("COMMIT")
77
69
  }
70
+ } else {
71
+ // Only permissions are changing (no rename)
72
+ sql.push("BEGIN")
78
73
 
79
- // Drop the old role
80
- sql.push(pgFormat("DROP ROLE IF EXISTS %I", oldResourceId))
81
- }
82
-
83
- // Handle database permission changes (only if role wasn't renamed, otherwise already handled above)
84
- if (oldResourceId === resourceId) {
74
+ // Handle database permission changes
85
75
  if (
86
76
  oldProps?.DatabaseName &&
87
77
  props?.DatabaseName &&
@@ -113,32 +103,25 @@ export class DsqlEngine extends AbstractEngine {
113
103
  )
114
104
  )
115
105
  }
116
- } else if (props?.DatabaseName && props.DatabaseName !== oldProps?.DatabaseName) {
117
- // If role was renamed AND database changed, grant to new database
118
- sql.push(
119
- pgFormat("GRANT CONNECT ON DATABASE %I TO %I", props.DatabaseName, resourceId)
120
- )
106
+
107
+ sql.push("COMMIT")
121
108
  }
122
109
 
123
- sql.push("COMMIT")
124
110
  return sql
125
111
  }
126
112
 
127
- deleteRole(resourceId: string, props: EngineRoleProperties): string | string[] {
128
- const sql = ["BEGIN"]
113
+ async deleteRole(
114
+ resourceId: string,
115
+ props: EngineRoleProperties
116
+ ): Promise<string | string[]> {
117
+ const sql: string[] = []
129
118
 
130
- if (props?.DatabaseName) {
131
- sql.push(
132
- pgFormat(
133
- "REVOKE ALL PRIVILEGES ON DATABASE %I FROM %I",
134
- props.DatabaseName,
135
- resourceId
136
- )
137
- )
138
- }
119
+ // Add special marker for IAM grant revocation
120
+ sql.push(`-- REVOKE_IAM_GRANTS_FOR_ROLE: ${resourceId}`)
121
+
122
+ // Add the regular drop role SQL
123
+ sql.push(...this.generateDropRoleSql(resourceId, props?.DatabaseName))
139
124
 
140
- sql.push(pgFormat("DROP ROLE IF EXISTS %I", resourceId))
141
- sql.push("COMMIT")
142
125
  return sql
143
126
  }
144
127
 
@@ -288,9 +271,31 @@ export class DsqlEngine extends AbstractEngine {
288
271
 
289
272
  for (const statement of statements) {
290
273
  if (statement.trim()) {
291
- this.log(`Executing SQL: ${statement}`)
292
- const result = await client.query(statement)
293
- results.push(result)
274
+ // Handle special IAM grant revocation marker
275
+ if (statement.startsWith("-- REVOKE_IAM_GRANTS_FOR_ROLE:")) {
276
+ const roleName = statement
277
+ .replace("-- REVOKE_IAM_GRANTS_FOR_ROLE:", "")
278
+ .trim()
279
+ await this.revokeIamGrantsForRole(client, roleName)
280
+ } else if (statement.includes("AWS IAM REVOKE")) {
281
+ this.log(`Executing SQL: ${statement}`)
282
+ try {
283
+ const result = await client.query(statement)
284
+ results.push(result)
285
+ } catch (error: any) {
286
+ if (error.message && error.message.includes("does not exist")) {
287
+ this.log(
288
+ `Ignoring error for IAM REVOKE (role doesn't exist): ${error.message}`
289
+ )
290
+ } else {
291
+ throw error
292
+ }
293
+ }
294
+ } else {
295
+ this.log(`Executing SQL: ${statement}`)
296
+ const result = await client.query(statement)
297
+ results.push(result)
298
+ }
294
299
  }
295
300
  }
296
301
 
@@ -322,4 +327,60 @@ export class DsqlEngine extends AbstractEngine {
322
327
  pgFormat("REVOKE ALL ON SCHEMA %I FROM %I", schema, roleName),
323
328
  ]
324
329
  }
330
+
331
+ private generateCreateRoleSql(roleName: string, databaseName?: string): string[] {
332
+ const sql = ["BEGIN"]
333
+ sql.push(pgFormat("CREATE ROLE %I WITH LOGIN", roleName))
334
+
335
+ if (databaseName) {
336
+ sql.push(pgFormat("GRANT CONNECT ON DATABASE %I TO %I", databaseName, roleName))
337
+ }
338
+
339
+ sql.push("COMMIT")
340
+ return sql
341
+ }
342
+
343
+ private generateDropRoleSql(roleName: string, databaseName?: string): string[] {
344
+ const sql = ["BEGIN"]
345
+
346
+ if (databaseName) {
347
+ sql.push(
348
+ pgFormat("REVOKE ALL PRIVILEGES ON DATABASE %I FROM %I", databaseName, roleName)
349
+ )
350
+ }
351
+
352
+ sql.push(pgFormat("DROP ROLE IF EXISTS %I", roleName))
353
+ sql.push("COMMIT")
354
+ return sql
355
+ }
356
+
357
+ private async revokeIamGrantsForRole(client: any, roleName: string): Promise<void> {
358
+ try {
359
+ this.log(`Querying IAM grants for role: ${roleName}`)
360
+
361
+ // Query the IAM role mappings for this role
362
+ const result = await client.query(
363
+ pgFormat(
364
+ "SELECT arn FROM sys.iam_pg_role_mappings WHERE pg_role_name = %L",
365
+ roleName
366
+ )
367
+ )
368
+
369
+ if (result.rows && result.rows.length > 0) {
370
+ this.log(`Found ${result.rows.length} IAM grants to revoke for role: ${roleName}`)
371
+
372
+ // Revoke each IAM grant
373
+ for (const row of result.rows) {
374
+ const revokeStatement = pgFormat("AWS IAM REVOKE %I FROM %L", roleName, row.arn)
375
+ this.log(`Executing IAM revoke: ${revokeStatement}`)
376
+ await client.query(revokeStatement)
377
+ }
378
+ } else {
379
+ this.log(`No IAM grants found for role: ${roleName}`)
380
+ }
381
+ } catch (error) {
382
+ this.log(`Error revoking IAM grants for role ${roleName}: ${error}`)
383
+ // Don't throw here - the role might not have any IAM grants, which is fine
384
+ }
385
+ }
325
386
  }
@@ -54,8 +54,8 @@ describe("MySQL Engine", () => {
54
54
  expect(sql[2]).toContain("FLUSH PRIVILEGES")
55
55
  })
56
56
 
57
- it("should generate correct SQL for deleting a role", () => {
58
- const sql = engine.deleteRole("testrole", { DatabaseName: "testdb" })
57
+ it("should generate correct SQL for deleting a role", async () => {
58
+ const sql = await engine.deleteRole("testrole", { DatabaseName: "testdb" })
59
59
  expect(Array.isArray(sql)).toBe(true)
60
60
  expect(sql[0]).toContain("REVOKE ALL PRIVILEGES")
61
61
  expect(sql[1]).toContain("DROP USER IF EXISTS")
@@ -137,7 +137,7 @@ export class MysqlEngine extends AbstractEngine {
137
137
  return sql
138
138
  }
139
139
 
140
- deleteRole(resourceId: string, props: EngineRoleProperties): string[] {
140
+ async deleteRole(resourceId: string, props: EngineRoleProperties): Promise<string[]> {
141
141
  const sql: string[] = []
142
142
 
143
143
  if (props?.DatabaseName) {
@@ -177,7 +177,7 @@ END$$;`,
177
177
  return sql
178
178
  }
179
179
 
180
- deleteRole(resourceId: string, props: EngineRoleProperties): string[] {
180
+ async deleteRole(resourceId: string, props: EngineRoleProperties): Promise<string[]> {
181
181
  return [
182
182
  "start transaction",
183
183
  pgFormat(
package/lambda/handler.ts CHANGED
@@ -177,7 +177,7 @@ export const handler = async (
177
177
  break
178
178
  case RdsSqlResource.IAM_GRANT:
179
179
  sql = dbEngine.createIamGrant(
180
- resourceId,
180
+ event.ResourceProperties.RoleName,
181
181
  toIamGrantEngineProps(event.ResourceProperties)
182
182
  )
183
183
  break
@@ -226,8 +226,8 @@ export const handler = async (
226
226
  const iamUpdateEvent =
227
227
  event as CloudFormationCustomResourceUpdateEvent<ResourceProperties>
228
228
  sql = dbEngine.updateIamGrant(
229
- resourceId,
230
- oldResourceId,
229
+ event.ResourceProperties.RoleName,
230
+ iamUpdateEvent.OldResourceProperties.RoleName,
231
231
  toIamGrantEngineProps(event.ResourceProperties),
232
232
  toIamGrantEngineProps(iamUpdateEvent.OldResourceProperties)
233
233
  )
@@ -245,7 +245,7 @@ export const handler = async (
245
245
  sql = dbEngine.deleteDatabase(resourceId, secretValues.username)
246
246
  break
247
247
  case RdsSqlResource.ROLE:
248
- sql = dbEngine.deleteRole(
248
+ sql = await dbEngine.deleteRole(
249
249
  resourceId,
250
250
  toRoleEngineProps(event.ResourceProperties)
251
251
  )
@@ -261,7 +261,7 @@ export const handler = async (
261
261
  break
262
262
  case RdsSqlResource.IAM_GRANT:
263
263
  sql = dbEngine.deleteIamGrant(
264
- resourceId,
264
+ event.ResourceProperties.RoleName,
265
265
  toIamGrantEngineProps(event.ResourceProperties)
266
266
  )
267
267
  break
package/lib/database.js CHANGED
@@ -45,5 +45,5 @@ class Database extends aws_cdk_lib_1.CustomResource {
45
45
  }
46
46
  exports.Database = Database;
47
47
  _a = JSII_RTTI_SYMBOL_1;
48
- Database[_a] = { fqn: "cdk-rds-sql.Database", version: "7.2.2" };
48
+ Database[_a] = { fqn: "cdk-rds-sql.Database", version: "7.3.0" };
49
49
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2Q0FBNEM7QUFDNUMsMkNBQXNDO0FBQ3RDLGlDQUF1QztBQUN2Qyx5Q0FBc0Q7QUEwQnRELE1BQU0sZ0JBQWlCLFNBQVEsc0JBQVM7SUFHdEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF5QjtRQUNqRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ2hCLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtJQUN4QyxDQUFDO0NBQ0Y7QUFFRCxNQUFhLFFBQVMsU0FBUSw0QkFBYztJQUMxQzs7T0FFRztJQUNILE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxZQUFvQjtRQUN4RSxPQUFPLElBQUksZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNyQyxZQUFZLEVBQUUsWUFBWTtTQUMzQixDQUFDLENBQUE7SUFDSixDQUFDO0lBSUQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCw0REFBNEQ7UUFDNUQsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sS0FBSyx5QkFBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQ2IscUZBQXFGLENBQ3RGLENBQUE7UUFDSCxDQUFDO1FBRUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxRQUFRO2dCQUNqQyxVQUFVLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0JBQzlCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLEVBQUUsUUFBUTthQUM3QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLENBQUMsWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdEMsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDaEIsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3RDLENBQUM7SUFDSCxDQUFDOztBQWxDSCw0QkFtQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyLCBEYXRhYmFzZUVuZ2luZSB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcbmltcG9ydCB7IFJvbGUgfSBmcm9tIFwiLi9yb2xlXCJcblxuaW50ZXJmYWNlIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBOYW1lIG9mIGRhdGFiYXNlIHRvIGNyZWF0ZS5cbiAgICovXG4gIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlIG93bmVyLlxuICAgKi9cbiAgcmVhZG9ubHkgb3duZXI/OiBSb2xlXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGF0YWJhc2VQcm9wcyBleHRlbmRzIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBJUHJvdmlkZXJcbn1cblxuZXhwb3J0IGludGVyZmFjZSBJRGF0YWJhc2Uge1xuICByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xufVxuXG5jbGFzcyBJbXBvcnRlZERhdGFiYXNlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgcHVibGljIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IERhdGFiYXNlQXR0cmlidXRlcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZClcbiAgICB0aGlzLmRhdGFiYXNlTmFtZSA9IHByb3BzLmRhdGFiYXNlTmFtZVxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBEYXRhYmFzZSBleHRlbmRzIEN1c3RvbVJlc291cmNlIGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgLyoqXG4gICAqIFJldHVybiBhIERhdGFiYXNlIGJhc2VkIHVwb24gbmFtZSBvbmx5LiBVc2UgZm9yIGltcG9ydGluZyBleGlzdGluZyBkYXRhYmFzZXMuXG4gICAqL1xuICBzdGF0aWMgZnJvbURhdGFiYXNlTmFtZShzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBkYXRhYmFzZU5hbWU6IHN0cmluZyk6IElEYXRhYmFzZSB7XG4gICAgcmV0dXJuIG5ldyBJbXBvcnRlZERhdGFiYXNlKHNjb3BlLCBpZCwge1xuICAgICAgZGF0YWJhc2VOYW1lOiBkYXRhYmFzZU5hbWUsXG4gICAgfSlcbiAgfVxuXG4gIHB1YmxpYyByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBEYXRhYmFzZVByb3BzKSB7XG4gICAgLy8gQ2hlY2sgaWYgdXNpbmcgRFNRTCBwcm92aWRlciBhbmQgZm9yYmlkIGRhdGFiYXNlIGNyZWF0aW9uXG4gICAgaWYgKHByb3BzLnByb3ZpZGVyLmVuZ2luZSA9PT0gRGF0YWJhc2VFbmdpbmUuRFNRTCkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKFxuICAgICAgICBcIkRhdGFiYXNlIGNyZWF0aW9uIGlzIG5vdCBzdXBwb3J0ZWQgd2l0aCBEU1FMLiBEU1FMIGFsd2F5cyB1c2VzICdwb3N0Z3JlcycgZGF0YWJhc2UuXCJcbiAgICAgIClcbiAgICB9XG5cbiAgICBzdXBlcihzY29wZSwgaWQsIHtcbiAgICAgIHNlcnZpY2VUb2tlbjogcHJvcHMucHJvdmlkZXIuc2VydmljZVRva2VuLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuREFUQUJBU0UsXG4gICAgICAgIFJlc291cmNlSWQ6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgLi4uKHByb3BzLnByb3ZpZGVyLnNlY3JldCA/IHsgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuIH0gOiB7fSksXG4gICAgICAgIE93bmVyOiBwcm9wcy5vd25lcj8ucm9sZU5hbWUsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgICBpZiAocHJvcHMub3duZXIpIHtcbiAgICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLm93bmVyKVxuICAgIH1cbiAgfVxufVxuIl19
@@ -25452,32 +25452,23 @@ var DsqlEngine = class extends AbstractEngine {
25452
25452
  );
25453
25453
  }
25454
25454
  async createRole(resourceId, props) {
25455
- const sql = ["BEGIN"];
25456
- sql.push((0, import_node_pg_format.format)("CREATE ROLE %I WITH LOGIN", resourceId));
25457
- if (props?.DatabaseName) {
25458
- sql.push(
25459
- (0, import_node_pg_format.format)("GRANT CONNECT ON DATABASE %I TO %I", props.DatabaseName, resourceId)
25460
- );
25461
- }
25462
- sql.push("COMMIT");
25463
- return sql;
25455
+ return this.generateCreateRoleSql(resourceId, props?.DatabaseName);
25464
25456
  }
25465
25457
  async updateRole(resourceId, oldResourceId, props, oldProps) {
25466
- const sql = ["BEGIN"];
25458
+ const sql = [];
25467
25459
  if (oldResourceId !== resourceId) {
25468
- sql.push((0, import_node_pg_format.format)("CREATE ROLE %I WITH LOGIN", resourceId));
25469
- if (oldProps?.DatabaseName) {
25460
+ sql.push(...this.generateCreateRoleSql(resourceId, oldProps?.DatabaseName));
25461
+ sql.push(`-- REVOKE_IAM_GRANTS_FOR_ROLE: ${oldResourceId}`);
25462
+ sql.push(...this.generateDropRoleSql(oldResourceId));
25463
+ if (props?.DatabaseName && props.DatabaseName !== oldProps?.DatabaseName) {
25464
+ sql.push("BEGIN");
25470
25465
  sql.push(
25471
- (0, import_node_pg_format.format)(
25472
- "GRANT CONNECT ON DATABASE %I TO %I",
25473
- oldProps.DatabaseName,
25474
- resourceId
25475
- )
25466
+ (0, import_node_pg_format.format)("GRANT CONNECT ON DATABASE %I TO %I", props.DatabaseName, resourceId)
25476
25467
  );
25468
+ sql.push("COMMIT");
25477
25469
  }
25478
- sql.push((0, import_node_pg_format.format)("DROP ROLE IF EXISTS %I", oldResourceId));
25479
- }
25480
- if (oldResourceId === resourceId) {
25470
+ } else {
25471
+ sql.push("BEGIN");
25481
25472
  if (oldProps?.DatabaseName && props?.DatabaseName && oldProps.DatabaseName !== props.DatabaseName) {
25482
25473
  sql.push(
25483
25474
  (0, import_node_pg_format.format)(
@@ -25502,27 +25493,14 @@ var DsqlEngine = class extends AbstractEngine {
25502
25493
  )
25503
25494
  );
25504
25495
  }
25505
- } else if (props?.DatabaseName && props.DatabaseName !== oldProps?.DatabaseName) {
25506
- sql.push(
25507
- (0, import_node_pg_format.format)("GRANT CONNECT ON DATABASE %I TO %I", props.DatabaseName, resourceId)
25508
- );
25496
+ sql.push("COMMIT");
25509
25497
  }
25510
- sql.push("COMMIT");
25511
25498
  return sql;
25512
25499
  }
25513
- deleteRole(resourceId, props) {
25514
- const sql = ["BEGIN"];
25515
- if (props?.DatabaseName) {
25516
- sql.push(
25517
- (0, import_node_pg_format.format)(
25518
- "REVOKE ALL PRIVILEGES ON DATABASE %I FROM %I",
25519
- props.DatabaseName,
25520
- resourceId
25521
- )
25522
- );
25523
- }
25524
- sql.push((0, import_node_pg_format.format)("DROP ROLE IF EXISTS %I", resourceId));
25525
- sql.push("COMMIT");
25500
+ async deleteRole(resourceId, props) {
25501
+ const sql = [];
25502
+ sql.push(`-- REVOKE_IAM_GRANTS_FOR_ROLE: ${resourceId}`);
25503
+ sql.push(...this.generateDropRoleSql(resourceId, props?.DatabaseName));
25526
25504
  return sql;
25527
25505
  }
25528
25506
  createSchema(resourceId, props) {
@@ -25639,9 +25617,28 @@ var DsqlEngine = class extends AbstractEngine {
25639
25617
  const results = [];
25640
25618
  for (const statement of statements) {
25641
25619
  if (statement.trim()) {
25642
- this.log(`Executing SQL: ${statement}`);
25643
- const result = await client.query(statement);
25644
- results.push(result);
25620
+ if (statement.startsWith("-- REVOKE_IAM_GRANTS_FOR_ROLE:")) {
25621
+ const roleName = statement.replace("-- REVOKE_IAM_GRANTS_FOR_ROLE:", "").trim();
25622
+ await this.revokeIamGrantsForRole(client, roleName);
25623
+ } else if (statement.includes("AWS IAM REVOKE")) {
25624
+ this.log(`Executing SQL: ${statement}`);
25625
+ try {
25626
+ const result = await client.query(statement);
25627
+ results.push(result);
25628
+ } catch (error) {
25629
+ if (error.message && error.message.includes("does not exist")) {
25630
+ this.log(
25631
+ `Ignoring error for IAM REVOKE (role doesn't exist): ${error.message}`
25632
+ );
25633
+ } else {
25634
+ throw error;
25635
+ }
25636
+ }
25637
+ } else {
25638
+ this.log(`Executing SQL: ${statement}`);
25639
+ const result = await client.query(statement);
25640
+ results.push(result);
25641
+ }
25645
25642
  }
25646
25643
  }
25647
25644
  this.log("SQL execution completed");
@@ -25670,6 +25667,49 @@ var DsqlEngine = class extends AbstractEngine {
25670
25667
  (0, import_node_pg_format.format)("REVOKE ALL ON SCHEMA %I FROM %I", schema, roleName)
25671
25668
  ];
25672
25669
  }
25670
+ generateCreateRoleSql(roleName, databaseName) {
25671
+ const sql = ["BEGIN"];
25672
+ sql.push((0, import_node_pg_format.format)("CREATE ROLE %I WITH LOGIN", roleName));
25673
+ if (databaseName) {
25674
+ sql.push((0, import_node_pg_format.format)("GRANT CONNECT ON DATABASE %I TO %I", databaseName, roleName));
25675
+ }
25676
+ sql.push("COMMIT");
25677
+ return sql;
25678
+ }
25679
+ generateDropRoleSql(roleName, databaseName) {
25680
+ const sql = ["BEGIN"];
25681
+ if (databaseName) {
25682
+ sql.push(
25683
+ (0, import_node_pg_format.format)("REVOKE ALL PRIVILEGES ON DATABASE %I FROM %I", databaseName, roleName)
25684
+ );
25685
+ }
25686
+ sql.push((0, import_node_pg_format.format)("DROP ROLE IF EXISTS %I", roleName));
25687
+ sql.push("COMMIT");
25688
+ return sql;
25689
+ }
25690
+ async revokeIamGrantsForRole(client, roleName) {
25691
+ try {
25692
+ this.log(`Querying IAM grants for role: ${roleName}`);
25693
+ const result = await client.query(
25694
+ (0, import_node_pg_format.format)(
25695
+ "SELECT arn FROM sys.iam_pg_role_mappings WHERE pg_role_name = %L",
25696
+ roleName
25697
+ )
25698
+ );
25699
+ if (result.rows && result.rows.length > 0) {
25700
+ this.log(`Found ${result.rows.length} IAM grants to revoke for role: ${roleName}`);
25701
+ for (const row of result.rows) {
25702
+ const revokeStatement = (0, import_node_pg_format.format)("AWS IAM REVOKE %I FROM %L", roleName, row.arn);
25703
+ this.log(`Executing IAM revoke: ${revokeStatement}`);
25704
+ await client.query(revokeStatement);
25705
+ }
25706
+ } else {
25707
+ this.log(`No IAM grants found for role: ${roleName}`);
25708
+ }
25709
+ } catch (error) {
25710
+ this.log(`Error revoking IAM grants for role ${roleName}: ${error}`);
25711
+ }
25712
+ }
25673
25713
  };
25674
25714
 
25675
25715
  // lambda/engine.mysql.ts
@@ -25763,7 +25803,7 @@ var MysqlEngine = class extends AbstractEngine {
25763
25803
  }
25764
25804
  return sql;
25765
25805
  }
25766
- deleteRole(resourceId, props) {
25806
+ async deleteRole(resourceId, props) {
25767
25807
  const sql = [];
25768
25808
  if (props?.DatabaseName) {
25769
25809
  sql.push(
@@ -25972,7 +26012,7 @@ END$$;`,
25972
26012
  sql.push("commit");
25973
26013
  return sql;
25974
26014
  }
25975
- deleteRole(resourceId, props) {
26015
+ async deleteRole(resourceId, props) {
25976
26016
  return [
25977
26017
  "start transaction",
25978
26018
  (0, import_node_pg_format2.format)(
@@ -26242,7 +26282,7 @@ var handler = async (event) => {
26242
26282
  break;
26243
26283
  case "iam_grant" /* IAM_GRANT */:
26244
26284
  sql = dbEngine.createIamGrant(
26245
- resourceId,
26285
+ event.ResourceProperties.RoleName,
26246
26286
  toIamGrantEngineProps(event.ResourceProperties)
26247
26287
  );
26248
26288
  break;
@@ -26288,8 +26328,8 @@ var handler = async (event) => {
26288
26328
  case "iam_grant" /* IAM_GRANT */:
26289
26329
  const iamUpdateEvent = event;
26290
26330
  sql = dbEngine.updateIamGrant(
26291
- resourceId,
26292
- oldResourceId,
26331
+ event.ResourceProperties.RoleName,
26332
+ iamUpdateEvent.OldResourceProperties.RoleName,
26293
26333
  toIamGrantEngineProps(event.ResourceProperties),
26294
26334
  toIamGrantEngineProps(iamUpdateEvent.OldResourceProperties)
26295
26335
  );
@@ -26307,7 +26347,7 @@ var handler = async (event) => {
26307
26347
  sql = dbEngine.deleteDatabase(resourceId, secretValues.username);
26308
26348
  break;
26309
26349
  case "role" /* ROLE */:
26310
- sql = dbEngine.deleteRole(
26350
+ sql = await dbEngine.deleteRole(
26311
26351
  resourceId,
26312
26352
  toRoleEngineProps(event.ResourceProperties)
26313
26353
  );
@@ -26323,7 +26363,7 @@ var handler = async (event) => {
26323
26363
  break;
26324
26364
  case "iam_grant" /* IAM_GRANT */:
26325
26365
  sql = dbEngine.deleteIamGrant(
26326
- resourceId,
26366
+ event.ResourceProperties.RoleName,
26327
26367
  toIamGrantEngineProps(event.ResourceProperties)
26328
26368
  );
26329
26369
  break;
@@ -16,5 +16,6 @@ export interface IamGrantProps {
16
16
  readonly resourceArn: string;
17
17
  }
18
18
  export declare class IamGrant extends CustomResource {
19
+ private static createUniqueResourceId;
19
20
  constructor(scope: Construct, id: string, props: IamGrantProps);
20
21
  }
package/lib/iam-grant.js CHANGED
@@ -3,10 +3,19 @@ var _a;
3
3
  Object.defineProperty(exports, "__esModule", { value: true });
4
4
  exports.IamGrant = void 0;
5
5
  const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
6
+ const crypto = require("crypto");
6
7
  const aws_cdk_lib_1 = require("aws-cdk-lib");
7
8
  const enum_1 = require("./enum");
8
9
  const provider_1 = require("./provider");
9
10
  class IamGrant extends aws_cdk_lib_1.CustomResource {
11
+ static createUniqueResourceId(roleName, resourceArn) {
12
+ const hash = crypto
13
+ .createHash("sha256")
14
+ .update(resourceArn)
15
+ .digest("hex")
16
+ .substring(0, 8);
17
+ return `${roleName}:${hash}`;
18
+ }
10
19
  constructor(scope, id, props) {
11
20
  // IAM grants are only supported on DSQL
12
21
  if (props.provider.engine !== provider_1.DatabaseEngine.DSQL) {
@@ -14,9 +23,11 @@ class IamGrant extends aws_cdk_lib_1.CustomResource {
14
23
  }
15
24
  super(scope, id, {
16
25
  serviceToken: props.provider.serviceToken,
26
+ resourceType: "Custom::DsqlIamGrant",
17
27
  properties: {
18
28
  Resource: enum_1.RdsSqlResource.IAM_GRANT,
19
- ResourceId: props.roleName,
29
+ ResourceId: IamGrant.createUniqueResourceId(props.roleName, props.resourceArn),
30
+ RoleName: props.roleName,
20
31
  ResourceArn: props.resourceArn,
21
32
  },
22
33
  });
@@ -25,5 +36,5 @@ class IamGrant extends aws_cdk_lib_1.CustomResource {
25
36
  }
26
37
  exports.IamGrant = IamGrant;
27
38
  _a = JSII_RTTI_SYMBOL_1;
28
- IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "7.2.2" };
29
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWdyYW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2lhbS1ncmFudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUU1QyxpQ0FBdUM7QUFDdkMseUNBQXNEO0FBbUJ0RCxNQUFhLFFBQVMsU0FBUSw0QkFBYztJQUMxQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQW9CO1FBQzVELHdDQUF3QztRQUN4QyxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLHlCQUFjLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEQsTUFBTSxJQUFJLEtBQUssQ0FDYixnSEFBZ0gsQ0FDakgsQ0FBQTtRQUNILENBQUM7UUFFRCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLFNBQVM7Z0JBQ2xDLFVBQVUsRUFBRSxLQUFLLENBQUMsUUFBUTtnQkFDMUIsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXO2FBQy9CO1NBQ0YsQ0FBQyxDQUFBO1FBQ0YsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQ3pDLENBQUM7O0FBbEJILDRCQW1CQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEN1c3RvbVJlc291cmNlIH0gZnJvbSBcImF3cy1jZGstbGliXCJcbmltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCJcbmltcG9ydCB7IFJkc1NxbFJlc291cmNlIH0gZnJvbSBcIi4vZW51bVwiXG5pbXBvcnQgeyBJUHJvdmlkZXIsIERhdGFiYXNlRW5naW5lIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuXG5leHBvcnQgaW50ZXJmYWNlIElhbUdyYW50UHJvcHMge1xuICAvKipcbiAgICogUHJvdmlkZXIuXG4gICAqL1xuICByZWFkb25seSBwcm92aWRlcjogSVByb3ZpZGVyXG5cbiAgLyoqXG4gICAqIERhdGFiYXNlIHJvbGUgbmFtZSB0byBncmFudCBJQU0gYWNjZXNzIHRvLlxuICAgKi9cbiAgcmVhZG9ubHkgcm9sZU5hbWU6IHN0cmluZ1xuXG4gIC8qKlxuICAgKiBJQU0gcmVzb3VyY2UgQVJOIChyb2xlLCB1c2VyLCBvciBvdGhlciBJQU0gcHJpbmNpcGFsKS5cbiAgICovXG4gIHJlYWRvbmx5IHJlc291cmNlQXJuOiBzdHJpbmdcbn1cblxuZXhwb3J0IGNsYXNzIElhbUdyYW50IGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSWFtR3JhbnRQcm9wcykge1xuICAgIC8vIElBTSBncmFudHMgYXJlIG9ubHkgc3VwcG9ydGVkIG9uIERTUUxcbiAgICBpZiAocHJvcHMucHJvdmlkZXIuZW5naW5lICE9PSBEYXRhYmFzZUVuZ2luZS5EU1FMKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgIFwiSUFNIGdyYW50cyBhcmUgb25seSBzdXBwb3J0ZWQgd2l0aCBEU1FMIGNsdXN0ZXJzLiBVc2UgcmVndWxhciBkYXRhYmFzZSBhdXRoZW50aWNhdGlvbiBmb3IgUkRTL0F1cm9yYSBjbHVzdGVycy5cIlxuICAgICAgKVxuICAgIH1cblxuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5JQU1fR1JBTlQsXG4gICAgICAgIFJlc291cmNlSWQ6IHByb3BzLnJvbGVOYW1lLFxuICAgICAgICBSZXNvdXJjZUFybjogcHJvcHMucmVzb3VyY2VBcm4sXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gIH1cbn1cbiJdfQ==
39
+ IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "7.3.0" };
40
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWdyYW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2lhbS1ncmFudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGlDQUFnQztBQUNoQyw2Q0FBNEM7QUFFNUMsaUNBQXVDO0FBQ3ZDLHlDQUFzRDtBQW1CdEQsTUFBYSxRQUFTLFNBQVEsNEJBQWM7SUFDbEMsTUFBTSxDQUFDLHNCQUFzQixDQUFDLFFBQWdCLEVBQUUsV0FBbUI7UUFDekUsTUFBTSxJQUFJLEdBQUcsTUFBTTthQUNoQixVQUFVLENBQUMsUUFBUSxDQUFDO2FBQ3BCLE1BQU0sQ0FBQyxXQUFXLENBQUM7YUFDbkIsTUFBTSxDQUFDLEtBQUssQ0FBQzthQUNiLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbEIsT0FBTyxHQUFHLFFBQVEsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0lBRUQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCx3Q0FBd0M7UUFDeEMsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sS0FBSyx5QkFBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQ2IsZ0hBQWdILENBQ2pILENBQUE7UUFDSCxDQUFDO1FBRUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFlBQVksRUFBRSxzQkFBc0I7WUFDcEMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLFNBQVM7Z0JBQ2xDLFVBQVUsRUFBRSxRQUFRLENBQUMsc0JBQXNCLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsV0FBVyxDQUFDO2dCQUM5RSxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7Z0JBQ3hCLFdBQVcsRUFBRSxLQUFLLENBQUMsV0FBVzthQUMvQjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUN6QyxDQUFDOztBQTdCSCw0QkE4QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBjcnlwdG8gZnJvbSBcImNyeXB0b1wiXG5pbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyLCBEYXRhYmFzZUVuZ2luZSB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcblxuZXhwb3J0IGludGVyZmFjZSBJYW1HcmFudFByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBEYXRhYmFzZSByb2xlIG5hbWUgdG8gZ3JhbnQgSUFNIGFjY2VzcyB0by5cbiAgICovXG4gIHJlYWRvbmx5IHJvbGVOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogSUFNIHJlc291cmNlIEFSTiAocm9sZSwgdXNlciwgb3Igb3RoZXIgSUFNIHByaW5jaXBhbCkuXG4gICAqL1xuICByZWFkb25seSByZXNvdXJjZUFybjogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBJYW1HcmFudCBleHRlbmRzIEN1c3RvbVJlc291cmNlIHtcbiAgcHJpdmF0ZSBzdGF0aWMgY3JlYXRlVW5pcXVlUmVzb3VyY2VJZChyb2xlTmFtZTogc3RyaW5nLCByZXNvdXJjZUFybjogc3RyaW5nKTogc3RyaW5nIHtcbiAgICBjb25zdCBoYXNoID0gY3J5cHRvXG4gICAgICAuY3JlYXRlSGFzaChcInNoYTI1NlwiKVxuICAgICAgLnVwZGF0ZShyZXNvdXJjZUFybilcbiAgICAgIC5kaWdlc3QoXCJoZXhcIilcbiAgICAgIC5zdWJzdHJpbmcoMCwgOClcbiAgICByZXR1cm4gYCR7cm9sZU5hbWV9OiR7aGFzaH1gXG4gIH1cblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSWFtR3JhbnRQcm9wcykge1xuICAgIC8vIElBTSBncmFudHMgYXJlIG9ubHkgc3VwcG9ydGVkIG9uIERTUUxcbiAgICBpZiAocHJvcHMucHJvdmlkZXIuZW5naW5lICE9PSBEYXRhYmFzZUVuZ2luZS5EU1FMKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgIFwiSUFNIGdyYW50cyBhcmUgb25seSBzdXBwb3J0ZWQgd2l0aCBEU1FMIGNsdXN0ZXJzLiBVc2UgcmVndWxhciBkYXRhYmFzZSBhdXRoZW50aWNhdGlvbiBmb3IgUkRTL0F1cm9yYSBjbHVzdGVycy5cIlxuICAgICAgKVxuICAgIH1cblxuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICByZXNvdXJjZVR5cGU6IFwiQ3VzdG9tOjpEc3FsSWFtR3JhbnRcIixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLklBTV9HUkFOVCxcbiAgICAgICAgUmVzb3VyY2VJZDogSWFtR3JhbnQuY3JlYXRlVW5pcXVlUmVzb3VyY2VJZChwcm9wcy5yb2xlTmFtZSwgcHJvcHMucmVzb3VyY2VBcm4pLFxuICAgICAgICBSb2xlTmFtZTogcHJvcHMucm9sZU5hbWUsXG4gICAgICAgIFJlc291cmNlQXJuOiBwcm9wcy5yZXNvdXJjZUFybixcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgfVxufVxuIl19
package/lib/provider.js CHANGED
@@ -209,7 +209,7 @@ class Provider extends constructs_1.Construct {
209
209
  }
210
210
  exports.Provider = Provider;
211
211
  _a = JSII_RTTI_SYMBOL_1;
212
- Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "7.2.2" };
212
+ Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "7.3.0" };
213
213
  class ImportedProvider extends constructs_1.Construct {
214
214
  constructor(scope, id, attrs) {
215
215
  super(scope, id);
package/lib/role.js CHANGED
@@ -146,5 +146,5 @@ class Role extends constructs_1.Construct {
146
146
  }
147
147
  exports.Role = Role;
148
148
  _a = JSII_RTTI_SYMBOL_1;
149
- Role[_a] = { fqn: "cdk-rds-sql.Role", version: "7.2.2" };
149
+ Role[_a] = { fqn: "cdk-rds-sql.Role", version: "7.3.0" };
150
150
  //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"role.js","sourceRoot":"","sources":["../src/role.ts"],"names":[],"mappings":"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","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 { IProvider, DatabaseEngine } from \"./provider\"\nimport { Role as CustomResourceRole } from \"./role.custom-resource\"\n\nexport interface RoleProps {\n  /**\n   * Provider.\n   */\n  readonly provider: IProvider\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   * Note: For DSQL clusters, this property is ignored as DSQL always\n   * uses IAM authentication.\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: IProvider\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   * Only available for non-DSQL clusters as DSQL uses IAM authentication.\n   */\n  public readonly secret?: ISecret\n\n  constructor(scope: Construct, id: string, props: RoleProps) {\n    if (props.provider.engine !== DatabaseEngine.DSQL) {\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    }\n    super(scope, id)\n\n    // DSQL doesn't use secrets - it always uses IAM authentication\n    if (props.provider.engine !== DatabaseEngine.DSQL) {\n      // For imported providers without cluster details, provide helpful error message\n      if (!props.provider.cluster) {\n        throw new Error(\n          \"Role creation requires cluster information. When importing a provider with \" +\n            \"Provider.fromProviderAttributes(), include the 'cluster' property if you plan \" +\n            \"to create new roles. Alternatively, use existing roles created with the original provider.\"\n        )\n      }\n\n      // For RDS/Aurora clusters and instances, get endpoint details\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\n    const role = new CustomResourceRole(this, \"PostgresRole\", {\n      provider: props.provider,\n      roleName: props.roleName,\n      passwordArn:\n        props.enableIamAuth || props.provider.engine === DatabaseEngine.DSQL\n          ? \"\"\n          : this.secret!.secretArn,\n      database: props.database,\n      databaseName: props.databaseName,\n      enableIamAuth: props.enableIamAuth || props.provider.engine === DatabaseEngine.DSQL,\n    })\n\n    if (this.secret) {\n      role.node.addDependency(this.secret)\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    this.roleName = props.roleName\n  }\n}\n"]}
package/lib/schema.js CHANGED
@@ -27,5 +27,5 @@ class Schema extends aws_cdk_lib_1.CustomResource {
27
27
  }
28
28
  exports.Schema = Schema;
29
29
  _a = JSII_RTTI_SYMBOL_1;
30
- Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "7.2.2" };
30
+ Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "7.3.0" };
31
31
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUE4QnZDLE1BQWEsTUFBTyxTQUFRLDRCQUFjO0lBR3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxNQUFNO2dCQUMvQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQzVCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsWUFBWSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxTQUFTO2dCQUN0RSxRQUFRLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLFNBQVM7YUFDdkQ7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFBO1FBQ2xDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDM0QsSUFBSSxLQUFLLENBQUMsSUFBSTtZQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNyRCxDQUFDOztBQWxCSCx3QkFtQkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuaW1wb3J0IHsgUm9sZSB9IGZyb20gXCIuL3JvbGVcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNjaGVtYVByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU2NoZW1hIG5hbWUuXG4gICAqL1xuICByZWFkb25seSBzY2hlbWFOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogT3B0aW9uYWwgcm9sZSB3aGljaCB3aWxsIGJlIGdyYW50ZWQgdXNhZ2UgYW5kIGNyZWF0ZSBwZXJtaXNzaW9uc1xuICAgKiB0byB0aGlzIHNjaGVtYS4gVGhpcyB3YXkgdGhlIHJvbGUgY2FuIHJlYWQgaXRzIG93biB0YWJsZXMsIGJ1dFxuICAgKiBjYW5ub3Qgc2VlIG9yIGFjY2VzcyB0YWJsZXMgY3JlYXRlZCBieSBvdGhlcnMuXG4gICAqL1xuICByZWFkb25seSByb2xlPzogUm9sZVxufVxuXG5leHBvcnQgY2xhc3MgU2NoZW1hIGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBwdWJsaWMgcmVhZG9ubHkgc2NoZW1hTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFNjaGVtYVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLlNDSEVNQSxcbiAgICAgICAgUmVzb3VyY2VJZDogcHJvcHMuc2NoZW1hTmFtZSxcbiAgICAgICAgLi4uKHByb3BzLnByb3ZpZGVyLnNlY3JldCA/IHsgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuIH0gOiB7fSksXG4gICAgICAgIERhdGFiYXNlTmFtZTogcHJvcHMuZGF0YWJhc2UgPyBwcm9wcy5kYXRhYmFzZS5kYXRhYmFzZU5hbWUgOiB1bmRlZmluZWQsXG4gICAgICAgIFJvbGVOYW1lOiBwcm9wcy5yb2xlID8gcHJvcHMucm9sZS5yb2xlTmFtZSA6IHVuZGVmaW5lZCxcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgICB0aGlzLnNjaGVtYU5hbWUgPSBwcm9wcy5zY2hlbWFOYW1lXG4gICAgaWYgKHByb3BzLmRhdGFiYXNlKSB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5kYXRhYmFzZSlcbiAgICBpZiAocHJvcHMucm9sZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucm9sZSlcbiAgfVxufVxuIl19
package/lib/sql.js CHANGED
@@ -24,5 +24,5 @@ class Sql extends aws_cdk_lib_1.CustomResource {
24
24
  }
25
25
  exports.Sql = Sql;
26
26
  _a = JSII_RTTI_SYMBOL_1;
27
- Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "7.2.2" };
27
+ Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "7.3.0" };
28
28
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUEyQnZDLE1BQWEsR0FBSSxTQUFRLDRCQUFjO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZTtRQUN2RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLEdBQUc7Z0JBQzVCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsWUFBWSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxTQUFTO2dCQUN0RSxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVM7Z0JBQzFCLFFBQVEsRUFBRSxLQUFLLENBQUMsUUFBUTthQUN6QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLEtBQUssQ0FBQyxRQUFRO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQzdELENBQUM7O0FBZEgsa0JBZUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNxbFByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU1FMLlxuICAgKi9cbiAgcmVhZG9ubHkgc3RhdGVtZW50Pzogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIHN0YXRtZW50IHRvIGJlIGV4ZWN1dGVkIHdoZW4gdGhlIHJlc291cmNlIGlzIGRlbGV0ZWRcbiAgICovXG4gIHJlYWRvbmx5IHJvbGxiYWNrPzogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBTcWwgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTcWxQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5TUUwsXG4gICAgICAgIC4uLihwcm9wcy5wcm92aWRlci5zZWNyZXQgPyB7IFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybiB9IDoge30pLFxuICAgICAgICBEYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlID8gcHJvcHMuZGF0YWJhc2UuZGF0YWJhc2VOYW1lIDogdW5kZWZpbmVkLFxuICAgICAgICBTdGF0ZW1lbnQ6IHByb3BzLnN0YXRlbWVudCxcbiAgICAgICAgUm9sbGJhY2s6IHByb3BzLnJvbGxiYWNrLFxuICAgICAgfSxcbiAgICB9KVxuICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLnByb3ZpZGVyKVxuICAgIGlmIChwcm9wcy5kYXRhYmFzZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMuZGF0YWJhc2UpXG4gIH1cbn1cbiJdfQ==
package/package.json CHANGED
@@ -105,7 +105,7 @@
105
105
  "publishConfig": {
106
106
  "access": "public"
107
107
  },
108
- "version": "7.2.2",
108
+ "version": "7.3.0",
109
109
  "jest": {
110
110
  "coverageProvider": "v8",
111
111
  "testMatch": [