From d19c420c71ca02d80d4e3ef1e20fb424e4b09c53 Mon Sep 17 00:00:00 2001
From: Chris Wilton-Magras <chriswilty@zoho.com>
Date: Mon, 21 Oct 2024 14:22:07 +0100
Subject: [PATCH] Reset pipeline trigger to main branch, ready for merge

---
 cloud/lib/pipeline-stack.ts | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/cloud/lib/pipeline-stack.ts b/cloud/lib/pipeline-stack.ts
index c1d796cc..6b3ece96 100644
--- a/cloud/lib/pipeline-stack.ts
+++ b/cloud/lib/pipeline-stack.ts
@@ -32,15 +32,11 @@ export class PipelineStack extends Stack {
 		const generateResourceId = resourceId(scope);
 		const stage = stageName(scope);
 
-		// FIXME Reset branch to 'main' !!!
-		const sourceCode = CodePipelineSource.connection(
-			'ScottLogic/prompt-injection',
-			'feature/aws-cloud-infrastructure',
-			{
-				//connectionArn: `arn:aws:codestar-connections:${env.region}:${env.account}:connection/05c0f0a4-2233-4269-a697-33a339f8a6bc`,
-				connectionArn: `arn:aws:codestar-connections:eu-north-1:${env.account}:connection/05c0f0a4-2233-4269-a697-33a339f8a6bc`,
-			}
-		);
+		const sourceCode = CodePipelineSource.connection('ScottLogic/prompt-injection', 'main', {
+			// Connection ID below is for ScottLogic repo; if you are developing on your own
+			// fork, you'll need to set up a CodeSuite connection in AWS Console.
+			connectionArn: `arn:aws:codestar-connections:${env.region}:${env.account}:connection/05c0f0a4-2233-4269-a697-33a339f8a6bc`,
+		});
 
 		const hostBucketName = generateResourceId('host-bucket');
 
@@ -66,10 +62,8 @@ export class PipelineStack extends Stack {
 			synth: new ShellStep('Synth', {
 				input: sourceCode,
 				installCommands: ['npm ci', 'cd cloud', 'npm ci --no-audit', 'cd ..'],
-				// FIXME Revert this to `npm run cdk:synth -- --context STAGE=${stage}`
-				commands: ['cd cloud', 'npm run cdk:dev:synth'],
-				// FIXME Revert this to 'cloud/cdk.out'
-				primaryOutputDirectory: 'cloud/cdk.dev.out',
+				commands: ['cd cloud', `npm run cdk:synth -- --context STAGE=${stage}`],
+				primaryOutputDirectory: 'cloud/cdk.out',
 			}),
 			synthCodeBuildDefaults: {
 				buildEnvironment: {