Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: Switch to using an auto-generated riff-raff.yaml file #659

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@ 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.
# TODO move to https://github.com/guardian/actions-riff-raff in place of @guardian/node-riffraff-artifactt to remove this oddity
riff-raff.yaml
9 changes: 2 additions & 7 deletions artifact.json
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
{
Expand Down
4 changes: 2 additions & 2 deletions cdk/bin/cdk.ts
Original file line number Diff line number Diff line change
@@ -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',
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,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": {
Expand Down
89 changes: 0 additions & 89 deletions riff-raff.yaml

This file was deleted.