cdk-rds-sql 7.3.0 → 7.3.1

package/.jsii

@@ -5594,6 +5594,6 @@
       "symbolId": "src/sql:SqlProps"
     }
   },
-  "version": "7.3.0",
-  "fingerprint": "2ui58tECqN24bGWJrarg5OBFgO6a0ndTHOc1a/i7VuA="
+  "version": "7.3.1",
+  "fingerprint": "Mc3PNE6TVDDeFZIrlQTTfKYL82JgisTUWw7OGZDbhFo="
 }

package/AGENTS.md

@@ -42,6 +42,9 @@ npx projen test
 # Run tests in watch mode
 npx projen test:watch
 
+# Run typecheck (instead of npx tsc --noEmit)
+npx projen typecheck
+
 # Run linting
 npx projen eslint
 
@@ -108,10 +111,6 @@ Projen tasks:
 - Global RDS certificate bundle is automatically downloaded during build
 - Can be disabled via `ssl: false` in Provider props
 
-## Key Dependencies
+## Code style
 
-- **AWS CDK**: v2.171.1
-- **Node.js**: >= 22.14
-- **TypeScript**: ~5.8
-- **Database Drivers**: pg (PostgreSQL), mysql2 (MySQL)
-- **AWS SDKs**: secrets-manager, ssm clients
+- Avoid any.

package/CLAUDE.md

@@ -111,10 +111,6 @@ Projen tasks:
 - Global RDS certificate bundle is automatically downloaded during build
 - Can be disabled via `ssl: false` in Provider props
 
-## Key Dependencies
+## Code style
 
-- **AWS CDK**: v2.171.1
-- **Node.js**: >= 22.14
-- **TypeScript**: ~5.8
-- **Database Drivers**: pg (PostgreSQL), mysql2 (MySQL)
-- **AWS SDKs**: secrets-manager, ssm clients
+- Avoid any.

package/lambda/engine.abstract.ts

