cdk-rds-sql 7.3.1 → 7.3.2

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.
package/.jsii CHANGED
@@ -4447,7 +4447,7 @@
4447
4447
  },
4448
4448
  "locationInModule": {
4449
4449
  "filename": "src/iam-grant.ts",
4450
- "line": 34
4450
+ "line": 24
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": 24
4476
+ "line": 23
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": 7
4491
+ "line": 6
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": 11
4504
+ "line": 10
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": 21
4520
+ "line": 20
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": 16
4536
+ "line": 15
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.3.1",
5598
- "fingerprint": "Mc3PNE6TVDDeFZIrlQTTfKYL82JgisTUWw7OGZDbhFo="
5597
+ "version": "7.3.2",
5598
+ "fingerprint": "2Nt5HipkT3qGvOwwy3MgCUGWmXl40w4EVbXW8C8dBJo="
5599
5599
  }
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.3.1" };
48
+ Database[_a] = { fqn: "cdk-rds-sql.Database", version: "7.3.2" };
49
49
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGF0YWJhc2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvZGF0YWJhc2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw2Q0FBNEM7QUFDNUMsMkNBQXNDO0FBQ3RDLGlDQUF1QztBQUN2Qyx5Q0FBc0Q7QUEwQnRELE1BQU0sZ0JBQWlCLFNBQVEsc0JBQVM7SUFHdEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF5QjtRQUNqRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ2hCLElBQUksQ0FBQyxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtJQUN4QyxDQUFDO0NBQ0Y7QUFFRCxNQUFhLFFBQVMsU0FBUSw0QkFBYztJQUMxQzs7T0FFRztJQUNILE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxZQUFvQjtRQUN4RSxPQUFPLElBQUksZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNyQyxZQUFZLEVBQUUsWUFBWTtTQUMzQixDQUFDLENBQUE7SUFDSixDQUFDO0lBSUQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCw0REFBNEQ7UUFDNUQsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sS0FBSyx5QkFBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQ2IscUZBQXFGLENBQ3RGLENBQUE7UUFDSCxDQUFDO1FBRUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFVBQVUsRUFBRTtnQkFDVixRQUFRLEVBQUUscUJBQWMsQ0FBQyxRQUFRO2dCQUNqQyxVQUFVLEVBQUUsS0FBSyxDQUFDLFlBQVk7Z0JBQzlCLEdBQUcsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxTQUFTLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsU0FBUyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztnQkFDaEYsS0FBSyxFQUFFLEtBQUssQ0FBQyxLQUFLLEVBQUUsUUFBUTthQUM3QjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUN2QyxJQUFJLENBQUMsWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdEMsSUFBSSxLQUFLLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDaEIsSUFBSSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3RDLENBQUM7SUFDSCxDQUFDOztBQWxDSCw0QkFtQ0MiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyLCBEYXRhYmFzZUVuZ2luZSB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcbmltcG9ydCB7IFJvbGUgfSBmcm9tIFwiLi9yb2xlXCJcblxuaW50ZXJmYWNlIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBOYW1lIG9mIGRhdGFiYXNlIHRvIGNyZWF0ZS5cbiAgICovXG4gIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgLyoqXG4gICAqIE9wdGlvbmFsIGRhdGFiYXNlIG93bmVyLlxuICAgKi9cbiAgcmVhZG9ubHkgb3duZXI/OiBSb2xlXG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgRGF0YWJhc2VQcm9wcyBleHRlbmRzIERhdGFiYXNlQXR0cmlidXRlcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBJUHJvdmlkZXJcbn1cblxuZXhwb3J0IGludGVyZmFjZSBJRGF0YWJhc2Uge1xuICByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xufVxuXG5jbGFzcyBJbXBvcnRlZERhdGFiYXNlIGV4dGVuZHMgQ29uc3RydWN0IGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgcHVibGljIHJlYWRvbmx5IGRhdGFiYXNlTmFtZTogc3RyaW5nXG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IERhdGFiYXNlQXR0cmlidXRlcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZClcbiAgICB0aGlzLmRhdGFiYXNlTmFtZSA9IHByb3BzLmRhdGFiYXNlTmFtZVxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBEYXRhYmFzZSBleHRlbmRzIEN1c3RvbVJlc291cmNlIGltcGxlbWVudHMgSURhdGFiYXNlIHtcbiAgLyoqXG4gICAqIFJldHVybiBhIERhdGFiYXNlIGJhc2VkIHVwb24gbmFtZSBvbmx5LiBVc2UgZm9yIGltcG9ydGluZyBleGlzdGluZyBkYXRhYmFzZXMuXG4gICAqL1xuICBzdGF0aWMgZnJvbURhdGFiYXNlTmFtZShzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBkYXRhYmFzZU5hbWU6IHN0cmluZyk6IElEYXRhYmFzZSB7XG4gICAgcmV0dXJuIG5ldyBJbXBvcnRlZERhdGFiYXNlKHNjb3BlLCBpZCwge1xuICAgICAgZGF0YWJhc2VOYW1lOiBkYXRhYmFzZU5hbWUsXG4gICAgfSlcbiAgfVxuXG4gIHB1YmxpYyByZWFkb25seSBkYXRhYmFzZU5hbWU6IHN0cmluZ1xuXG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBEYXRhYmFzZVByb3BzKSB7XG4gICAgLy8gQ2hlY2sgaWYgdXNpbmcgRFNRTCBwcm92aWRlciBhbmQgZm9yYmlkIGRhdGFiYXNlIGNyZWF0aW9uXG4gICAgaWYgKHByb3BzLnByb3ZpZGVyLmVuZ2luZSA9PT0gRGF0YWJhc2VFbmdpbmUuRFNRTCkge1xuICAgICAgdGhyb3cgbmV3IEVycm9yKFxuICAgICAgICBcIkRhdGFiYXNlIGNyZWF0aW9uIGlzIG5vdCBzdXBwb3J0ZWQgd2l0aCBEU1FMLiBEU1FMIGFsd2F5cyB1c2VzICdwb3N0Z3JlcycgZGF0YWJhc2UuXCJcbiAgICAgIClcbiAgICB9XG5cbiAgICBzdXBlcihzY29wZSwgaWQsIHtcbiAgICAgIHNlcnZpY2VUb2tlbjogcHJvcHMucHJvdmlkZXIuc2VydmljZVRva2VuLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuREFUQUJBU0UsXG4gICAgICAgIFJlc291cmNlSWQ6IHByb3BzLmRhdGFiYXNlTmFtZSxcbiAgICAgICAgLi4uKHByb3BzLnByb3ZpZGVyLnNlY3JldCA/IHsgU2VjcmV0QXJuOiBwcm9wcy5wcm92aWRlci5zZWNyZXQuc2VjcmV0QXJuIH0gOiB7fSksXG4gICAgICAgIE93bmVyOiBwcm9wcy5vd25lcj8ucm9sZU5hbWUsXG4gICAgICB9LFxuICAgIH0pXG4gICAgdGhpcy5ub2RlLmFkZERlcGVuZGVuY3kocHJvcHMucHJvdmlkZXIpXG4gICAgdGhpcy5kYXRhYmFzZU5hbWUgPSBwcm9wcy5kYXRhYmFzZU5hbWVcbiAgICBpZiAocHJvcHMub3duZXIpIHtcbiAgICAgIHRoaXMubm9kZS5hZGREZXBlbmRlbmN5KHByb3BzLm93bmVyKVxuICAgIH1cbiAgfVxufVxuIl19
@@ -2336,7 +2336,7 @@ var require_cert_signatures = __commonJS({
2336
2336
  var require_sasl = __commonJS({
2337
2337
  "node_modules/pg/lib/crypto/sasl.js"(exports2, module2) {
2338
2338
  "use strict";
2339
- var crypto = require_utils2();
2339
+ var crypto2 = require_utils2();
2340
2340
  var { signatureAlgorithmHashFromCertificate } = require_cert_signatures();
2341
2341
  function startSession(mechanisms, stream) {
2342
2342
  const candidates = ["SCRAM-SHA-256"];
@@ -2348,7 +2348,7 @@ var require_sasl = __commonJS({
2348
2348
  if (mechanism === "SCRAM-SHA-256-PLUS" && typeof stream.getPeerCertificate !== "function") {
2349
2349
  throw new Error("SASL: Mechanism SCRAM-SHA-256-PLUS requires a certificate");
2350
2350
  }
2351
- const clientNonce = crypto.randomBytes(18).toString("base64");
2351
+ const clientNonce = crypto2.randomBytes(18).toString("base64");
2352
2352
  const gs2Header = mechanism === "SCRAM-SHA-256-PLUS" ? "p=tls-server-end-point" : stream ? "y" : "n";
2353
2353
  return {
2354
2354
  mechanism,
@@ -2383,20 +2383,20 @@ var require_sasl = __commonJS({
2383
2383
  const peerCert = stream.getPeerCertificate().raw;
2384
2384
  let hashName = signatureAlgorithmHashFromCertificate(peerCert);
2385
2385
  if (hashName === "MD5" || hashName === "SHA-1") hashName = "SHA-256";
2386
- const certHash = await crypto.hashByName(hashName, peerCert);
2386
+ const certHash = await crypto2.hashByName(hashName, peerCert);
2387
2387
  const bindingData = Buffer.concat([Buffer.from("p=tls-server-end-point,,"), Buffer.from(certHash)]);
2388
2388
  channelBinding = bindingData.toString("base64");
2389
2389
  }
2390
2390
  const clientFinalMessageWithoutProof = "c=" + channelBinding + ",r=" + sv.nonce;
2391
2391
  const authMessage = clientFirstMessageBare + "," + serverFirstMessage + "," + clientFinalMessageWithoutProof;
2392
2392
  const saltBytes = Buffer.from(sv.salt, "base64");
2393
- const saltedPassword = await crypto.deriveKey(password, saltBytes, sv.iteration);
2394
- const clientKey = await crypto.hmacSha256(saltedPassword, "Client Key");
2395
- const storedKey = await crypto.sha256(clientKey);
2396
- const clientSignature = await crypto.hmacSha256(storedKey, authMessage);
2393
+ const saltedPassword = await crypto2.deriveKey(password, saltBytes, sv.iteration);
2394
+ const clientKey = await crypto2.hmacSha256(saltedPassword, "Client Key");
2395
+ const storedKey = await crypto2.sha256(clientKey);
2396
+ const clientSignature = await crypto2.hmacSha256(storedKey, authMessage);
2397
2397
  const clientProof = xorBuffers(Buffer.from(clientKey), Buffer.from(clientSignature)).toString("base64");
2398
- const serverKey = await crypto.hmacSha256(saltedPassword, "Server Key");
2399
- const serverSignatureBytes = await crypto.hmacSha256(serverKey, authMessage);
2398
+ const serverKey = await crypto2.hmacSha256(saltedPassword, "Server Key");
2399
+ const serverSignatureBytes = await crypto2.hmacSha256(serverKey, authMessage);
2400
2400
  session.message = "SASLResponse";
2401
2401
  session.serverSignature = Buffer.from(serverSignatureBytes).toString("base64");
2402
2402
  session.response = clientFinalMessageWithoutProof + ",p=" + clientProof;
@@ -4532,7 +4532,7 @@ var require_client = __commonJS({
4532
4532
  var Query2 = require_query();
4533
4533
  var defaults2 = require_defaults();
4534
4534
  var Connection2 = require_connection();
4535
- var crypto = require_utils2();
4535
+ var crypto2 = require_utils2();
4536
4536
  var Client2 = class extends EventEmitter {
4537
4537
  constructor(config) {
4538
4538
  super();
@@ -4727,7 +4727,7 @@ var require_client = __commonJS({
4727
4727
  _handleAuthMD5Password(msg) {
4728
4728
  this._checkPgPass(async () => {
4729
4729
  try {
4730
- const hashedPassword = await crypto.postgresMd5PasswordHash(this.user, this.password, msg.salt);
4730
+ const hashedPassword = await crypto2.postgresMd5PasswordHash(this.user, this.password, msg.salt);
4731
4731
  this.connection.password(hashedPassword);
4732
4732
  } catch (e) {
4733
4733
  this.emit("error", e);
@@ -16834,9 +16834,9 @@ var require_client3 = __commonJS({
16834
16834
  var require_auth_41 = __commonJS({
16835
16835
  "node_modules/mysql2/lib/auth_41.js"(exports2) {
16836
16836
  "use strict";
16837
- var crypto = require("crypto");
16837
+ var crypto2 = require("crypto");
16838
16838
  function sha1(msg, msg1, msg2) {
16839
- const hash = crypto.createHash("sha1");
16839
+ const hash = crypto2.createHash("sha1");
16840
16840
  hash.update(msg);
16841
16841
  if (msg1) {
16842
16842
  hash.update(msg1);
@@ -18585,7 +18585,7 @@ var require_sha256_password = __commonJS({
18585
18585
  "node_modules/mysql2/lib/auth_plugins/sha256_password.js"(exports2, module2) {
18586
18586
  "use strict";
18587
18587
  var PLUGIN_NAME = "sha256_password";
18588
- var crypto = require("crypto");
18588
+ var crypto2 = require("crypto");
18589
18589
  var { xorRotating } = require_auth_41();
18590
18590
  var REQUEST_SERVER_KEY_PACKET = Buffer.from([1]);
18591
18591
  var STATE_INITIAL = 0;
@@ -18593,7 +18593,7 @@ var require_sha256_password = __commonJS({
18593
18593
  var STATE_FINAL = -1;
18594
18594
  function encrypt(password, scramble, key) {
18595
18595
  const stage1 = xorRotating(Buffer.from(`${password}\0`, "utf8"), scramble);
18596
- return crypto.publicEncrypt(key, stage1);
18596
+ return crypto2.publicEncrypt(key, stage1);
18597
18597
  }
18598
18598
  module2.exports = (pluginOptions = {}) => ({ connection }) => {
18599
18599
  let state = 0;
@@ -18636,7 +18636,7 @@ var require_caching_sha2_password = __commonJS({
18636
18636
  "node_modules/mysql2/lib/auth_plugins/caching_sha2_password.js"(exports2, module2) {
18637
18637
  "use strict";
18638
18638
  var PLUGIN_NAME = "caching_sha2_password";
18639
- var crypto = require("crypto");
18639
+ var crypto2 = require("crypto");
18640
18640
  var { xor, xorRotating } = require_auth_41();
18641
18641
  var REQUEST_SERVER_KEY_PACKET = Buffer.from([2]);
18642
18642
  var FAST_AUTH_SUCCESS_PACKET = Buffer.from([3]);
@@ -18646,7 +18646,7 @@ var require_caching_sha2_password = __commonJS({
18646
18646
  var STATE_WAIT_SERVER_KEY = 2;
18647
18647
  var STATE_FINAL = -1;
18648
18648
  function sha256(msg) {
18649
- const hash = crypto.createHash("sha256");
18649
+ const hash = crypto2.createHash("sha256");
18650
18650
  hash.update(msg);
18651
18651
  return hash.digest();
18652
18652
  }
@@ -18661,10 +18661,10 @@ var require_caching_sha2_password = __commonJS({
18661
18661
  }
18662
18662
  function encrypt(password, scramble, key) {
18663
18663
  const stage1 = xorRotating(Buffer.from(`${password}\0`, "utf8"), scramble);
18664
- return crypto.publicEncrypt(
18664
+ return crypto2.publicEncrypt(
18665
18665
  {
18666
18666
  key,
18667
- padding: crypto.constants.RSA_PKCS1_OAEP_PADDING
18667
+ padding: crypto2.constants.RSA_PKCS1_OAEP_PADDING
18668
18668
  },
18669
18669
  stage1
18670
18670
  );
@@ -25383,6 +25383,7 @@ __export(handler_exports, {
25383
25383
  handler: () => handler
25384
25384
  });
25385
25385
  module.exports = __toCommonJS(handler_exports);
25386
+ var crypto = __toESM(require("crypto"));
25386
25387
  var import_client_secrets_manager2 = require("@aws-sdk/client-secrets-manager");
25387
25388
  var import_client_ssm = require("@aws-sdk/client-ssm");
25388
25389
  var import_exponential_backoff = __toESM(require_backoff());
@@ -26208,7 +26209,7 @@ var handler = async (event) => {
26208
26209
  log(event);
26209
26210
  const requestType = event.RequestType;
26210
26211
  const resource = event.ResourceProperties.Resource;
26211
- const resourceId = event.ResourceProperties.ResourceId;
26212
+ const resourceId = event.ResourceProperties.ResourceId ?? "";
26212
26213
  const databaseName = event.ResourceProperties.DatabaseName;
26213
26214
  if (!Object.values(RdsSqlResource).includes(resource)) {
26214
26215
  throw `Resource type '${resource}' not recognised.`;
@@ -26408,8 +26409,14 @@ var handler = async (event) => {
26408
26409
  }
26409
26410
  }
26410
26411
  let response = {};
26411
- if (resource !== "sql" /* SQL */) {
26412
+ if (resourceId) {
26412
26413
  response.PhysicalResourceId = resourceId;
26414
+ } else {
26415
+ if (resource === "iam_grant" /* IAM_GRANT */) {
26416
+ const iamProps = toIamGrantEngineProps(event.ResourceProperties);
26417
+ const hash = crypto.createHash("sha256").update(iamProps.ResourceArn).digest("hex").substring(0, 8);
26418
+ response.PhysicalResourceId = `${iamProps.RoleName}:${hash}`;
26419
+ }
26413
26420
  }
26414
26421
  return response;
26415
26422
  };
@@ -16,6 +16,5 @@ export interface IamGrantProps {
16
16
  readonly resourceArn: string;
17
17
  }
18
18
  export declare class IamGrant extends CustomResource {
19
- private static createUniqueResourceId;
20
19
  constructor(scope: Construct, id: string, props: IamGrantProps);
21
20
  }
package/lib/iam-grant.js CHANGED
@@ -3,19 +3,10 @@ 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");
7
6
  const aws_cdk_lib_1 = require("aws-cdk-lib");
8
7
  const enum_1 = require("./enum");
9
8
  const provider_1 = require("./provider");
10
9
  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
- }
19
10
  constructor(scope, id, props) {
20
11
  // IAM grants are only supported on DSQL
21
12
  if (props.provider.engine !== provider_1.DatabaseEngine.DSQL) {
@@ -26,7 +17,6 @@ class IamGrant extends aws_cdk_lib_1.CustomResource {
26
17
  resourceType: "Custom::DsqlIamGrant",
27
18
  properties: {
28
19
  Resource: enum_1.RdsSqlResource.IAM_GRANT,
29
- ResourceId: IamGrant.createUniqueResourceId(props.roleName, props.resourceArn),
30
20
  RoleName: props.roleName,
31
21
  ResourceArn: props.resourceArn,
32
22
  },
@@ -36,5 +26,5 @@ class IamGrant extends aws_cdk_lib_1.CustomResource {
36
26
  }
37
27
  exports.IamGrant = IamGrant;
38
28
  _a = JSII_RTTI_SYMBOL_1;
39
- IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "7.3.1" };
40
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWdyYW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2lhbS1ncmFudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGlDQUFnQztBQUNoQyw2Q0FBNEM7QUFFNUMsaUNBQXVDO0FBQ3ZDLHlDQUFzRDtBQW1CdEQsTUFBYSxRQUFTLFNBQVEsNEJBQWM7SUFDbEMsTUFBTSxDQUFDLHNCQUFzQixDQUFDLFFBQWdCLEVBQUUsV0FBbUI7UUFDekUsTUFBTSxJQUFJLEdBQUcsTUFBTTthQUNoQixVQUFVLENBQUMsUUFBUSxDQUFDO2FBQ3BCLE1BQU0sQ0FBQyxXQUFXLENBQUM7YUFDbkIsTUFBTSxDQUFDLEtBQUssQ0FBQzthQUNiLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDbEIsT0FBTyxHQUFHLFFBQVEsSUFBSSxJQUFJLEVBQUUsQ0FBQTtJQUM5QixDQUFDO0lBRUQsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFvQjtRQUM1RCx3Q0FBd0M7UUFDeEMsSUFBSSxLQUFLLENBQUMsUUFBUSxDQUFDLE1BQU0sS0FBSyx5QkFBYyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xELE1BQU0sSUFBSSxLQUFLLENBQ2IsZ0hBQWdILENBQ2pILENBQUE7UUFDSCxDQUFDO1FBRUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLEVBQUU7WUFDZixZQUFZLEVBQUUsS0FBSyxDQUFDLFFBQVEsQ0FBQyxZQUFZO1lBQ3pDLFlBQVksRUFBRSxzQkFBc0I7WUFDcEMsVUFBVSxFQUFFO2dCQUNWLFFBQVEsRUFBRSxxQkFBYyxDQUFDLFNBQVM7Z0JBQ2xDLFVBQVUsRUFBRSxRQUFRLENBQUMsc0JBQXNCLENBQUMsS0FBSyxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsV0FBVyxDQUFDO2dCQUM5RSxRQUFRLEVBQUUsS0FBSyxDQUFDLFFBQVE7Z0JBQ3hCLFdBQVcsRUFBRSxLQUFLLENBQUMsV0FBVzthQUMvQjtTQUNGLENBQUMsQ0FBQTtRQUNGLElBQUksQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUN6QyxDQUFDOztBQTdCSCw0QkE4QkMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgKiBhcyBjcnlwdG8gZnJvbSBcImNyeXB0b1wiXG5pbXBvcnQgeyBDdXN0b21SZXNvdXJjZSB9IGZyb20gXCJhd3MtY2RrLWxpYlwiXG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiXG5pbXBvcnQgeyBSZHNTcWxSZXNvdXJjZSB9IGZyb20gXCIuL2VudW1cIlxuaW1wb3J0IHsgSVByb3ZpZGVyLCBEYXRhYmFzZUVuZ2luZSB9IGZyb20gXCIuL3Byb3ZpZGVyXCJcblxuZXhwb3J0IGludGVyZmFjZSBJYW1HcmFudFByb3BzIHtcbiAgLyoqXG4gICAqIFByb3ZpZGVyLlxuICAgKi9cbiAgcmVhZG9ubHkgcHJvdmlkZXI6IElQcm92aWRlclxuXG4gIC8qKlxuICAgKiBEYXRhYmFzZSByb2xlIG5hbWUgdG8gZ3JhbnQgSUFNIGFjY2VzcyB0by5cbiAgICovXG4gIHJlYWRvbmx5IHJvbGVOYW1lOiBzdHJpbmdcblxuICAvKipcbiAgICogSUFNIHJlc291cmNlIEFSTiAocm9sZSwgdXNlciwgb3Igb3RoZXIgSUFNIHByaW5jaXBhbCkuXG4gICAqL1xuICByZWFkb25seSByZXNvdXJjZUFybjogc3RyaW5nXG59XG5cbmV4cG9ydCBjbGFzcyBJYW1HcmFudCBleHRlbmRzIEN1c3RvbVJlc291cmNlIHtcbiAgcHJpdmF0ZSBzdGF0aWMgY3JlYXRlVW5pcXVlUmVzb3VyY2VJZChyb2xlTmFtZTogc3RyaW5nLCByZXNvdXJjZUFybjogc3RyaW5nKTogc3RyaW5nIHtcbiAgICBjb25zdCBoYXNoID0gY3J5cHRvXG4gICAgICAuY3JlYXRlSGFzaChcInNoYTI1NlwiKVxuICAgICAgLnVwZGF0ZShyZXNvdXJjZUFybilcbiAgICAgIC5kaWdlc3QoXCJoZXhcIilcbiAgICAgIC5zdWJzdHJpbmcoMCwgOClcbiAgICByZXR1cm4gYCR7cm9sZU5hbWV9OiR7aGFzaH1gXG4gIH1cblxuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSWFtR3JhbnRQcm9wcykge1xuICAgIC8vIElBTSBncmFudHMgYXJlIG9ubHkgc3VwcG9ydGVkIG9uIERTUUxcbiAgICBpZiAocHJvcHMucHJvdmlkZXIuZW5naW5lICE9PSBEYXRhYmFzZUVuZ2luZS5EU1FMKSB7XG4gICAgICB0aHJvdyBuZXcgRXJyb3IoXG4gICAgICAgIFwiSUFNIGdyYW50cyBhcmUgb25seSBzdXBwb3J0ZWQgd2l0aCBEU1FMIGNsdXN0ZXJzLiBVc2UgcmVndWxhciBkYXRhYmFzZSBhdXRoZW50aWNhdGlvbiBmb3IgUkRTL0F1cm9yYSBjbHVzdGVycy5cIlxuICAgICAgKVxuICAgIH1cblxuICAgIHN1cGVyKHNjb3BlLCBpZCwge1xuICAgICAgc2VydmljZVRva2VuOiBwcm9wcy5wcm92aWRlci5zZXJ2aWNlVG9rZW4sXG4gICAgICByZXNvdXJjZVR5cGU6IFwiQ3VzdG9tOjpEc3FsSWFtR3JhbnRcIixcbiAgICAgIHByb3BlcnRpZXM6IHtcbiAgICAgICAgUmVzb3VyY2U6IFJkc1NxbFJlc291cmNlLklBTV9HUkFOVCxcbiAgICAgICAgUmVzb3VyY2VJZDogSWFtR3JhbnQuY3JlYXRlVW5pcXVlUmVzb3VyY2VJZChwcm9wcy5yb2xlTmFtZSwgcHJvcHMucmVzb3VyY2VBcm4pLFxuICAgICAgICBSb2xlTmFtZTogcHJvcHMucm9sZU5hbWUsXG4gICAgICAgIFJlc291cmNlQXJuOiBwcm9wcy5yZXNvdXJjZUFybixcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgfVxufVxuIl19
29
+ IamGrant[_a] = { fqn: "cdk-rds-sql.IamGrant", version: "7.3.2" };
30
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaWFtLWdyYW50LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2lhbS1ncmFudC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDZDQUE0QztBQUU1QyxpQ0FBdUM7QUFDdkMseUNBQXNEO0FBbUJ0RCxNQUFhLFFBQVMsU0FBUSw0QkFBYztJQUMxQyxZQUFZLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQW9CO1FBQzVELHdDQUF3QztRQUN4QyxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsTUFBTSxLQUFLLHlCQUFjLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEQsTUFBTSxJQUFJLEtBQUssQ0FDYixnSEFBZ0gsQ0FDakgsQ0FBQTtRQUNILENBQUM7UUFFRCxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRTtZQUNmLFlBQVksRUFBRSxLQUFLLENBQUMsUUFBUSxDQUFDLFlBQVk7WUFDekMsWUFBWSxFQUFFLHNCQUFzQjtZQUNwQyxVQUFVLEVBQUU7Z0JBQ1YsUUFBUSxFQUFFLHFCQUFjLENBQUMsU0FBUztnQkFDbEMsUUFBUSxFQUFFLEtBQUssQ0FBQyxRQUFRO2dCQUN4QixXQUFXLEVBQUUsS0FBSyxDQUFDLFdBQVc7YUFDL0I7U0FDRixDQUFDLENBQUE7UUFDRixJQUFJLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUE7SUFDekMsQ0FBQzs7QUFuQkgsNEJBb0JDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ3VzdG9tUmVzb3VyY2UgfSBmcm9tIFwiYXdzLWNkay1saWJcIlxuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSBcImNvbnN0cnVjdHNcIlxuaW1wb3J0IHsgUmRzU3FsUmVzb3VyY2UgfSBmcm9tIFwiLi9lbnVtXCJcbmltcG9ydCB7IElQcm92aWRlciwgRGF0YWJhc2VFbmdpbmUgfSBmcm9tIFwiLi9wcm92aWRlclwiXG5cbmV4cG9ydCBpbnRlcmZhY2UgSWFtR3JhbnRQcm9wcyB7XG4gIC8qKlxuICAgKiBQcm92aWRlci5cbiAgICovXG4gIHJlYWRvbmx5IHByb3ZpZGVyOiBJUHJvdmlkZXJcblxuICAvKipcbiAgICogRGF0YWJhc2Ugcm9sZSBuYW1lIHRvIGdyYW50IElBTSBhY2Nlc3MgdG8uXG4gICAqL1xuICByZWFkb25seSByb2xlTmFtZTogc3RyaW5nXG5cbiAgLyoqXG4gICAqIElBTSByZXNvdXJjZSBBUk4gKHJvbGUsIHVzZXIsIG9yIG90aGVyIElBTSBwcmluY2lwYWwpLlxuICAgKi9cbiAgcmVhZG9ubHkgcmVzb3VyY2VBcm46IHN0cmluZ1xufVxuXG5leHBvcnQgY2xhc3MgSWFtR3JhbnQgZXh0ZW5kcyBDdXN0b21SZXNvdXJjZSB7XG4gIGNvbnN0cnVjdG9yKHNjb3BlOiBDb25zdHJ1Y3QsIGlkOiBzdHJpbmcsIHByb3BzOiBJYW1HcmFudFByb3BzKSB7XG4gICAgLy8gSUFNIGdyYW50cyBhcmUgb25seSBzdXBwb3J0ZWQgb24gRFNRTFxuICAgIGlmIChwcm9wcy5wcm92aWRlci5lbmdpbmUgIT09IERhdGFiYXNlRW5naW5lLkRTUUwpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihcbiAgICAgICAgXCJJQU0gZ3JhbnRzIGFyZSBvbmx5IHN1cHBvcnRlZCB3aXRoIERTUUwgY2x1c3RlcnMuIFVzZSByZWd1bGFyIGRhdGFiYXNlIGF1dGhlbnRpY2F0aW9uIGZvciBSRFMvQXVyb3JhIGNsdXN0ZXJzLlwiXG4gICAgICApXG4gICAgfVxuXG4gICAgc3VwZXIoc2NvcGUsIGlkLCB7XG4gICAgICBzZXJ2aWNlVG9rZW46IHByb3BzLnByb3ZpZGVyLnNlcnZpY2VUb2tlbixcbiAgICAgIHJlc291cmNlVHlwZTogXCJDdXN0b206OkRzcWxJYW1HcmFudFwiLFxuICAgICAgcHJvcGVydGllczoge1xuICAgICAgICBSZXNvdXJjZTogUmRzU3FsUmVzb3VyY2UuSUFNX0dSQU5ULFxuICAgICAgICBSb2xlTmFtZTogcHJvcHMucm9sZU5hbWUsXG4gICAgICAgIFJlc291cmNlQXJuOiBwcm9wcy5yZXNvdXJjZUFybixcbiAgICAgIH0sXG4gICAgfSlcbiAgICB0aGlzLm5vZGUuYWRkRGVwZW5kZW5jeShwcm9wcy5wcm92aWRlcilcbiAgfVxufVxuIl19
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.3.1" };
212
+ Provider[_a] = { fqn: "cdk-rds-sql.Provider", version: "7.3.2" };
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.3.1" };
149
+ Role[_a] = { fqn: "cdk-rds-sql.Role", version: "7.3.2" };
150
150
  //# 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 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.3.1" };
30
+ Schema[_a] = { fqn: "cdk-rds-sql.Schema", version: "7.3.2" };
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.3.1" };
27
+ Sql[_a] = { fqn: "cdk-rds-sql.Sql", version: "7.3.2" };
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.3.1",
108
+ "version": "7.3.2",
109
109
  "jest": {
110
110
  "coverageProvider": "v8",
111
111
  "testMatch": [
@@ -1,114 +0,0 @@
1
- import { ConnectionOptions } from "tls"
2
- import {
3
- SecretsManagerClient,
4
- GetSecretValueCommand,
5
- } from "@aws-sdk/client-secrets-manager"
6
- import {
7
- EngineDatabaseProperties,
8
- EngineRoleProperties,
9
- EngineSchemaProperties,
10
- EngineSqlProperties,
11
- } from "./types"
12
-
13
- export interface EngineConnectionConfig {
14
- host: string
15
- port: number
16
- user: string
17
- password: string
18
- database: string
19
- ssl?: boolean | ConnectionOptions
20
- }
21
-
22
- export abstract class AbstractEngine {
23
- protected log: (message?: any, ...optionalParams: any[]) => void
24
-
25
- constructor() {
26
- this.log =
27
- process.env.LOGGER === "true"
28
- ? console.debug
29
- : (_message?: any, ..._optionalParams: any[]) => {}
30
- }
31
-
32
- abstract createDatabase(
33
- resourceId: string,
34
- props: EngineDatabaseProperties
35
- ): string | string[]
36
- abstract updateDatabase(
37
- resourceId: string,
38
- oldResourceId: string,
39
- props: EngineDatabaseProperties
40
- ): string | string[]
41
- abstract deleteDatabase(resourceId: string, masterUser: string): string | string[]
42
-
43
- abstract createRole(
44
- resourceId: string,
45
- props: EngineRoleProperties
46
- ): Promise<string | string[]>
47
- abstract updateRole(
48
- resourceId: string,
49
- oldResourceId: string,
50
- props: EngineRoleProperties,
51
- oldProps: EngineRoleProperties
52
- ): Promise<string | string[]>
53
- abstract deleteRole(
54
- resourceId: string,
55
- props: EngineRoleProperties
56
- ): Promise<string | string[]>
57
-
58
- abstract createSchema(
59
- resourceId: string,
60
- props: EngineSchemaProperties
61
- ): string | string[]
62
- abstract updateSchema(
63
- resourceId: string,
64
- oldResourceId: string,
65
- props: EngineSchemaProperties
66
- ): string | string[]
67
- abstract deleteSchema(
68
- resourceId: string,
69
- props: EngineSchemaProperties
70
- ): string | string[]
71
-
72
- abstract createSql(resourceId: string, props: EngineSqlProperties): string | string[]
73
- abstract updateSql(
74
- resourceId: string,
75
- oldResourceId: string,
76
- props: EngineSqlProperties
77
- ): string | string[]
78
- abstract deleteSql(resourceId: string, props: EngineSqlProperties): string | string[]
79
-
80
- abstract createIamGrant(roleName: string, iamArn: string): string | string[]
81
- abstract updateIamGrant(
82
- roleName: string,
83
- oldRoleName: string,
84
- iamArn: string,
85
- oldIamArn: string
86
- ): string | string[]
87
- abstract deleteIamGrant(roleName: string, iamArn: string): string | string[]
88
-
89
- abstract executeSQL(
90
- sql: string | string[],
91
- config: EngineConnectionConfig
92
- ): Promise<any>
93
-
94
- /**
95
- * Parse password field from secret. Returns void on error or if no password field exists.
96
- */
97
- protected async getPassword(arn: string): Promise<string | void> {
98
- if (!arn) return
99
- const secrets_client = new SecretsManagerClient({
100
- requestHandler: {
101
- connectionTimeout: 5000,
102
- requestTimeout: 10000,
103
- },
104
- })
105
- const command = new GetSecretValueCommand({
106
- SecretId: arn,
107
- })
108
- const secret = await secrets_client.send(command)
109
- if (secret.SecretString) {
110
- const json = JSON.parse(secret.SecretString)
111
- return json.password
112
- }
113
- }
114
- }