diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4862b57c..5a25a1b9 100644 --- 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 index 80b6e443..74efb706 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5795,11 +5795,6 @@ "tslib": "^2.6.2" } }, - "node_modules/@guardian/private-infrastructure-config": { - "version": "2.3.0", - "resolved": "git+ssh://git@github.com/guardian/private-infrastructure-config.git#5242448b2aabea0e5d7c1729d49113709428f5b3", - "dev": true - }, "node_modules/@guardian/transcription-service-backend-common": { "resolved": "packages/backend-common", "link": true @@ -22327,7 +22322,6 @@ "@guardian/cdk": "53.0.3", "@guardian/eslint-config-typescript": "8.0.0", "@guardian/prettier": "5.0.0", - "@guardian/private-infrastructure-config": "git+ssh://git@github.com/guardian/private-infrastructure-config.git#5242448b2aabea0e5d7c1729d49113709428f5b3", "@guardian/tsconfig": "^0.2.0", "@types/jest": "^29.5.11", "@types/node": "20.11.5", @@ -27048,11 +27042,6 @@ "dev": true, "requires": {} }, - "@guardian/private-infrastructure-config": { - "version": "git+ssh://git@github.com/guardian/private-infrastructure-config.git#5242448b2aabea0e5d7c1729d49113709428f5b3", - "dev": true, - "from": "@guardian/private-infrastructure-config@github:guardian/private-infrastructure-config#v2.4.0" - }, "@guardian/transcription-service-backend-common": { "version": "file:packages/backend-common", "requires": { @@ -29783,7 +29772,6 @@ "@guardian/cdk": "53.0.3", "@guardian/eslint-config-typescript": "8.0.0", "@guardian/prettier": "5.0.0", - "@guardian/private-infrastructure-config": "git+ssh://git@github.com/guardian/private-infrastructure-config.git#5242448b2aabea0e5d7c1729d49113709428f5b3", "@guardian/transcription-service-common": "1.0.0", "@guardian/tsconfig": "^0.2.0", "@types/jest": "^29.5.11", diff --git a/packages/cdk/lib/transcription-service.ts b/packages/cdk/lib/transcription-service.ts index db3cf19f..868dff68 100644 --- 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 index f989b711..578e7e9c 100644 --- 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",