diff --git a/.gitignore b/.gitignore index 685af52e8..f62eb7e16 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,8 @@ target # Yarn .yarn/* + +# riff-raff.yaml is auto-generated by @guardian/cdk into `cdk/cdk.out/riff-raff.yaml`. +# It's copied to the root of the repository for @guardian/node-riffraff-artifact. +# As it's generated, we don't need to track it in VCS. +riff-raff.yaml diff --git a/artifact.json b/artifact.json index 1d020008e..090924610 100644 --- a/artifact.json +++ b/artifact.json @@ -3,13 +3,8 @@ "vcsURL": "https://github.com/guardian/consent-management-platform", "actions": [ { - "action": "cmp-monitoring-lambda-eu-west-1", - "path": "monitoring/dist", - "compress": "zip" - }, - { - "action": "cloud-formation", - "path": "cdk/cdk.out/", + "action": "cdk.out", + "path": "cdk/cdk.out", "compress": false }, { diff --git a/cdk/bin/cdk.ts b/cdk/bin/cdk.ts index 9b485ca98..15cf134eb 100644 --- a/cdk/bin/cdk.ts +++ b/cdk/bin/cdk.ts @@ -1,9 +1,9 @@ import 'source-map-support/register'; import type { GuStackProps } from '@guardian/cdk/lib/constructs/core'; -import { App } from 'aws-cdk-lib'; +import { GuRootExperimental } from '@guardian/cdk/lib/experimental/constructs/root'; import { Monitoring } from '../lib/monitoring'; -const app = new App(); +const app = new GuRootExperimental(); const regionNames = [ 'eu-west-1', diff --git a/package.json b/package.json index 34ecc6565..a7f712f21 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "types": "tsc --project ./tsconfig.build.json", "validate": "npm-run-all tsc test lint build", "prepare": "husky install", - "ci:monitoring": "yarn run node-riffraff-artifact" + "ci:monitoring": "cp cdk/cdk.out/riff-raff.yaml riff-raff.yaml && yarn run node-riffraff-artifact" }, "prettier": "@guardian/prettier", "devDependencies": { diff --git a/riff-raff.yaml b/riff-raff.yaml deleted file mode 100644 index fd350a67e..000000000 --- a/riff-raff.yaml +++ /dev/null @@ -1,93 +0,0 @@ -stacks: [cmp-monitoring] -allowedStages: - - CODE - - PROD -deployments: - cmp-monitoring-cdk-eu-west-1: - regions: [eu-west-1] - type: cloud-formation - contentDirectory: 'cloud-formation' - parameters: - prependStackToCloudFormationStackName: false - cloudFormationStackName: cmp-monitoring - templateStagePaths: - CODE: CmpMonitoringStackEUCode.template.json - PROD: CmpMonitoringStackEUProd.template.json - cloudFormationStackByTags: false - manageStackPolicy: false - cmp-monitoring-lambda-eu-west-1: - dependencies: [cmp-monitoring-cdk-eu-west-1] - regions: [eu-west-1] - type: aws-lambda - actions: [uploadLambda, updateLambda] - parameters: - prefixStack: false - bucketSsmLookup: true - fileName: cmp-monitoring-lambda-eu-west-1.zip - lookupByTags: true - cmp-monitoring-cdk-us-west-1: - regions: [us-west-1] - type: cloud-formation - contentDirectory: 'cloud-formation' - parameters: - prependStackToCloudFormationStackName: false - cloudFormationStackName: cmp-monitoring - templateStagePaths: - CODE: CmpMonitoringStackUSCode.template.json - PROD: CmpMonitoringStackUSProd.template.json - cloudFormationStackByTags: false - manageStackPolicy: false - cmp-monitoring-lambda-us-west-1: - dependencies: [cmp-monitoring-cdk-us-west-1] - regions: [us-west-1] - type: aws-lambda - actions: [uploadLambda, updateLambda] - parameters: - prefixStack: false - bucketSsmLookup: true - fileName: cmp-monitoring-lambda-us-west-1.zip - lookupByTags: true - cmp-monitoring-cdk-ap-southeast-2: - regions: [ap-southeast-2] - type: cloud-formation - contentDirectory: 'cloud-formation' - parameters: - prependStackToCloudFormationStackName: false - cloudFormationStackName: cmp-monitoring - templateStagePaths: - CODE: CmpMonitoringStackAPCode.template.json - PROD: CmpMonitoringStackAPProd.template.json - cloudFormationStackByTags: false - manageStackPolicy: false - cmp-monitoring-lambda-ap-southeast-2: - dependencies: [cmp-monitoring-cdk-ap-southeast-2] - regions: [ap-southeast-2] - type: aws-lambda - actions: [uploadLambda, updateLambda] - parameters: - prefixStack: false - bucketSsmLookup: true - fileName: cmp-monitoring-lambda-ap-southeast-2.zip - lookupByTags: true - cmp-monitoring-cdk-ca-central-1: - regions: [ca-central-1] - type: cloud-formation - contentDirectory: 'cloud-formation' - parameters: - prependStackToCloudFormationStackName: false - cloudFormationStackName: cmp-monitoring - templateStagePaths: - CODE: CmpMonitoringStackCACode.template.json - PROD: CmpMonitoringStackCAProd.template.json - cloudFormationStackByTags: false - manageStackPolicy: false - cmp-monitoring-lambda-ca-central-1: - dependencies: [cmp-monitoring-cdk-ca-central-1] - regions: [ca-central-1] - type: aws-lambda - actions: [uploadLambda, updateLambda] - parameters: - prefixStack: false - bucketSsmLookup: true - fileName: cmp-monitoring-lambda-ca-central-1.zip - lookupByTags: true