diff --git a/.github/workflows/dev_synth.yml b/.github/workflows/dev_synth.yml index 07cc05f..fa08944 100644 --- a/.github/workflows/dev_synth.yml +++ b/.github/workflows/dev_synth.yml @@ -31,7 +31,7 @@ jobs: uses: youyo/aws-cdk-github-actions@v2 with: cdk_subcommand: 'synth' - cdk_version: '2.102.0' + cdk_version: '2.115.0' working_dir: 'cdk' cdk_args: '--context stage=dev' env: diff --git a/bin/decidim-cfj-cdk.ts b/bin/decidim-cfj-cdk.ts index 61ee6b6..9b883b3 100644 --- a/bin/decidim-cfj-cdk.ts +++ b/bin/decidim-cfj-cdk.ts @@ -12,7 +12,7 @@ import { Tags } from 'aws-cdk-lib'; const app = new cdk.App(); -const stages = ['dev', 'staging', 'prd-v0265', 'prd-v0274'] +const stages = ['dev', 'staging', 'prd-v0274'] const stage = app.node.tryGetContext('stage') const tag = app.node.tryGetContext('tag') if (!stages.includes(stage)) { diff --git a/docs/build_dev.md b/docs/build_dev.md index cd3a831..420c4bb 100644 --- a/docs/build_dev.md +++ b/docs/build_dev.md @@ -41,6 +41,7 @@ AWS Systems Manager のパラメータストアで以下のようなパラメー /decidim-cfj/${props.stage}/NEW_RELIC_LICENSE_KEY /decidim-cfj/${props.stage}/SMTP_ADDRESS /decidim-cfj/${props.stage}/SMTP_USERNAME + /decidim-cfj/${props.stage}/SLACK_API_TOKEN ``` # 4. ECRの準備 @@ -103,7 +104,7 @@ $ npx cdk --context stage=dev tag=${IMAGE_TAG} --profile decidim deploy --all - ## 7.1 環境へのアクセス ```console -$ aws ecs execute-command --region ap-northeast-1 --cluster devDecidimCluster --task ${タスク名} --container appContainer --interactive --command "/bin/ash" --profile decidim +$ aws ecs execute-command --region ap-northeast-1 --cluster devDecidimCluster --task ${タスク名} --container appContainer --interactive --command "/bin/bash" --profile decidim ``` ## 7.2 migrateとseedの実行 diff --git a/lib/cloudfront.ts b/lib/cloudfront.ts index 5c577d9..f8b2529 100644 --- a/lib/cloudfront.ts +++ b/lib/cloudfront.ts @@ -161,7 +161,7 @@ export class CloudFrontStack extends Stack { } ] - if (props.stage === 'prd-v0265' || props.stage === 'prd-v0274') { + if (props.stage === 'prd-v0274') { rules.push({ name: 'production-AllowSystemLogin', priority: 7, @@ -266,7 +266,7 @@ export class CloudFrontStack extends Stack { } ) - if (props.stage === "prd-v0265" || props.stage === 'prd-v0274') { + if (props.stage === 'prd-v0274') { new cloudfront.Distribution(this, 'Distribution', { priceClass: cloudfront.PriceClass.PRICE_CLASS_ALL, defaultBehavior: { diff --git a/lib/decidim-stack.ts b/lib/decidim-stack.ts index c8597e3..ff6c7d7 100644 --- a/lib/decidim-stack.ts +++ b/lib/decidim-stack.ts @@ -163,8 +163,8 @@ export class DecidimStack extends cdk.Stack { image: new ecs.EcrImage(decidimRepository, props.tag), environment: { ...DecidimContainerEnvironment, ...{ - NEW_RELIC_AGENT_ENABLED: props.stage === 'prd-v0265' || props.stage === 'prd-v0274' ? 'true' : 'false', - NEW_RELIC_LICENSE_KEY: props.stage === 'prd-v0265' || props.stage === 'prd-v0274' ? ssm.StringParameter.valueForTypedStringParameterV2(this, `/decidim-cfj/${ props.stage }/NEW_RELIC_LICENSE_KEY`) : '', + NEW_RELIC_AGENT_ENABLED: props.stage === 'prd-v0274' ? 'true' : 'false', + NEW_RELIC_LICENSE_KEY: props.stage === 'prd-v0274' ? ssm.StringParameter.valueForTypedStringParameterV2(this, `/decidim-cfj/${ props.stage }/NEW_RELIC_LICENSE_KEY`) : '', NEW_RELIC_APP_NAME: `decidim-app${ props.stage }`, MAPS_PROVIDER: 'osm', MAPS_STATIC_PROVIDER: 'cfj_osm', @@ -273,7 +273,7 @@ export class DecidimStack extends cdk.Stack { targetUtilizationPercent: 50 }) autoscaling.scaleOnMemoryUtilization('ScalingOnMemory', { - targetUtilizationPercent: 50 + targetUtilizationPercent: 70 }) new ecs.FargateService(this, 'sidekiqService', { diff --git a/lib/elasticache-stack.ts b/lib/elasticache-stack.ts index 5cbea23..d167d85 100644 --- a/lib/elasticache-stack.ts +++ b/lib/elasticache-stack.ts @@ -31,7 +31,7 @@ export class ElasticacheStack extends Stack { cacheSubnetGroupName: props.ecSubnetGroup.cacheSubnetGroupName, } - if (props.stage === 'prd-v0265' || props.stage === 'prd-v0274') { + if (props.stage === 'prd-v0274') { this.redis = new elasticache.CfnReplicationGroup(this, 'prdElasticache', { ...elastiCacheProps, ...{ diff --git a/lib/s3-stack.ts b/lib/s3-stack.ts index cfb3355..8eabc79 100644 --- a/lib/s3-stack.ts +++ b/lib/s3-stack.ts @@ -11,7 +11,7 @@ export class S3Stack extends Stack { const bucket = new aws_s3.Bucket(this, 'createBucket', { bucketName: `${ props.stage }-${ props.serviceName }-bucket`, - versioned: props.stage === "prd-v0265" || props.stage === 'prd-v0274', + versioned: props.stage === 'prd-v0274', removalPolicy: RemovalPolicy.DESTROY, autoDeleteObjects: true, blockPublicAccess: aws_s3.BlockPublicAccess.BLOCK_ALL, diff --git a/package-lock.json b/package-lock.json index 6651ada..6479eba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,8 +8,8 @@ "name": "decidim-cfj-cdk", "version": "0.1.0", "dependencies": { - "aws-cdk-lib": "2.102.0", - "cdk-ecr-deployment": "^2.5.30", + "aws-cdk-lib": "2.115.0", + "cdk-ecr-deployment": "^2.5.41", "constructs": "^10.3.0", "source-map-support": "^0.5.21" }, @@ -17,13 +17,13 @@ "decidim-cfj-cdk": "bin/decidim-cfj-cdk.js" }, "devDependencies": { - "@types/jest": "^29.5.6", - "@types/node": "18.18.6", + "@types/jest": "^29.5.11", + "@types/node": "18.19.3", "@types/prettier": "2.7.3", - "aws-cdk": "2.102.0", + "aws-cdk": "2.115.0", "jest": "^29.7.0", "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "~4.9.5" } }, @@ -41,9 +41,9 @@ } }, "node_modules/@aws-cdk/asset-awscli-v1": { - "version": "2.2.200", - "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.200.tgz", - "integrity": "sha512-Kf5J8DfJK4wZFWT2Myca0lhwke7LwHcHBo+4TvWOGJrFVVKVuuiLCkzPPRBQQVDj0Vtn2NBokZAz8pfMpAqAKg==" + "version": "2.2.201", + "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.201.tgz", + "integrity": "sha512-INZqcwDinNaIdb5CtW3ez5s943nX5stGBQS6VOP2JDlOFP81hM3fds/9NDknipqfUkZM43dx+HgVvkXYXXARCQ==" }, "node_modules/@aws-cdk/asset-kubectl-v20": { "version": "2.1.2", @@ -1152,9 +1152,9 @@ } }, "node_modules/@types/jest": { - "version": "29.5.6", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.6.tgz", - "integrity": "sha512-/t9NnzkOpXb4Nfvg17ieHE6EeSjDS2SGSpNYfoLbUAeL/EOueU/RSdOWFpfQTXBEM7BguYW1XQ0EbM+6RlIh6w==", + "version": "29.5.11", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz", + "integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==", "dev": true, "dependencies": { "expect": "^29.0.0", @@ -1162,10 +1162,13 @@ } }, "node_modules/@types/node": { - "version": "18.18.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz", - "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==", - "dev": true + "version": "18.19.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz", + "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==", + "dev": true, + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/prettier": { "version": "2.7.3", @@ -1274,9 +1277,9 @@ } }, "node_modules/aws-cdk": { - "version": "2.102.0", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.102.0.tgz", - "integrity": "sha512-q+FQSeX/25QvZ1/Fxjr7GydMY/WR/+iTif2EiaN7rUlEEZx27o0I5k1p9YmTNUGiBl13ZvggIJjwTRmnL7E/lg==", + "version": "2.115.0", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.115.0.tgz", + "integrity": "sha512-jf+5j+ygk/DqxLzYyjFnCOOlRgvL/fwcYhyanhpb1OEQEe1FF6NGUb1TYsnQc3Ly67qLOKkQgdeyeXgzkKoSOQ==", "dev": true, "bin": { "cdk": "bin/cdk" @@ -1289,9 +1292,9 @@ } }, "node_modules/aws-cdk-lib": { - "version": "2.102.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.102.0.tgz", - "integrity": "sha512-pYcKGlshU2j7n3f8TbJ1CCrwNnLsgGd17G7p/s9njIU8xakU4tIwuNyo4Q9HHQA7aUb3enPI/afAn1A6gp7TrA==", + "version": "2.115.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.115.0.tgz", + "integrity": "sha512-PGIwmjo9BcviKxuMfMlUCwevUjwXnaS5h8fxZOM6bN1HXCS/wIusft4tMmkiNYjPiNE1sHJbCDIbxxntCQ/7jg==", "bundleDependencies": [ "@balena/dockerignore", "case", @@ -1305,16 +1308,16 @@ "yaml" ], "dependencies": { - "@aws-cdk/asset-awscli-v1": "^2.2.200", + "@aws-cdk/asset-awscli-v1": "^2.2.201", "@aws-cdk/asset-kubectl-v20": "^2.1.2", "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", "@balena/dockerignore": "^1.0.2", "case": "1.6.3", - "fs-extra": "^11.1.1", - "ignore": "^5.2.4", + "fs-extra": "^11.2.0", + "ignore": "^5.3.0", "jsonschema": "^1.4.1", "minimatch": "^3.1.2", - "punycode": "^2.3.0", + "punycode": "^2.3.1", "semver": "^7.5.4", "table": "^6.8.1", "yaml": "1.10.2" @@ -1430,7 +1433,7 @@ "license": "MIT" }, "node_modules/aws-cdk-lib/node_modules/fs-extra": { - "version": "11.1.1", + "version": "11.2.0", "inBundle": true, "license": "MIT", "dependencies": { @@ -1448,7 +1451,7 @@ "license": "ISC" }, "node_modules/aws-cdk-lib/node_modules/ignore": { - "version": "5.2.4", + "version": "5.3.0", "inBundle": true, "license": "MIT", "engines": { @@ -1515,7 +1518,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/punycode": { - "version": "2.3.0", + "version": "2.3.1", "inBundle": true, "license": "MIT", "engines": { @@ -1600,7 +1603,7 @@ } }, "node_modules/aws-cdk-lib/node_modules/universalify": { - "version": "2.0.0", + "version": "2.0.1", "inBundle": true, "license": "MIT", "engines": { @@ -1836,9 +1839,9 @@ ] }, "node_modules/cdk-ecr-deployment": { - "version": "2.5.30", - "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.30.tgz", - "integrity": "sha512-IFS/DD6OmNcXv24YKjjaz1sb04xxsoUb7vPYwx7kTBAOxOnT0CuAadF8/HVfM/YVoqoOPXCJe3ikAXy1iI0nKw==", + "version": "2.5.41", + "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.41.tgz", + "integrity": "sha512-eOnoWJ3h/PrSVjmC1QzmfK2DyvT6xBBy3ER0MeZmqTvrI+ZkOKY2ZDwNxdE2bMHmQy5XB0pAxnOVEc+FlpQSsg==", "bundleDependencies": [ "got", "hpagent" @@ -1888,12 +1891,15 @@ } }, "node_modules/cdk-ecr-deployment/node_modules/@types/cacheable-request/node_modules/@types/node": { - "version": "20.3.3", + "version": "20.10.4", "inBundle": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/cdk-ecr-deployment/node_modules/@types/http-cache-semantics": { - "version": "4.0.1", + "version": "4.0.4", "inBundle": true, "license": "MIT" }, @@ -1906,12 +1912,15 @@ } }, "node_modules/cdk-ecr-deployment/node_modules/@types/keyv/node_modules/@types/node": { - "version": "20.3.3", + "version": "20.10.4", "inBundle": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/cdk-ecr-deployment/node_modules/@types/responselike": { - "version": "1.0.0", + "version": "1.0.3", "inBundle": true, "license": "MIT", "dependencies": { @@ -1919,9 +1928,12 @@ } }, "node_modules/cdk-ecr-deployment/node_modules/@types/responselike/node_modules/@types/node": { - "version": "20.3.3", + "version": "20.10.4", "inBundle": true, - "license": "MIT" + "license": "MIT", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/cdk-ecr-deployment/node_modules/cacheable-lookup": { "version": "5.0.4", @@ -1948,20 +1960,6 @@ "node": ">=8" } }, - "node_modules/cdk-ecr-deployment/node_modules/cacheable-request/node_modules/get-stream": { - "version": "5.2.0", - "inBundle": true, - "license": "MIT", - "dependencies": { - "pump": "^3.0.0" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/cdk-ecr-deployment/node_modules/clone-response": { "version": "1.0.3", "inBundle": true, @@ -2011,6 +2009,20 @@ "once": "^1.4.0" } }, + "node_modules/cdk-ecr-deployment/node_modules/get-stream": { + "version": "5.2.0", + "inBundle": true, + "license": "MIT", + "dependencies": { + "pump": "^3.0.0" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/cdk-ecr-deployment/node_modules/got": { "version": "11.8.6", "inBundle": true, @@ -2063,7 +2075,7 @@ "license": "MIT" }, "node_modules/cdk-ecr-deployment/node_modules/keyv": { - "version": "4.5.2", + "version": "4.5.4", "inBundle": true, "license": "MIT", "dependencies": { @@ -2152,6 +2164,11 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/cdk-ecr-deployment/node_modules/undici-types": { + "version": "5.26.5", + "inBundle": true, + "license": "MIT" + }, "node_modules/cdk-ecr-deployment/node_modules/wrappy": { "version": "1.0.2", "inBundle": true, @@ -4217,9 +4234,9 @@ } }, "node_modules/ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "dependencies": { "@cspotcode/source-map-support": "^0.8.0", @@ -4302,6 +4319,12 @@ "node": ">=4.2.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "node_modules/update-browserslist-db": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz", @@ -4490,9 +4513,9 @@ } }, "@aws-cdk/asset-awscli-v1": { - "version": "2.2.200", - "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.200.tgz", - "integrity": "sha512-Kf5J8DfJK4wZFWT2Myca0lhwke7LwHcHBo+4TvWOGJrFVVKVuuiLCkzPPRBQQVDj0Vtn2NBokZAz8pfMpAqAKg==" + "version": "2.2.201", + "resolved": "https://registry.npmjs.org/@aws-cdk/asset-awscli-v1/-/asset-awscli-v1-2.2.201.tgz", + "integrity": "sha512-INZqcwDinNaIdb5CtW3ez5s943nX5stGBQS6VOP2JDlOFP81hM3fds/9NDknipqfUkZM43dx+HgVvkXYXXARCQ==" }, "@aws-cdk/asset-kubectl-v20": { "version": "2.1.2", @@ -5381,9 +5404,9 @@ } }, "@types/jest": { - "version": "29.5.6", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.6.tgz", - "integrity": "sha512-/t9NnzkOpXb4Nfvg17ieHE6EeSjDS2SGSpNYfoLbUAeL/EOueU/RSdOWFpfQTXBEM7BguYW1XQ0EbM+6RlIh6w==", + "version": "29.5.11", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-29.5.11.tgz", + "integrity": "sha512-S2mHmYIVe13vrm6q4kN6fLYYAka15ALQki/vgDC3mIukEOx8WJlv0kQPM+d4w8Gp6u0uSdKND04IlTXBv0rwnQ==", "dev": true, "requires": { "expect": "^29.0.0", @@ -5391,10 +5414,13 @@ } }, "@types/node": { - "version": "18.18.6", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.6.tgz", - "integrity": "sha512-wf3Vz+jCmOQ2HV1YUJuCWdL64adYxumkrxtc+H1VUQlnQI04+5HtH+qZCOE21lBE7gIrt+CwX2Wv8Acrw5Ak6w==", - "dev": true + "version": "18.19.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.3.tgz", + "integrity": "sha512-k5fggr14DwAytoA/t8rPrIz++lXK7/DqckthCmoZOKNsEbJkId4Z//BqgApXBUGrGddrigYa1oqheo/7YmW4rg==", + "dev": true, + "requires": { + "undici-types": "~5.26.4" + } }, "@types/prettier": { "version": "2.7.3", @@ -5479,29 +5505,29 @@ } }, "aws-cdk": { - "version": "2.102.0", - "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.102.0.tgz", - "integrity": "sha512-q+FQSeX/25QvZ1/Fxjr7GydMY/WR/+iTif2EiaN7rUlEEZx27o0I5k1p9YmTNUGiBl13ZvggIJjwTRmnL7E/lg==", + "version": "2.115.0", + "resolved": "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.115.0.tgz", + "integrity": "sha512-jf+5j+ygk/DqxLzYyjFnCOOlRgvL/fwcYhyanhpb1OEQEe1FF6NGUb1TYsnQc3Ly67qLOKkQgdeyeXgzkKoSOQ==", "dev": true, "requires": { "fsevents": "2.3.2" } }, "aws-cdk-lib": { - "version": "2.102.0", - "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.102.0.tgz", - "integrity": "sha512-pYcKGlshU2j7n3f8TbJ1CCrwNnLsgGd17G7p/s9njIU8xakU4tIwuNyo4Q9HHQA7aUb3enPI/afAn1A6gp7TrA==", + "version": "2.115.0", + "resolved": "https://registry.npmjs.org/aws-cdk-lib/-/aws-cdk-lib-2.115.0.tgz", + "integrity": "sha512-PGIwmjo9BcviKxuMfMlUCwevUjwXnaS5h8fxZOM6bN1HXCS/wIusft4tMmkiNYjPiNE1sHJbCDIbxxntCQ/7jg==", "requires": { - "@aws-cdk/asset-awscli-v1": "^2.2.200", + "@aws-cdk/asset-awscli-v1": "^2.2.201", "@aws-cdk/asset-kubectl-v20": "^2.1.2", "@aws-cdk/asset-node-proxy-agent-v6": "^2.0.1", "@balena/dockerignore": "^1.0.2", "case": "1.6.3", - "fs-extra": "^11.1.1", - "ignore": "^5.2.4", + "fs-extra": "^11.2.0", + "ignore": "^5.3.0", "jsonschema": "^1.4.1", "minimatch": "^3.1.2", - "punycode": "^2.3.0", + "punycode": "^2.3.1", "semver": "^7.5.4", "table": "^6.8.1", "yaml": "1.10.2" @@ -5576,7 +5602,7 @@ "bundled": true }, "fs-extra": { - "version": "11.1.1", + "version": "11.2.0", "bundled": true, "requires": { "graceful-fs": "^4.2.0", @@ -5589,7 +5615,7 @@ "bundled": true }, "ignore": { - "version": "5.2.4", + "version": "5.3.0", "bundled": true }, "is-fullwidth-code-point": { @@ -5631,7 +5657,7 @@ } }, "punycode": { - "version": "2.3.0", + "version": "2.3.1", "bundled": true }, "require-from-string": { @@ -5682,7 +5708,7 @@ } }, "universalify": { - "version": "2.0.0", + "version": "2.0.1", "bundled": true }, "uri-js": { @@ -5851,9 +5877,9 @@ "dev": true }, "cdk-ecr-deployment": { - "version": "2.5.30", - "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.30.tgz", - "integrity": "sha512-IFS/DD6OmNcXv24YKjjaz1sb04xxsoUb7vPYwx7kTBAOxOnT0CuAadF8/HVfM/YVoqoOPXCJe3ikAXy1iI0nKw==", + "version": "2.5.41", + "resolved": "https://registry.npmjs.org/cdk-ecr-deployment/-/cdk-ecr-deployment-2.5.41.tgz", + "integrity": "sha512-eOnoWJ3h/PrSVjmC1QzmfK2DyvT6xBBy3ER0MeZmqTvrI+ZkOKY2ZDwNxdE2bMHmQy5XB0pAxnOVEc+FlpQSsg==", "requires": { "aws-cdk-lib": "^2.0.0", "constructs": "^10.0.5", @@ -5883,13 +5909,16 @@ }, "dependencies": { "@types/node": { - "version": "20.3.3", - "bundled": true + "version": "20.10.4", + "bundled": true, + "requires": { + "undici-types": "~5.26.4" + } } } }, "@types/http-cache-semantics": { - "version": "4.0.1", + "version": "4.0.4", "bundled": true }, "@types/keyv": { @@ -5900,21 +5929,27 @@ }, "dependencies": { "@types/node": { - "version": "20.3.3", - "bundled": true + "version": "20.10.4", + "bundled": true, + "requires": { + "undici-types": "~5.26.4" + } } } }, "@types/responselike": { - "version": "1.0.0", + "version": "1.0.3", "bundled": true, "requires": { "@types/node": "*" }, "dependencies": { "@types/node": { - "version": "20.3.3", - "bundled": true + "version": "20.10.4", + "bundled": true, + "requires": { + "undici-types": "~5.26.4" + } } } }, @@ -5933,15 +5968,6 @@ "lowercase-keys": "^2.0.0", "normalize-url": "^6.0.1", "responselike": "^2.0.0" - }, - "dependencies": { - "get-stream": { - "version": "5.2.0", - "bundled": true, - "requires": { - "pump": "^3.0.0" - } - } } }, "clone-response": { @@ -5975,6 +6001,13 @@ "once": "^1.4.0" } }, + "get-stream": { + "version": "5.2.0", + "bundled": true, + "requires": { + "pump": "^3.0.0" + } + }, "got": { "version": "11.8.6", "bundled": true, @@ -6013,7 +6046,7 @@ "bundled": true }, "keyv": { - "version": "4.5.2", + "version": "4.5.4", "bundled": true, "requires": { "json-buffer": "3.0.1" @@ -6065,6 +6098,10 @@ "lowercase-keys": "^2.0.0" } }, + "undici-types": { + "version": "5.26.5", + "bundled": true + }, "wrappy": { "version": "1.0.2", "bundled": true @@ -7590,9 +7627,9 @@ } }, "ts-node": { - "version": "10.9.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", - "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz", + "integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==", "dev": true, "requires": { "@cspotcode/source-map-support": "^0.8.0", @@ -7636,6 +7673,12 @@ "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", "dev": true }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true + }, "update-browserslist-db": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.7.tgz", diff --git a/package.json b/package.json index e60dde2..aa52b3d 100644 --- a/package.json +++ b/package.json @@ -11,18 +11,18 @@ "cdk": "cdk" }, "devDependencies": { - "@types/jest": "^29.5.6", - "@types/node": "18.18.6", + "@types/jest": "^29.5.11", + "@types/node": "18.19.3", "@types/prettier": "2.7.3", - "aws-cdk": "2.102.0", + "aws-cdk": "2.115.0", "jest": "^29.7.0", "ts-jest": "^29.1.1", - "ts-node": "^10.9.1", + "ts-node": "^10.9.2", "typescript": "~4.9.5" }, "dependencies": { - "aws-cdk-lib": "2.102.0", - "cdk-ecr-deployment": "^2.5.30", + "aws-cdk-lib": "2.115.0", + "cdk-ecr-deployment": "^2.5.41", "constructs": "^10.3.0", "source-map-support": "^0.5.21" } diff --git a/test/__snapshots__/decidim-cfj-cdk.test.ts.snap b/test/__snapshots__/decidim-cfj-cdk.test.ts.snap index d043e7d..0441824 100644 --- a/test/__snapshots__/decidim-cfj-cdk.test.ts.snap +++ b/test/__snapshots__/decidim-cfj-cdk.test.ts.snap @@ -56,9 +56,7 @@ exports[`DecidimStack Created 1`] = ` "Resources": { "Alb16C2F182": { "DependsOn": [ - "stagingAlbLogBucketAutoDeleteObjectsCustomResource17C48E5F", "stagingAlbLogBucketPolicyCFEC4BC9", - "stagingAlbLogBucket03414E90", ], "Properties": { "LoadBalancerAttributes": [ @@ -104,11 +102,6 @@ exports[`DecidimStack Created 1`] = ` "Type": "AWS::ElasticLoadBalancingV2::LoadBalancer", }, "AlbhttpListener75E510B4": { - "DependsOn": [ - "stagingAlbLogBucketAutoDeleteObjectsCustomResource17C48E5F", - "stagingAlbLogBucketPolicyCFEC4BC9", - "stagingAlbLogBucket03414E90", - ], "Properties": { "DefaultActions": [ { @@ -127,11 +120,6 @@ exports[`DecidimStack Created 1`] = ` "Type": "AWS::ElasticLoadBalancingV2::Listener", }, "AlbhttpsListenerB49E5778": { - "DependsOn": [ - "stagingAlbLogBucketAutoDeleteObjectsCustomResource17C48E5F", - "stagingAlbLogBucketPolicyCFEC4BC9", - "stagingAlbLogBucket03414E90", - ], "Properties": { "Certificates": [ { @@ -155,11 +143,6 @@ exports[`DecidimStack Created 1`] = ` "Type": "AWS::ElasticLoadBalancingV2::Listener", }, "AlbhttpsListenerDefaultCertificates1CE6DF251": { - "DependsOn": [ - "stagingAlbLogBucketAutoDeleteObjectsCustomResource17C48E5F", - "stagingAlbLogBucketPolicyCFEC4BC9", - "stagingAlbLogBucket03414E90", - ], "Properties": { "Certificates": [ { @@ -779,7 +762,7 @@ exports[`DecidimStack Created 1`] = ` "PredefinedMetricSpecification": { "PredefinedMetricType": "ECSServiceAverageMemoryUtilization", }, - "TargetValue": 50, + "TargetValue": 70, }, }, "Type": "AWS::ApplicationAutoScaling::ScalingPolicy", diff --git a/test/__snapshots__/rds-stack.test.ts.snap b/test/__snapshots__/rds-stack.test.ts.snap index a242ff7..814472b 100644 --- a/test/__snapshots__/rds-stack.test.ts.snap +++ b/test/__snapshots__/rds-stack.test.ts.snap @@ -48,6 +48,7 @@ exports[`RdsStack Created 1`] = ` "Ref": "SsmParameterValuedecidimcfjstagingRDSUSERNAMEC96584B6F00A464EAD1953AFF4B05118Parameter", }, "MaxAllocatedStorage": 20, + "MultiAZ": false, "StorageType": "gp2", "VPCSecurityGroups": [ {