@@ -8,7 +8,6 @@ import {
   EngineRoleProperties,
   EngineSchemaProperties,
   EngineSqlProperties,
-  EngineIamGrantProperties,
 } from "./types"
 
 export interface EngineConnectionConfig {
@@ -78,20 +77,14 @@ export abstract class AbstractEngine {
   ): string | string[]
   abstract deleteSql(resourceId: string, props: EngineSqlProperties): string | string[]
 
-  abstract createIamGrant(
-    resourceId: string,
-    props: EngineIamGrantProperties
-  ): string | string[]
+  abstract createIamGrant(roleName: string, iamArn: string): string | string[]
   abstract updateIamGrant(
-    resourceId: string,
-    oldResourceId: string,
-    props: EngineIamGrantProperties,
-    oldProps: EngineIamGrantProperties
-  ): string | string[]
-  abstract deleteIamGrant(
-    resourceId: string,
-    props: EngineIamGrantProperties
+    roleName: string,
+    oldRoleName: string,
+    iamArn: string,
+    oldIamArn: string
   ): string | string[]
+  abstract deleteIamGrant(roleName: string, iamArn: string): string | string[]
 
   abstract executeSQL(
     sql: string | string[],

package/lambda/engine.dsql.ts

@@ -7,7 +7,6 @@ import {
   EngineRoleProperties,
   EngineSchemaProperties,
   EngineSqlProperties,
-  EngineIamGrantProperties,
 } from "./types"
 
 export class DsqlEngine extends AbstractEngine {
@@ -193,41 +192,47 @@ export class DsqlEngine extends AbstractEngine {
     return []
   }
 
-  createIamGrant(resourceId: string, props: EngineIamGrantProperties): string | string[] {
-    if (!props.ResourceArn) {
+  createIamGrant(roleName: string, iamArn: string): string | string[] {
+    if (!iamArn) {
       throw new Error("ResourceArn is required for IAM grant")
     }
-    return pgFormat("AWS IAM GRANT %I TO %L", resourceId, props.ResourceArn)
+    return pgFormat("AWS IAM GRANT %I TO %L", roleName, iamArn)
   }
 
   updateIamGrant(
-    resourceId: string,
-    oldResourceId: string,
-    props: EngineIamGrantProperties,
-    oldProps: EngineIamGrantProperties
+    roleName: string,
+    oldRoleName: string,
+    iamArn: string,
+    oldIamArn: string
   ): string | string[] {
     const statements: string[] = []
 
+    // Only update if role name or IAM role ARN changed
+    const roleNameChanged = oldRoleName !== roleName
+    const arnChanged = oldIamArn !== iamArn
+
+    if (!roleNameChanged && !arnChanged) {
+      return statements // No changes needed
+    }
+
     // Revoke old grant if resource ARN or role name changed
-    if (oldProps.ResourceArn) {
-      statements.push(
-        pgFormat("AWS IAM REVOKE %I FROM %L", oldResourceId, oldProps.ResourceArn)
-      )
+    if (oldIamArn) {
+      statements.push(pgFormat("AWS IAM REVOKE %I FROM %L", oldRoleName, oldIamArn))
     }
 
     // Grant new permissions
-    if (props.ResourceArn) {
-      statements.push(pgFormat("AWS IAM GRANT %I TO %L", resourceId, props.ResourceArn))
+    if (iamArn) {
+      statements.push(pgFormat("AWS IAM GRANT %I TO %L", roleName, iamArn))
     }
 
     return statements
   }
 
-  deleteIamGrant(resourceId: string, props: EngineIamGrantProperties): string | string[] {
-    if (!props.ResourceArn) {
+  deleteIamGrant(roleName: string, iamArn: string): string | string[] {
+    if (!iamArn) {
       throw new Error("ResourceArn is required for IAM grant deletion")
     }
-    return pgFormat("AWS IAM REVOKE %I FROM %L", resourceId, props.ResourceArn)
+    return pgFormat("AWS IAM REVOKE %I FROM %L", roleName, iamArn)
   }
 
   async executeSQL(sql: string | string[], config: EngineConnectionConfig): Promise<any> {
@@ -354,7 +359,7 @@ export class DsqlEngine extends AbstractEngine {
     return sql
   }
 
-  private async revokeIamGrantsForRole(client: any, roleName: string): Promise<void> {
+  private async revokeIamGrantsForRole(client: Client, roleName: string): Promise<void> {
     try {
       this.log(`Querying IAM grants for role: ${roleName}`)
 

package/lambda/engine.mysql.ts

@@ -5,7 +5,6 @@ import {
   EngineRoleProperties,
   EngineSchemaProperties,
   EngineSqlProperties,
-  EngineIamGrantProperties,
 } from "./types"
 
 export class MysqlEngine extends AbstractEngine {
@@ -184,26 +183,20 @@ export class MysqlEngine extends AbstractEngine {
     return props?.Rollback || ""
   }
 
-  createIamGrant(
-    _resourceId: string,
-    _props: EngineIamGrantProperties
-  ): string | string[] {
+  createIamGrant(_roleName: string, _iamArn: string): string | string[] {
     throw new Error("IAM grants are only supported with DSQL clusters")
   }
 
   updateIamGrant(
-    _resourceId: string,
-    _oldResourceId: string,
-    _props: EngineIamGrantProperties,
-    _oldProps: EngineIamGrantProperties
+    _roleName: string,
+    _oldRoleName: string,
+    _iamArn: string,
+    _oldIamArn: string
   ): string | string[] {
     throw new Error("IAM grants are only supported with DSQL clusters")
   }
 
-  deleteIamGrant(
-    _resourceId: string,
-    _props: EngineIamGrantProperties
-  ): string | string[] {
+  deleteIamGrant(_roleName: string, _iamArn: string): string | string[] {
     throw new Error("IAM grants are only supported with DSQL clusters")
   }
 

package/lambda/engine.postgresql.ts

@@ -8,7 +8,6 @@ import {
   EngineRoleProperties,
   EngineSchemaProperties,
   EngineSqlProperties,
-  EngineIamGrantProperties,
 } from "./types"
 
 export class PostgresqlEngine extends AbstractEngine {
@@ -268,26 +267,20 @@ END$$;`,
     ]
   }
 
-  createIamGrant(
-    _resourceId: string,
-    _props: EngineIamGrantProperties
-  ): string | string[] {
+  createIamGrant(_roleName: string, _iamArn: string): string | string[] {
     throw new Error("IAM grants are only supported with DSQL clusters")
   }
 
   updateIamGrant(
-    _resourceId: string,
-    _oldResourceId: string,
-    _props: EngineIamGrantProperties,
-    _oldProps: EngineIamGrantProperties
+    _roleName: string,
+    _oldRoleName: string,
+    _iamArn: string,
+    _oldIamArn: string
   ): string | string[] {
     throw new Error("IAM grants are only supported with DSQL clusters")
   }
 
-  deleteIamGrant(
-    _resourceId: string,
-    _props: EngineIamGrantProperties
-  ): string | string[] {
+  deleteIamGrant(_roleName: string, _iamArn: string): string | string[] {
     throw new Error("IAM grants are only supported with DSQL clusters")
   }
 

package/lambda/handler.ts

@@ -176,10 +176,8 @@ export const handler = async (
           sql = dbEngine.createSql(resourceId, toSqlEngineProps(event.ResourceProperties))
           break
         case RdsSqlResource.IAM_GRANT:
-          sql = dbEngine.createIamGrant(
-            event.ResourceProperties.RoleName,
-            toIamGrantEngineProps(event.ResourceProperties)
-          )
+          const createIam = toIamGrantEngineProps(event.ResourceProperties)
+          sql = dbEngine.createIamGrant(createIam.RoleName, createIam.ResourceArn)
           break
         case RdsSqlResource.PARAMETER_PASSWORD:
           await handleParameterPassword(event.ResourceProperties)
@@ -225,11 +223,13 @@ export const handler = async (
         case RdsSqlResource.IAM_GRANT:
           const iamUpdateEvent =
             event as CloudFormationCustomResourceUpdateEvent<ResourceProperties>
+          const newIam = toIamGrantEngineProps(event.ResourceProperties)
+          const oldIam = toIamGrantEngineProps(iamUpdateEvent.OldResourceProperties)
           sql = dbEngine.updateIamGrant(
-            event.ResourceProperties.RoleName,
-            iamUpdateEvent.OldResourceProperties.RoleName,
-            toIamGrantEngineProps(event.ResourceProperties),
-            toIamGrantEngineProps(iamUpdateEvent.OldResourceProperties)
+            newIam.RoleName,
+            oldIam.RoleName,
+            newIam.ResourceArn,
+            oldIam.ResourceArn
           )
           break
         case RdsSqlResource.PARAMETER_PASSWORD:
@@ -260,10 +260,8 @@ export const handler = async (
           sql = dbEngine.deleteSql(resourceId, toSqlEngineProps(event.ResourceProperties))
           break
         case RdsSqlResource.IAM_GRANT:
-          sql = dbEngine.deleteIamGrant(
-            event.ResourceProperties.RoleName,
-            toIamGrantEngineProps(event.ResourceProperties)
-          )
+          const delIam = toIamGrantEngineProps(event.ResourceProperties)
+          sql = dbEngine.deleteIamGrant(delIam.RoleName, delIam.ResourceArn)
           break
         case RdsSqlResource.PARAMETER_PASSWORD:
           await deleteParameterPassword(event.ResourceProperties)

package/lambda/types.ts

@@ -25,7 +25,8 @@ export interface EngineSqlProperties {
 }
 
 export interface EngineIamGrantProperties {
-  readonly ResourceArn?: string
+  readonly RoleName: string
+  readonly ResourceArn: string
 }
 
 // Common CloudFormation properties shared by all resources
@@ -33,7 +34,7 @@ export interface CommonProperties
   extends CloudFormationCustomResourceResourcePropertiesCommon {
   readonly Resource: RdsSqlResource
   readonly ResourceId: string
-  readonly SecretArn: string
+  readonly SecretArn?: string // SecretArn is not set for DSQL
 }
 
 // CloudFormation-specific properties (engine properties + CloudFormation metadata)

package/lib/database.js

@@ -45,5 +45,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: "7.3.0" };
+Database[_a] = { fqn: "cdk-rds-sql.Database", version: "7.3.1" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2Q0FBNEM7QUFDNUMsMkNBQXNDO0FBQ3RDLGlDQUF1QztBQUN2Qyx5Q0FBc0Q7QUEwQnRELE1BQU0sZ0JBQWlCLFNBQVEsc0JBQVM7SUFHdEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF5QjtRQUNqRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ2hCLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtJQUN4QyxDQUFDO0NBQ0Y7QUFFRCxNQUFhLFFBQVMsU0FBUSw0QkFBYztJQUMxQzs7T0FFRztJQUNILE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxZQUFvQjtRQUN4RSxPQUFPLElBQUksZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNyQyxZQUFZLEVBQUUsWUFBWTtTQUMzQixDQUFDLENBQUE7SUFDSixDQUFDO0lBSUQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCw0REFBNEQ7UUFDNUQsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sS0FBSyx5QkFBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQ2IscUZBQXFGLENBQ3RGLENBQUE7UUFDSCxDQUFDO1FBRUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxRQUFRO2dCQUNqQyxVQUFVLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0JBQzlCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLEVBQUUsUUFBUTthQUM3QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLENBQUMsWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdEMsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDaEIsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3RDLENBQUM7SUFDSCxDQUFDOztBQWxDSCw0QkFtQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyLCBEYXRhYmFzZUVuZ2luZSB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcbmltcG9ydCB7IFJvbGUgfSBmcm9tIFwiLi9yb2xlXCJcblxuaW50ZXJmYWNlIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBOYW1lIG9mIGRhdGFiYXNlIHRvIGNyZWF0ZS5cbiAgICovXG4gIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlIG93bmVyLlxuICAgKi9cbiAgcmVhZG9ubHkgb3duZXI/OiBSb2xlXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGF0YWJhc2VQcm9wcyBleHRlbmRzIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBJUHJvdmlkZXJcbn1cblxuZXhwb3J0IGludGVyZmFjZSBJRGF0YWJhc2Uge1xuICByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xufVxuXG5jbGFzcyBJbXBvcnRlZERhdGFiYXNlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgcHVibGljIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IERhdGFiYXNlQXR0cmlidXRlcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZClcbiAgICB0aGlzLmRhdGFiYXNlTmFtZSA9IHByb3BzLmRhdGFiYXNlTmFtZVxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBEYXRhYmFzZSBleHRlbmRzIEN1c3RvbVJlc291cmNlIGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgLyoqXG4gICAqIFJldHVybiBhIERhdGFiYXNlIGJhc2VkIHVwb24gbmFtZSBvbmx5LiBVc2UgZm9yIGltcG9ydGluZyBleGlzdGluZyBkYXRhYmFzZXMuXG4gICAqL1xuICBzdGF0aWMgZnJvbURhdGFiYXNlTmFtZShzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBkYXRhYmFzZU5hbWU6IHN0cmluZyk6IElEYXRhYmFzZSB7XG4gICAgcmV0dXJuIG5ldyBJbXBvcnRlZERhdGFiYXNlKHNjb3BlLCBpZCwge1xuICAgICAgZGF0YWJhc2VOYW1lOiBkYXRhYmFzZU5hbWUsXG4gICAgfSlcbiAgfVxuXG4gIHB1YmxpYyByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBEYXRhYmFzZVByb3BzKSB7XG4gICAgLy8gQ2hlY2sgaWYgdXNpbmcgRFNRTCBwcm92aWRlciBhbmQgZm9yYmlkIGRhdGFiYXNlIGNyZWF0aW9uXG4gICAgaWYgKHByb3BzLnByb3ZpZGVyLmVuZ2luZSA9PT0gRGF0YWJhc2VFbmdpbmUuRFNRTCkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKFxuICAgICAgICBcIkRhdGFiYXNlIGNyZWF0aW9uIGlzIG5vdCBzdXBwb3J0ZWQgd2l0aCBEU1FMLiBEU1FMIGFsd2F5cyB1c2VzICdwb3N0Z3JlcycgZGF0YWJhc2UuXCJcbiAgICAgIClcbiAgICB9XG5cbiAgICBzdXBlcihzY29wZSwgaWQsIHtcbiAgICAgIHNlcnZpY2VUb2tlbjogcHJvcHMucHJvdmlkZXIuc2VydmljZVRva2VuLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuREFUQUJBU0UsXG4gICAgICAgIFJlc291cmNlSWQ6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgLi4uKHByb3BzLnByb3ZpZGVyLnNlY3JldCA/IHsgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuIH0gOiB7fSksXG4gICAgICAgIE93bmVyOiBwcm9wcy5vd25lcj8ucm9sZU5hbWUsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgICBpZiAocHJvcHMub3duZXIpIHtcbiAgICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLm93bmVyKVxuICAgIH1cbiAgfVxufVxuIl19

package/lib/handler/handler.js

@@ -25557,29 +25557,32 @@ var DsqlEngine = class extends AbstractEngine {
     }
     return [];
   }
-  createIamGrant(resourceId, props) {
-    if (!props.ResourceArn) {
+  createIamGrant(roleName, iamArn) {
+    if (!iamArn) {
       throw new Error("ResourceArn is required for IAM grant");
     }
-    return (0, import_node_pg_format.format)("AWS IAM GRANT %I TO %L", resourceId, props.ResourceArn);
+    return (0, import_node_pg_format.format)("AWS IAM GRANT %I TO %L", roleName, iamArn);
   }
-  updateIamGrant(resourceId, oldResourceId, props, oldProps) {
+  updateIamGrant(roleName, oldRoleName, iamArn, oldIamArn) {
     const statements = [];
-    if (oldProps.ResourceArn) {
-      statements.push(
-        (0, import_node_pg_format.format)("AWS IAM REVOKE %I FROM %L", oldResourceId, oldProps.ResourceArn)
-      );
+    const roleNameChanged = oldRoleName !== roleName;
+    const arnChanged = oldIamArn !== iamArn;
+    if (!roleNameChanged && !arnChanged) {
+      return statements;
+    }
+    if (oldIamArn) {
+      statements.push((0, import_node_pg_format.format)("AWS IAM REVOKE %I FROM %L", oldRoleName, oldIamArn));
     }
-    if (props.ResourceArn) {
-      statements.push((0, import_node_pg_format.format)("AWS IAM GRANT %I TO %L", resourceId, props.ResourceArn));
+    if (iamArn) {
+      statements.push((0, import_node_pg_format.format)("AWS IAM GRANT %I TO %L", roleName, iamArn));
     }
     return statements;
   }
-  deleteIamGrant(resourceId, props) {
-    if (!props.ResourceArn) {
+  deleteIamGrant(roleName, iamArn) {
+    if (!iamArn) {
       throw new Error("ResourceArn is required for IAM grant deletion");
     }
-    return (0, import_node_pg_format.format)("AWS IAM REVOKE %I FROM %L", resourceId, props.ResourceArn);
+    return (0, import_node_pg_format.format)("AWS IAM REVOKE %I FROM %L", roleName, iamArn);
   }
   async executeSQL(sql, config) {
     this.log("Connecting to DSQL cluster...");
@@ -25832,13 +25835,13 @@ var MysqlEngine = class extends AbstractEngine {
   deleteSql(_resourceId, props) {
     return props?.Rollback || "";
   }
-  createIamGrant(_resourceId, _props) {
+  createIamGrant(_roleName, _iamArn) {
     throw new Error("IAM grants are only supported with DSQL clusters");
   }
-  updateIamGrant(_resourceId, _oldResourceId, _props, _oldProps) {
+  updateIamGrant(_roleName, _oldRoleName, _iamArn, _oldIamArn) {
     throw new Error("IAM grants are only supported with DSQL clusters");
   }
-  deleteIamGrant(_resourceId, _props) {
+  deleteIamGrant(_roleName, _iamArn) {
     throw new Error("IAM grants are only supported with DSQL clusters");
   }
   async executeSQL(sql, config) {
@@ -26086,13 +26089,13 @@ END$$;`,
       (0, import_node_pg_format2.format)("REVOKE ALL ON SCHEMA %I FROM %I", schema, roleName)
     ];
   }
-  createIamGrant(_resourceId, _props) {
+  createIamGrant(_roleName, _iamArn) {
     throw new Error("IAM grants are only supported with DSQL clusters");
   }
-  updateIamGrant(_resourceId, _oldResourceId, _props, _oldProps) {
+  updateIamGrant(_roleName, _oldRoleName, _iamArn, _oldIamArn) {
     throw new Error("IAM grants are only supported with DSQL clusters");
   }
-  deleteIamGrant(_resourceId, _props) {
+  deleteIamGrant(_roleName, _iamArn) {
     throw new Error("IAM grants are only supported with DSQL clusters");
   }
   async executeSQL(sql, config) {
@@ -26281,10 +26284,8 @@ var handler = async (event) => {
           sql = dbEngine.createSql(resourceId, toSqlEngineProps(event.ResourceProperties));
           break;
         case "iam_grant" /* IAM_GRANT */:
-          sql = dbEngine.createIamGrant(
-            event.ResourceProperties.RoleName,
-            toIamGrantEngineProps(event.ResourceProperties)
-          );
+          const createIam = toIamGrantEngineProps(event.ResourceProperties);
+          sql = dbEngine.createIamGrant(createIam.RoleName, createIam.ResourceArn);
           break;
         case "parameter_password" /* PARAMETER_PASSWORD */:
           await handleParameterPassword(event.ResourceProperties);
@@ -26327,11 +26328,13 @@ var handler = async (event) => {
           break;
         case "iam_grant" /* IAM_GRANT */:
           const iamUpdateEvent = event;
+          const newIam = toIamGrantEngineProps(event.ResourceProperties);
+          const oldIam = toIamGrantEngineProps(iamUpdateEvent.OldResourceProperties);
           sql = dbEngine.updateIamGrant(
-            event.ResourceProperties.RoleName,
-            iamUpdateEvent.OldResourceProperties.RoleName,
-            toIamGrantEngineProps(event.ResourceProperties),
-            toIamGrantEngineProps(iamUpdateEvent.OldResourceProperties)
+            newIam.RoleName,
+            oldIam.RoleName,
+            newIam.ResourceArn,
+            oldIam.ResourceArn
           );
           break;
         case "parameter_password" /* PARAMETER_PASSWORD */:
@@ -26362,10 +26365,8 @@ var handler = async (event) => {
           sql = dbEngine.deleteSql(resourceId, toSqlEngineProps(event.ResourceProperties));
           break;
         case "iam_grant" /* IAM_GRANT */:
-          sql = dbEngine.deleteIamGrant(
-            event.ResourceProperties.RoleName,
-            toIamGrantEngineProps(event.ResourceProperties)
-          );
+          const delIam = toIamGrantEngineProps(event.ResourceProperties);
+          sql = dbEngine.deleteIamGrant(delIam.RoleName, delIam.ResourceArn);
           break;
         case "parameter_password" /* PARAMETER_PASSWORD */:
           await deleteParameterPassword(event.ResourceProperties);

package/lib/iam-grant.js

@@ -36,5 +36,5 @@ class IamGrant extends aws_cdk_lib_1.CustomResource {
 }
 exports.IamGrant = IamGrant;
 _a = JSII_RTTI_SYMBOL_1;
-IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "7.3.0" };
+IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "7.3.1" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWdyYW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2lhbS1ncmFudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGlDQUFnQztBQUNoQyw2Q0FBNEM7QUFFNUMsaUNBQXVDO0FBQ3ZDLHlDQUFzRDtBQW1CdEQsTUFBYSxRQUFTLFNBQVEsNEJBQWM7SUFDbEMsTUFBTSxDQUFDLHNCQUFzQixDQUFDLFFBQWdCLEVBQUUsV0FBbUI7UUFDekUsTUFBTSxJQUFJLEdBQUcsTUFBTTthQUNoQixVQUFVLENBQUMsUUFBUSxDQUFDO2FBQ3BCLE1BQU0sQ0FBQyxXQUFXLENBQUM7YUFDbkIsTUFBTSxDQUFDLEtBQUssQ0FBQzthQUNiLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbEIsT0FBTyxHQUFHLFFBQVEsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0lBRUQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCx3Q0FBd0M7UUFDeEMsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sS0FBSyx5QkFBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQ2IsZ0hBQWdILENBQ2pILENBQUE7UUFDSCxDQUFDO1FBRUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFlBQVksRUFBRSxzQkFBc0I7WUFDcEMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLFNBQVM7Z0JBQ2xDLFVBQVUsRUFBRSxRQUFRLENBQUMsc0JBQXNCLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsV0FBVyxDQUFDO2dCQUM5RSxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7Z0JBQ3hCLFdBQVcsRUFBRSxLQUFLLENBQUMsV0FBVzthQUMvQjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUN6QyxDQUFDOztBQTdCSCw0QkE4QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBjcnlwdG8gZnJvbSBcImNyeXB0b1wiXG5pbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyLCBEYXRhYmFzZUVuZ2luZSB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcblxuZXhwb3J0IGludGVyZmFjZSBJYW1HcmFudFByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBEYXRhYmFzZSByb2xlIG5hbWUgdG8gZ3JhbnQgSUFNIGFjY2VzcyB0by5cbiAgICovXG4gIHJlYWRvbmx5IHJvbGVOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogSUFNIHJlc291cmNlIEFSTiAocm9sZSwgdXNlciwgb3Igb3RoZXIgSUFNIHByaW5jaXBhbCkuXG4gICAqL1xuICByZWFkb25seSByZXNvdXJjZUFybjogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBJYW1HcmFudCBleHRlbmRzIEN1c3RvbVJlc291cmNlIHtcbiAgcHJpdmF0ZSBzdGF0aWMgY3JlYXRlVW5pcXVlUmVzb3VyY2VJZChyb2xlTmFtZTogc3RyaW5nLCByZXNvdXJjZUFybjogc3RyaW5nKTogc3RyaW5nIHtcbiAgICBjb25zdCBoYXNoID0gY3J5cHRvXG4gICAgICAuY3JlYXRlSGFzaChcInNoYTI1NlwiKVxuICAgICAgLnVwZGF0ZShyZXNvdXJjZUFybilcbiAgICAgIC5kaWdlc3QoXCJoZXhcIilcbiAgICAgIC5zdWJzdHJpbmcoMCwgOClcbiAgICByZXR1cm4gYCR7cm9sZU5hbWV9OiR7aGFzaH1gXG4gIH1cblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSWFtR3JhbnRQcm9wcykge1xuICAgIC8vIElBTSBncmFudHMgYXJlIG9ubHkgc3VwcG9ydGVkIG9uIERTUUxcbiAgICBpZiAocHJvcHMucHJvdmlkZXIuZW5naW5lICE9PSBEYXRhYmFzZUVuZ2luZS5EU1FMKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgIFwiSUFNIGdyYW50cyBhcmUgb25seSBzdXBwb3J0ZWQgd2l0aCBEU1FMIGNsdXN0ZXJzLiBVc2UgcmVndWxhciBkYXRhYmFzZSBhdXRoZW50aWNhdGlvbiBmb3IgUkRTL0F1cm9yYSBjbHVzdGVycy5cIlxuICAgICAgKVxuICAgIH1cblxuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICByZXNvdXJjZVR5cGU6IFwiQ3VzdG9tOjpEc3FsSWFtR3JhbnRcIixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLklBTV9HUkFOVCxcbiAgICAgICAgUmVzb3VyY2VJZDogSWFtR3JhbnQuY3JlYXRlVW5pcXVlUmVzb3VyY2VJZChwcm9wcy5yb2xlTmFtZSwgcHJvcHMucmVzb3VyY2VBcm4pLFxuICAgICAgICBSb2xlTmFtZTogcHJvcHMucm9sZU5hbWUsXG4gICAgICAgIFJlc291cmNlQXJuOiBwcm9wcy5yZXNvdXJjZUFybixcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgfVxufVxuIl19

package/lib/provider.js

@@ -209,7 +209,7 @@ class Provider extends constructs_1.Construct {
 }
 exports.Provider = Provider;
 _a = JSII_RTTI_SYMBOL_1;
-Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "7.3.0" };
+Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "7.3.1" };
 class ImportedProvider extends constructs_1.Construct {
     constructor(scope, id, attrs) {
         super(scope, id);

package/lib/role.js

@@ -146,5 +146,5 @@ class Role extends constructs_1.Construct {
 }
 exports.Role = Role;
 _a = JSII_RTTI_SYMBOL_1;
-Role[_a] = { fqn: "cdk-rds-sql.Role", version: "7.3.0" };
+Role[_a] = { fqn: "cdk-rds-sql.Role", version: "7.3.1" };
 //# 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;AACvC,yCAAsD;AACtD,iEAAmE;AA+EnE,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;IAYjC,YAAY,KAAgB,EAAE,EAAU,EAAE,KAAgB;QACxD,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,yBAAc,CAAC,IAAI,EAAE,CAAC;YAClD,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;gBACzC,MAAM,yCAAyC,CAAA;YACjD,CAAC;YACD,IAAI,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBAC3C,oGAAoG;gBACpG,yEAAyE;gBACzE,sDAAsD;gBACtD,MAAM,yCAAyC,CAAA;YACjD,CAAC;QACH,CAAC;QACD,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QAEhB,+DAA+D;QAC/D,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,yBAAc,CAAC,IAAI,EAAE,CAAC;YAClD,gFAAgF;YAChF,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CACb,6EAA6E;oBAC3E,gFAAgF;oBAChF,4FAA4F,CAC/F,CAAA;YACH,CAAC;YAED,8DAA8D;YAC9D,MAAM,IAAI,GAAI,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe;gBACvE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe,CAAC,QAAQ;gBACvE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA6B,CAAC,gBAAgB,CAAC,QAAQ,CAAA;YAE3E,MAAM,IAAI,GAAI,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe;gBACvE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,eAAe,CAAC,IAAI;gBACnE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA6B,CAAC,gBAAgB,CAAC,IAAI,CAAA;YAEvE,MAAM,UAAU,GAAI,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,iBAAiB;gBAC/E,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA4B,CAAC,iBAAiB;gBAChE,CAAC,CAAE,KAAK,CAAC,QAAQ,CAAC,OAA6B,CAAC,kBAAkB,CAAA;YAEpE,MAAM,cAAc,GAAG;gBACrB,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,CAAC,MAAM,GAAG,IAAI,2BAAM,CAAC,IAAI,EAAE,QAAQ,EAAE;gBACvC,UAAU,EAAE,KAAK,CAAC,UAAU;gBAC5B,aAAa,EAAE,KAAK,CAAC,aAAa;gBAClC,WAAW,EAAE,wBAAwB,KAAK,CAAC,QAAQ,CAAC,MAAM,SAAS,KAAK,CAAC,QAAQ,EAAE;gBACnF,GAAG,CAAC,KAAK,CAAC,aAAa;oBACrB,CAAC,CAAC;wBACE,0DAA0D;wBAC1D,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;qBACrD;oBACH,CAAC,CAAC;wBACE,uCAAuC;wBACvC,oBAAoB,EAAE;4BACpB,cAAc,EAAE,EAAE,EAAE,sDAAsD;4BAC1E,oBAAoB,EAAE,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC;4BACpD,iBAAiB,EAAE,UAAU;4BAC7B,iBAAiB,EAAE,+BAA+B;yBACnD;qBACF,CAAC;gBACN,aAAa,EAAE,2BAAa,CAAC,OAAO;aACrC,CAAC,CAAA;YAEF,mDAAmD;YACnD,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC1B,MAAM,SAAS,GAAG;oBAChB,mBAAmB,EAAE,UAAU;oBAC/B,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;oBAC7B,IAAI,EAAE,IAAI;oBACV,IAAI,EAAE,IAAI;oBACV,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY;iBAC1E,CAAA;gBAED,IAAI,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE;oBACjC,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE;oBACjD,eAAe,EAAE,KAAK,CAAC,eAAe;oBACtC,WAAW,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;oBAC7D,oBAAoB,EAAE,KAAK,CAAC,QAAQ,CAAC,YAAY;oBACjD,QAAQ,EAAE,KAAK,CAAC,QAAQ;oBACxB,SAAS;iBACV,CAAC,CAAA;YACJ,CAAC;QACH,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,EACT,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,yBAAc,CAAC,IAAI;gBAClE,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,IAAI,CAAC,MAAO,CAAC,SAAS;YAC5B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,YAAY,EAAE,KAAK,CAAC,YAAY;YAChC,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,yBAAc,CAAC,IAAI;SACpF,CAAC,CAAA;QAEF,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;YACpC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YAC7C,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;gBAC9B,gDAAgD;gBAChD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;YAChE,CAAC;QACH,CAAC;QAED,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAA;IAChC,CAAC;;AA5HH,oBA6HC","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

@@ -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: "7.3.0" };
+Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "7.3.1" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NoZW1hLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NjaGVtYS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUE4QnZDLE1BQWEsTUFBTyxTQUFRLDRCQUFjO0lBR3hDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBa0I7UUFDMUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxNQUFNO2dCQUMvQixVQUFVLEVBQUUsS0FBSyxDQUFDLFVBQVU7Z0JBQzVCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsWUFBWSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxTQUFTO2dCQUN0RSxRQUFRLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLFNBQVM7YUFDdkQ7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDdkMsSUFBSSxDQUFDLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVSxDQUFBO1FBQ2xDLElBQUksS0FBSyxDQUFDLFFBQVE7WUFBRSxJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDM0QsSUFBSSxLQUFLLENBQUMsSUFBSTtZQUFFLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUNyRCxDQUFDOztBQWxCSCx3QkFtQkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuaW1wb3J0IHsgUm9sZSB9IGZyb20gXCIuL3JvbGVcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNjaGVtYVByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU2NoZW1hIG5hbWUuXG4gICAqL1xuICByZWFkb25seSBzY2hlbWFOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogT3B0aW9uYWwgcm9sZSB3aGljaCB3aWxsIGJlIGdyYW50ZWQgdXNhZ2UgYW5kIGNyZWF0ZSBwZXJtaXNzaW9uc1xuICAgKiB0byB0aGlzIHNjaGVtYS4gVGhpcyB3YXkgdGhlIHJvbGUgY2FuIHJlYWQgaXRzIG93biB0YWJsZXMsIGJ1dFxuICAgKiBjYW5ub3Qgc2VlIG9yIGFjY2VzcyB0YWJsZXMgY3JlYXRlZCBieSBvdGhlcnMuXG4gICAqL1xuICByZWFkb25seSByb2xlPzogUm9sZVxufVxuXG5leHBvcnQgY2xhc3MgU2NoZW1hIGV4dGVuZHMgQ3VzdG9tUmVzb3VyY2Uge1xuICBwdWJsaWMgcmVhZG9ubHkgc2NoZW1hTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IFNjaGVtYVByb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLlNDSEVNQSxcbiAgICAgICAgUmVzb3VyY2VJZDogcHJvcHMuc2NoZW1hTmFtZSxcbiAgICAgICAgLi4uKHByb3BzLnByb3ZpZGVyLnNlY3JldCA/IHsgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuIH0gOiB7fSksXG4gICAgICAgIERhdGFiYXNlTmFtZTogcHJvcHMuZGF0YWJhc2UgPyBwcm9wcy5kYXRhYmFzZS5kYXRhYmFzZU5hbWUgOiB1bmRlZmluZWQsXG4gICAgICAgIFJvbGVOYW1lOiBwcm9wcy5yb2xlID8gcHJvcHMucm9sZS5yb2xlTmFtZSA6IHVuZGVmaW5lZCxcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgICB0aGlzLnNjaGVtYU5hbWUgPSBwcm9wcy5zY2hlbWFOYW1lXG4gICAgaWYgKHByb3BzLmRhdGFiYXNlKSB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5kYXRhYmFzZSlcbiAgICBpZiAocHJvcHMucm9sZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucm9sZSlcbiAgfVxufVxuIl19

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: "7.3.0" };
+Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "7.3.1" };
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3FsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3NxbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUc1QyxpQ0FBdUM7QUEyQnZDLE1BQWEsR0FBSSxTQUFRLDRCQUFjO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBZTtRQUN2RCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLEdBQUc7Z0JBQzVCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsWUFBWSxFQUFFLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQyxTQUFTO2dCQUN0RSxTQUFTLEVBQUUsS0FBSyxDQUFDLFNBQVM7Z0JBQzFCLFFBQVEsRUFBRSxLQUFLLENBQUMsUUFBUTthQUN6QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLEtBQUssQ0FBQyxRQUFRO1lBQUUsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFBO0lBQzdELENBQUM7O0FBZEgsa0JBZUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBJRGF0YWJhc2UgfSBmcm9tIFwiLi9kYXRhYmFzZVwiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyIH0gZnJvbSBcIi4vcHJvdmlkZXJcIlxuXG5leHBvcnQgaW50ZXJmYWNlIFNxbFByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBPcHRpb25hbCBkYXRhYmFzZS5cbiAgICpcbiAgICogQGRlZmF1bHQgLSB1c2UgZGVmYXVsdCBkYXRhYmFzZVxuICAgKi9cbiAgcmVhZG9ubHkgZGF0YWJhc2U/OiBJRGF0YWJhc2VcblxuICAvKipcbiAgICogU1FMLlxuICAgKi9cbiAgcmVhZG9ubHkgc3RhdGVtZW50Pzogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIHN0YXRtZW50IHRvIGJlIGV4ZWN1dGVkIHdoZW4gdGhlIHJlc291cmNlIGlzIGRlbGV0ZWRcbiAgICovXG4gIHJlYWRvbmx5IHJvbGxiYWNrPzogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBTcWwgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBTcWxQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICBwcm9wZXJ0aWVzOiB7XG4gICAgICAgIFJlc291cmNlOiBSZHNTcWxSZXNvdXJjZS5TUUwsXG4gICAgICAgIC4uLihwcm9wcy5wcm92aWRlci5zZWNyZXQgPyB7IFNlY3JldEFybjogcHJvcHMucHJvdmlkZXIuc2VjcmV0LnNlY3JldEFybiB9IDoge30pLFxuICAgICAgICBEYXRhYmFzZU5hbWU6IHByb3BzLmRhdGFiYXNlID8gcHJvcHMuZGF0YWJhc2UuZGF0YWJhc2VOYW1lIDogdW5kZWZpbmVkLFxuICAgICAgICBTdGF0ZW1lbnQ6IHByb3BzLnN0YXRlbWVudCxcbiAgICAgICAgUm9sbGJhY2s6IHByb3BzLnJvbGxiYWNrLFxuICAgICAgfSxcbiAgICB9KVxuICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLnByb3ZpZGVyKVxuICAgIGlmIChwcm9wcy5kYXRhYmFzZSkgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMuZGF0YWJhc2UpXG4gIH1cbn1cbiJdfQ==

package/package.json

@@ -105,7 +105,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "7.3.0",
+  "version": "7.3.1",
   "jest": {
     "coverageProvider": "v8",
     "testMatch": [