From 48bb71925d6be365affcdce87906691fd0523c5c Mon Sep 17 00:00:00 2001 From: Alex Stone Date: Sat, 25 Jun 2022 00:14:34 -0500 Subject: [PATCH 1/4] Update cdk version to match aws-apigatewayv2-alpha deps --- .projen/deps.json | 4 ++-- .projenrc.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.projen/deps.json b/.projen/deps.json index 739a20a..85db57d 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -21,7 +21,7 @@ }, { "name": "aws-cdk-lib", - "version": "2.18.0", + "version": "2.29.1", "type": "build" }, { @@ -101,7 +101,7 @@ }, { "name": "aws-cdk-lib", - "version": "^2.18.0", + "version": "^2.29.1", "type": "peer" }, { diff --git a/.projenrc.js b/.projenrc.js index f139df9..8574157 100644 --- a/.projenrc.js +++ b/.projenrc.js @@ -7,7 +7,7 @@ const project = new awscdk.AwsCdkConstructLibrary({ authorName: 'Pahud Hsieh', authorEmail: 'hunhsieh@amazon.com', name: PROJECT_NAME, - cdkVersion: '2.18.0', + cdkVersion: '2.29.1', description: PROJECT_DESCRIPTION, repository: 'https://github.com/aws-samples/cdk-serverless-lamp.git', defaultReleaseBranch: 'main', From 6f8e77ac42e0b2dfc584b4cfe3fd395594eb618f Mon Sep 17 00:00:00 2001 From: Alex Stone Date: Sat, 25 Jun 2022 00:35:18 -0500 Subject: [PATCH 2/4] Update package.json,yarn.lock --- package.json | 4 ++-- yarn.lock | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 9464808..3af52d9 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@types/node": "^14", "@typescript-eslint/eslint-plugin": "^5", "@typescript-eslint/parser": "^5", - "aws-cdk-lib": "2.18.0", + "aws-cdk-lib": "2.29.1", "constructs": "10.0.5", "eslint": "^8", "eslint-import-resolver-node": "^0.3.6", @@ -65,7 +65,7 @@ "typescript": "^4.7.4" }, "peerDependencies": { - "aws-cdk-lib": "^2.18.0", + "aws-cdk-lib": "^2.29.1", "constructs": "^10.0.5" }, "dependencies": { diff --git a/yarn.lock b/yarn.lock index 07e065b..44ed022 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1176,19 +1176,19 @@ at-least-node@^1.0.0: resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2" integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg== -aws-cdk-lib@2.18.0: - version "2.18.0" - resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.18.0.tgz#a130edf9d90ec166d5c0f14d275ab49cbbe75261" - integrity sha512-4XpEqRgKSzDmcpeNGRqRlnWEltnt5+NoHWKpQDHUsAmyJ2QNQ5dYxVLIReaGiE9H8zS0rlpp3exuDEy0UgKj2Q== +aws-cdk-lib@2.29.1: + version "2.29.1" + resolved "https://registry.yarnpkg.com/aws-cdk-lib/-/aws-cdk-lib-2.29.1.tgz#3a7bfb03f988c37c9ccd7db454bd66ffce427d14" + integrity sha512-tmWhsmSvNrJD9/SFAD0The7hON3VYUcFchKnjPg4vwvY89XzZv76IB24KLy3XoXF33WYvCUzDQPO/bCZQBF4LA== dependencies: "@balena/dockerignore" "^1.0.2" case "1.6.3" fs-extra "^9.1.0" ignore "^5.2.0" - jsonschema "^1.4.0" + jsonschema "^1.4.1" minimatch "^3.1.2" punycode "^2.1.1" - semver "^7.3.5" + semver "^7.3.7" yaml "1.10.2" babel-jest@^27.5.1: @@ -3932,7 +3932,7 @@ jsonparse@^1.2.0, jsonparse@^1.3.1: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -jsonschema@^1.4.0: +jsonschema@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.1.tgz#cc4c3f0077fb4542982973d8a083b6b34f482dab" integrity sha512-S6cATIPVv1z0IlxdN+zUk5EPjkGCdnhN4wVSBlvoUO1tOLJootbo9CquNJmbIh4yikWHiUedhRYrNPn1arpEmQ== From e89170417d32035a21f41809c1d42938b4fe0b4d Mon Sep 17 00:00:00 2001 From: Alex Stone Date: Fri, 24 Jun 2022 23:59:06 -0500 Subject: [PATCH 3/4] Avoid resolution error by using Credentials.fromSecret --- src/index.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/index.ts b/src/index.ts index 25ffb0d..bd3ea5e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -242,10 +242,7 @@ export class DatabaseCluster extends Construct { instanceType: props.instanceType ?? new ec2.InstanceType('t3.medium'), securityGroups: [dbConnectionGroup], }, - credentials: { - username: masterUserSecret.secretValueFromJson('username').toString(), - password: masterUserSecret.secretValueFromJson('password'), - }, + credentials: rds.Credentials.fromSecret(masterUserSecret), instances: props.instanceCapacity, removalPolicy: RemovalPolicy.DESTROY, }); From 1e1307e0d821aab0d5814fed032515c00e755da7 Mon Sep 17 00:00:00 2001 From: Alex Stone Date: Sat, 25 Jun 2022 00:39:16 -0500 Subject: [PATCH 4/4] Update snapshot --- test/__snapshots__/integ.api.test.ts.snap | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/__snapshots__/integ.api.test.ts.snap b/test/__snapshots__/integ.api.test.ts.snap index b3ac345..9eb05e2 100644 --- a/test/__snapshots__/integ.api.test.ts.snap +++ b/test/__snapshots__/integ.api.test.ts.snap @@ -276,6 +276,18 @@ Object { "Type": "AWS::SecretsManager::Secret", "UpdateReplacePolicy": "Delete", }, + "DatabaseClusterDbMasterSecretAttachment4F388165": Object { + "Properties": Object { + "SecretId": Object { + "Ref": "DatabaseClusterDbMasterSecret98DF2329", + }, + "TargetId": Object { + "Ref": "DatabaseClusterDBCluster27F7FF5A", + }, + "TargetType": "AWS::RDS::DBCluster", + }, + "Type": "AWS::SecretsManager::SecretTargetAttachment", + }, "DatabaseClusterRdsProxyRole9B27D8A3": Object { "Properties": Object { "AssumeRolePolicyDocument": Object {