Merge pull request #86 from guardian/remove-private-infrastructure-co…

…nfig remove the need for actions-read-private-repos action
guardian · Jun 18, 2024 · 421b4c9 · 421b4c9
2 parents 67ef859 + 152e54b
commit 421b4c9
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -17,9 +17,6 @@ jobs:
         with:
           node-version-file: .nvmrc
           cache: 'npm'
-      - uses: guardian/actions-read-private-repos@v0.1.1
-        with:
-          private-ssh-keys: ${{ secrets.PRIVATE_INFRASTRUCTURE_CONFIG_DEPLOY_KEY }}
       - name: Install dependencies
         run: |
           npm install

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/cdk/lib/transcription-service.ts b/packages/cdk/lib/transcription-service.ts
@@ -21,7 +21,6 @@ import {
 } from '@guardian/cdk/lib/constructs/iam';
 import { GuLambdaFunction } from '@guardian/cdk/lib/constructs/lambda';
 import { GuS3Bucket } from '@guardian/cdk/lib/constructs/s3';
-import { GuardianAwsAccounts } from '@guardian/private-infrastructure-config';
 import { MAX_RECEIVE_COUNT } from '@guardian/transcription-service-common';
 import {
 	type App,
@@ -91,7 +90,7 @@ export class TranscriptionService extends GuStack {
 			},
 		);
 
-		const ssmPrefix = `arn:aws:ssm:${props.env.region}:${GuardianAwsAccounts.Investigations}:parameter`;
+		const ssmPrefix = `arn:aws:ssm:${props.env.region}:${this.account}:parameter`;
 		const ssmPath = `${this.stage}/${this.stack}/${APP_NAME}`;
 		const domainName =
 			this.stage === 'PROD'
@@ -295,7 +294,7 @@ export class TranscriptionService extends GuStack {
 				new GuAllowPolicy(this, 'SetInstanceProtection', {
 					actions: ['autoscaling:SetInstanceProtection'],
 					resources: [
-						`arn:aws:autoscaling:${props.env.region}:${GuardianAwsAccounts.Investigations}:autoScalingGroup:*:autoScalingGroupName/${autoScalingGroupName}`,
+						`arn:aws:autoscaling:${props.env.region}:${this.account}:autoScalingGroup:*:autoScalingGroupName/${autoScalingGroupName}`,
 					],
 				}),
 				new GuAllowPolicy(this, 'WriteCloudwatch', {

diff --git a/packages/cdk/package.json b/packages/cdk/package.json
@@ -19,7 +19,6 @@
 		"@guardian/cdk": "53.0.3",
 		"@guardian/eslint-config-typescript": "8.0.0",
 		"@guardian/prettier": "5.0.0",
-		"@guardian/private-infrastructure-config": "github:guardian/private-infrastructure-config#v2.4.0",
 		"@guardian/tsconfig": "^0.2.0",
 		"@types/jest": "^29.5.11",
 		"@types/node": "20.11.5",