Skip to content

Commit 23562d4

Browse files
authored
Merge branch 'main' into use_new_exports
2 parents 9df31df + 26c8bbe commit 23562d4

4 files changed

Lines changed: 85 additions & 4 deletions

File tree

packages/cdk/resources/ExportMigrations.ts

Lines changed: 64 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,13 +1352,13 @@ const exportValues: { [key: string]: ExportValue } = {
13521352
dev:
13531353
"arn:aws:iam::591291862413:policy/ci-resources-GrantCloudFormationExecutionAccessPolicyE-l4fZxSSj5UYn",
13541354
ref:
1355-
"not_created_yet",
1355+
"arn:aws:iam::158471595810:policy/ci-resources-GrantCloudFormationExecutionAccessPolicyE-KN3pSV9fOeg3",
13561356
qa:
1357-
"not_created_yet",
1357+
"arn:aws:iam::394382261442:policy/ci-resources-GrantCloudFormationExecutionAccessPolicyE-YuQuQXxlRATl",
13581358
int:
1359-
"not_created_yet",
1359+
"arn:aws:iam::399793560585:policy/ci-resources-GrantCloudFormationExecutionAccessPolicyE-RO8T3d8HQPYk",
13601360
prod:
1361-
"not_created_yet"
1361+
"arn:aws:iam::434629240718:policy/ci-resources-GrantCloudFormationExecutionAccessPolicyE-d9a3gVnlM2yl"
13621362
},
13631363
"ci-resources:AllowCloudFormationSecretsAccessManagedPolicy": {
13641364
dev:
@@ -1371,6 +1371,66 @@ const exportValues: { [key: string]: ExportValue } = {
13711371
"arn:aws:iam::399793560585:policy/ci-resources-AllowCloudFormationSecretsAccessManagedPolicy-UOnk2KV2NgxM",
13721372
prod:
13731373
"arn:aws:iam::434629240718:policy/ci-resources-AllowCloudFormationSecretsAccessManagedPolicy-gSySdnRavQEO"
1374+
},
1375+
"account-resources:ArtifactsBucket": {
1376+
dev:
1377+
"arn:aws:s3:::ci-resources-artifactsbucket-8tfokumg8i3z",
1378+
ref:
1379+
"arn:aws:s3:::ci-resources-artifactsbucket-197tpxmwhvin8",
1380+
qa:
1381+
"arn:aws:s3:::ci-resources-artifactsbucket-1qldqrx1rpxbs",
1382+
int:
1383+
"arn:aws:s3:::ci-resources-artifactsbucket-4687sfjwdxcw",
1384+
prod:
1385+
"arn:aws:s3:::ci-resources-artifactsbucket-1q5cgjvlusl0g"
1386+
},
1387+
"ci-resources:ReleaseNotesExecuteLambdaRole": {
1388+
dev:
1389+
"arn:aws:iam::591291862413:role/ci-resources-ReleaseNotesExecuteLambdaRole-SbLUYzNu2XVJ",
1390+
ref:
1391+
"arn:aws:iam::158471595810:role/ci-resources-ReleaseNotesExecuteLambdaRole-qtlanktYhP1T",
1392+
qa:
1393+
"arn:aws:iam::394382261442:role/ci-resources-ReleaseNotesExecuteLambdaRole-UTNxPM31ZcMK",
1394+
int:
1395+
"arn:aws:iam::399793560585:role/ci-resources-ReleaseNotesExecuteLambdaRole-q9iNsmzHnT32",
1396+
prod:
1397+
"arn:aws:iam::434629240718:role/ci-resources-ReleaseNotesExecuteLambdaRole-bZxfuO6isHp9"
1398+
},
1399+
"account-resources:JiraToken": {
1400+
dev:
1401+
"arn:aws:secretsmanager:eu-west-2:591291862413:secret:account-resources-jiraToken-Ld5lCx",
1402+
ref:
1403+
"arn:aws:secretsmanager:eu-west-2:158471595810:secret:account-resources-jiraToken-3Dc9gB",
1404+
qa:
1405+
"arn:aws:secretsmanager:eu-west-2:394382261442:secret:account-resources-jiraToken-MSJYcd",
1406+
int:
1407+
"arn:aws:secretsmanager:eu-west-2:399793560585:secret:account-resources-jiraToken-s59BJ5",
1408+
prod:
1409+
"arn:aws:secretsmanager:eu-west-2:434629240718:secret:account-resources-jiraToken-Gq8H84"
1410+
},
1411+
"account-resources:ConfluenceToken": {
1412+
dev:
1413+
"arn:aws:secretsmanager:eu-west-2:591291862413:secret:account-resources-confluenceToken-uP3yYi",
1414+
ref:
1415+
"arn:aws:secretsmanager:eu-west-2:158471595810:secret:account-resources-confluenceToken-dBmCF7",
1416+
qa:
1417+
"arn:aws:secretsmanager:eu-west-2:394382261442:secret:account-resources-confluenceToken-bsgQh0",
1418+
int:
1419+
"arn:aws:secretsmanager:eu-west-2:399793560585:secret:account-resources-confluenceToken-8qMZMJ",
1420+
prod:
1421+
"arn:aws:secretsmanager:eu-west-2:434629240718:secret:account-resources-confluenceToken-G2MMAo"
1422+
},
1423+
"ci-resources:AssistMeRegressionTestRole": {
1424+
dev:
1425+
"arn:aws:iam::591291862413:role/ci-resources-AssistMeRegressionTestRole-lCFZB0bfYDND",
1426+
ref:
1427+
"arn:aws:iam::158471595810:role/ci-resources-AssistMeRegressionTestRole-fPfXXkoLaNZv",
1428+
qa:
1429+
"arn:aws:iam::394382261442:role/ci-resources-AssistMeRegressionTestRole-d373Zet8a7ru",
1430+
int:
1431+
"arn:aws:iam::399793560585:role/ci-resources-AssistMeRegressionTestRole-Y99BkX1jodG9",
1432+
prod:
1433+
"arn:aws:iam::434629240718:role/ci-resources-AssistMeRegressionTestRole-xHhWqFgIIq0m"
13741434
}
13751435
}
13761436

packages/cdk/stacks/AccountResourcesStack_UK.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ export class AccountResourcesStack_UK extends Stack {
145145
exportName: `${props.stackName}:IAM:SplunkSubscriptionFilterRole:Arn`
146146
})
147147

148+
new CfnOutput(this, "ArtifactsBucketArn", {
149+
value: getExportValue("account-resources:ArtifactsBucket", props.environment),
150+
exportName: `${props.stackName}:Bucket:ArtifactsBucket:Arn`
151+
})
152+
148153
nagSuppressions(this, "AccountResources_UK")
149154
}
150155
}

packages/cdk/stacks/IAMStack.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,14 @@ export class IAMStack extends Stack {
9191
value: getExportValue("ci-resources:GrantCloudFormationExecutionAccessPolicyE", props.environment),
9292
exportName: `${props.stackName}:IAM:GrantCloudFormationExecutionAccessPolicyE:Arn`
9393
})
94+
new CfnOutput(this, "ReleaseNotesExecuteLambdaRoleArn", {
95+
value: getExportValue("ci-resources:ReleaseNotesExecuteLambdaRole", props.environment),
96+
exportName: `${props.stackName}:IAM:ReleaseNotesExecuteLambdaRole:Arn`
97+
})
98+
new CfnOutput(this, "AssistMeRegressionTestRoleArn", {
99+
value: getExportValue("ci-resources:AssistMeRegressionTestRole", props.environment),
100+
exportName: `${props.stackName}:IAM:AssistMeRegressionTestRole:Arn`
101+
})
94102
nagSuppressions(this, "IAM")
95103

96104
}

packages/cdk/stacks/SecretsStack.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,14 @@ export class SecretsStack extends Stack {
339339
value: getExportValue("ci-resources:AllowCloudFormationSecretsAccessManagedPolicy", props.environment),
340340
exportName: `${props.stackName}:Secrets:AllowCloudFormationSecretsAccessManagedPolicy:Arn`
341341
})
342+
new CfnOutput(this, "JiraTokenArn", {
343+
value: getExportValue("account-resources:JiraToken", props.environment),
344+
exportName: `${props.stackName}:Secrets:JiraToken:Arn`
345+
})
346+
new CfnOutput(this, "ConfluenceTokenArn", {
347+
value: getExportValue("account-resources:ConfluenceToken", props.environment),
348+
exportName: `${props.stackName}:Secrets:ConfluenceToken:Arn`
349+
})
342350
nagSuppressions(this, "Secrets")
343351
}
344352
}

0 commit comments

Comments
 (0)