Skip to content

Commit 7e83ca2

Browse files
anthony-nhsanthony-nhs
committed
move to new import names
1 parent 727cb0a commit 7e83ca2

5 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎packages/cdkConstructs/src/constants.ts‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,27 @@ export const CDK_ENV_PREFIX = "CDK_CONFIG_"
55

66
/** Imported cross-stack account resource values used by constructs in this package. */
77
export const ACCOUNT_RESOURCES = {
8-
CloudwatchEncryptionKMSPolicyArn: Fn.importValue("account-resources:CloudwatchEncryptionKMSPolicyArn"),
9-
CloudwatchLogsKmsKeyArn: Fn.importValue("account-resources:CloudwatchLogsKmsKeyArn"),
8+
CloudwatchEncryptionKMSPolicyArn: Fn.importValue("account-resources-cdk-uk:IAM:CloudwatchEncryptionKMSPolicy:Arn"),
9+
CloudwatchLogsKmsKeyArn: Fn.importValue("account-resources-cdk-uk:KMS:CloudwatchLogsKmsKey:Arn"),
1010
EpsDomainName: Fn.importValue("eps-route53-resources:EPS-domain"),
1111
EpsZoneId: Fn.importValue("eps-route53-resources:EPS-ZoneID"),
12-
LambdaAccessSecretsPolicy: Fn.importValue("account-resources:LambdaAccessSecretsPolicy"),
13-
LambdaDecryptSecretsKMSPolicy: Fn.importValue("account-resources:LambdaDecryptSecretsKMSPolicy"),
14-
SpinePrivateKeyARN: Fn.importValue("account-resources:SpinePrivateKey"),
15-
SpinePublicCertificateARN: Fn.importValue("account-resources:SpinePublicCertificate"),
16-
SpineASIDARN: Fn.importValue("account-resources:SpineASID"),
17-
SpinePartyKeyARN: Fn.importValue("account-resources:SpinePartyKey"),
18-
SpineCAChainARN: Fn.importValue("account-resources:SpineCAChain"),
19-
TrustStoreBucket: Fn.importValue("account-resources:TrustStoreBucket"),
20-
TrustStoreBucketKMSKey: Fn.importValue("account-resources:TrustStoreBucketKMSKey"),
21-
TrustStoreDeploymentBucket: Fn.importValue("account-resources:TrustStoreDeploymentBucket")
12+
LambdaAccessSecretsPolicy: Fn.importValue("secrets-cdk:IAM:LambdaAccessSecretsPolicy:Arn"),
13+
LambdaDecryptSecretsKMSPolicy: Fn.importValue("secrets-cdk:IAM:LambdaDecryptSecretsKMSPolicy:Arn"),
14+
SpinePrivateKeyARN: Fn.importValue("secrets-cdk:Secrets:SpinePrivateKey:Arn"),
15+
SpinePublicCertificateARN: Fn.importValue("secrets-cdk:Secrets:SpinePublicCertificate:Arn"),
16+
SpineASIDARN: Fn.importValue("secrets-cdk:Secrets:SpineASID:Arn"),
17+
SpinePartyKeyARN: Fn.importValue("secrets-cdk:Secrets:SpinePartyKey:Arn"),
18+
SpineCAChainARN: Fn.importValue("secrets-cdk:Secrets:SpineCAChain:Arn"),
19+
TrustStoreBucket: Fn.importValue("account-resources-cdk-uk:Bucket:TrustStoreBucket:Arn"),
20+
TrustStoreBucketKMSKey: Fn.importValue("account-resources-cdk-uk:KMS:TrustStoreBucketKMSKey:Arn"),
21+
TrustStoreDeploymentBucket: Fn.importValue("account-resources-cdk-uk:Bucket:TrustStoreDeploymentBucket:Arn")
2222
}
2323

2424
/** Imported shared Lambda resource values used by Lambda and API Gateway constructs. */
2525
export const LAMBDA_RESOURCES = {
26-
LambdaInsightsLogGroupPolicy: Fn.importValue("lambda-resources:LambdaInsightsLogGroupPolicy"),
27-
SplunkDeliveryStream: Fn.importValue("lambda-resources:SplunkDeliveryStream"),
28-
SplunkSubscriptionFilterRole: Fn.importValue("lambda-resources:SplunkSubscriptionFilterRole")
26+
LambdaInsightsLogGroupPolicy: Fn.importValue("account-resources-cdk-uk:IAM:LambdaInsightsLogGroupPolicy:Arn"),
27+
SplunkDeliveryStream: Fn.importValue("account-resources-cdk-uk:Firehose:SplunkDeliveryStream:Arn"),
28+
SplunkSubscriptionFilterRole: Fn.importValue("account-resources-cdk-uk:IAM:SplunkSubscriptionFilterRole:Arn")
2929
}
3030

3131
/** Shared cfn-guard rule identifiers used for metadata suppressions. */

‎packages/cdkConstructs/tests/constructs/RestApiGateway.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,16 @@ describe("RestApiGateway without mTLS", () => {
4848
test("creates CloudWatch log group with correct properties", () => {
4949
template.hasResourceProperties("AWS::Logs::LogGroup", {
5050
LogGroupName: "/aws/apigateway/test-stack-apigw",
51-
KmsKeyId: {"Fn::ImportValue": "account-resources:CloudwatchLogsKmsKeyArn"},
51+
KmsKeyId: {"Fn::ImportValue": "account-resources-cdk-uk:KMS:CloudwatchLogsKmsKey:Arn"},
5252
RetentionInDays: 30
5353
})
5454
})
5555

5656
test("creates Splunk subscription filter", () => {
5757
template.hasResourceProperties("AWS::Logs::SubscriptionFilter", {
5858
FilterPattern: "",
59-
RoleArn: {"Fn::ImportValue": "lambda-resources:SplunkSubscriptionFilterRole"},
60-
DestinationArn: {"Fn::ImportValue": "lambda-resources:SplunkDeliveryStream"}
59+
RoleArn: {"Fn::ImportValue": "account-resources-cdk-uk:IAM:SplunkSubscriptionFilterRole:Arn"},
60+
DestinationArn: {"Fn::ImportValue": "account-resources-cdk-uk:Firehose:SplunkDeliveryStream:Arn"}
6161
})
6262
})
6363

@@ -269,7 +269,7 @@ describe("RestApiGateway with mTLS", () => {
269269
test("creates trust store deployment log group", () => {
270270
template.hasResourceProperties("AWS::Logs::LogGroup", {
271271
LogGroupName: "/aws/lambda/test-stack-truststore-deployment",
272-
KmsKeyId: {"Fn::ImportValue": "account-resources:CloudwatchLogsKmsKeyArn"},
272+
KmsKeyId: {"Fn::ImportValue": "account-resources-cdk-uk:KMS:CloudwatchLogsKmsKey:Arn"},
273273
RetentionInDays: 30
274274
})
275275
})

‎packages/cdkConstructs/tests/constructs/pythonLambdaFunctionConstruct.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ describe("pythonFunctionConstruct works correctly", () => {
6666
test("it has the correct log group", () => {
6767
template.hasResourceProperties("AWS::Logs::LogGroup", {
6868
LogGroupName: "/aws/lambda/testPythonLambda",
69-
KmsKeyId: {"Fn::ImportValue": "account-resources:CloudwatchLogsKmsKeyArn"},
69+
KmsKeyId: {"Fn::ImportValue": "account-resources-cdk-uk:KMS:CloudwatchLogsKmsKey:Arn"},
7070
RetentionInDays: 30
7171
})
7272
})
@@ -92,8 +92,8 @@ describe("pythonFunctionConstruct works correctly", () => {
9292
template.hasResourceProperties("AWS::Logs::SubscriptionFilter", {
9393
LogGroupName: {"Ref": lambdaLogGroupResource.Ref},
9494
FilterPattern: "",
95-
RoleArn: {"Fn::ImportValue": "lambda-resources:SplunkSubscriptionFilterRole"},
96-
DestinationArn: {"Fn::ImportValue": "lambda-resources:SplunkDeliveryStream"}
95+
RoleArn: {"Fn::ImportValue": "account-resources-cdk-uk:IAM:SplunkSubscriptionFilterRole:Arn"},
96+
DestinationArn: {"Fn::ImportValue": "account-resources-cdk-uk:Firehose:SplunkDeliveryStream:Arn"}
9797
})
9898
})
9999

@@ -108,8 +108,8 @@ describe("pythonFunctionConstruct works correctly", () => {
108108
}]
109109
},
110110
ManagedPolicyArns: Match.arrayWith([
111-
{"Fn::ImportValue": "lambda-resources:LambdaInsightsLogGroupPolicy"},
112-
{"Fn::ImportValue": "account-resources:CloudwatchEncryptionKMSPolicyArn"}
111+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:LambdaInsightsLogGroupPolicy:Arn"},
112+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:CloudwatchEncryptionKMSPolicy:Arn"}
113113
])
114114
})
115115
})
@@ -215,8 +215,8 @@ describe("pythonFunctionConstruct works correctly with additional policies", ()
215215
test("it has the correct policies in the role", () => {
216216
template.hasResourceProperties("AWS::IAM::Role", {
217217
ManagedPolicyArns: Match.arrayWith([
218-
{"Fn::ImportValue": "lambda-resources:LambdaInsightsLogGroupPolicy"},
219-
{"Fn::ImportValue": "account-resources:CloudwatchEncryptionKMSPolicyArn"},
218+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:LambdaInsightsLogGroupPolicy:Arn"},
219+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:CloudwatchEncryptionKMSPolicy:Arn"},
220220
{Ref: testPolicyResource.Ref}
221221
])
222222
})

‎packages/cdkConstructs/tests/constructs/stateMachineConstruct.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@ describe("ExpressStateMachine construct", () => {
3636
test("creates CloudWatch log group with correct name and KMS key", () => {
3737
template.hasResourceProperties("AWS::Logs::LogGroup", {
3838
LogGroupName: "/aws/stepfunctions/test-state-machine",
39-
KmsKeyId: {"Fn::ImportValue": "account-resources:CloudwatchLogsKmsKeyArn"},
39+
KmsKeyId: {"Fn::ImportValue": "account-resources-cdk-uk:KMS:CloudwatchLogsKmsKey:Arn"},
4040
RetentionInDays: 30
4141
})
4242
})
4343

4444
test("creates Splunk subscription filter by default", () => {
4545
template.hasResourceProperties("AWS::Logs::SubscriptionFilter", {
4646
FilterPattern: "",
47-
RoleArn: {"Fn::ImportValue": "lambda-resources:SplunkSubscriptionFilterRole"}
47+
RoleArn: {"Fn::ImportValue": "account-resources-cdk-uk:IAM:SplunkSubscriptionFilterRole:Arn"}
4848
})
4949
})
5050

‎packages/cdkConstructs/tests/constructs/typescriptFunctionConstruct.test.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe("TypescriptLambdaFunctionConstruct works correctly", () => {
7171
test("it has the correct log group", () => {
7272
template.hasResourceProperties("AWS::Logs::LogGroup", {
7373
LogGroupName: "/aws/lambda/testLambda",
74-
KmsKeyId: {"Fn::ImportValue": "account-resources:CloudwatchLogsKmsKeyArn"},
74+
KmsKeyId: {"Fn::ImportValue": "account-resources-cdk-uk:KMS:CloudwatchLogsKmsKey:Arn"},
7575
RetentionInDays: 30
7676
})
7777
})
@@ -97,8 +97,8 @@ describe("TypescriptLambdaFunctionConstruct works correctly", () => {
9797
template.hasResourceProperties("AWS::Logs::SubscriptionFilter", {
9898
LogGroupName: {"Ref": lambdaLogGroupResource.Ref},
9999
FilterPattern: "",
100-
RoleArn: {"Fn::ImportValue": "lambda-resources:SplunkSubscriptionFilterRole"},
101-
DestinationArn: {"Fn::ImportValue": "lambda-resources:SplunkDeliveryStream"}
100+
RoleArn: {"Fn::ImportValue": "account-resources-cdk-uk:IAM:SplunkSubscriptionFilterRole:Arn"},
101+
DestinationArn: {"Fn::ImportValue": "account-resources-cdk-uk:Firehose:SplunkDeliveryStream:Arn"}
102102
})
103103
})
104104

@@ -117,8 +117,8 @@ describe("TypescriptLambdaFunctionConstruct works correctly", () => {
117117
"Version": "2012-10-17"
118118
},
119119
"ManagedPolicyArns": Match.arrayWith([
120-
{"Fn::ImportValue": "lambda-resources:LambdaInsightsLogGroupPolicy"},
121-
{"Fn::ImportValue": "account-resources:CloudwatchEncryptionKMSPolicyArn"}
120+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:LambdaInsightsLogGroupPolicy:Arn"},
121+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:CloudwatchEncryptionKMSPolicy:Arn"}
122122
])
123123
})
124124
})
@@ -223,8 +223,8 @@ describe("functionConstruct works correctly with additional policies", () => {
223223
test("it has the correct policies in the role", () => {
224224
template.hasResourceProperties("AWS::IAM::Role", {
225225
"ManagedPolicyArns": Match.arrayWith([
226-
{"Fn::ImportValue": "lambda-resources:LambdaInsightsLogGroupPolicy"},
227-
{"Fn::ImportValue": "account-resources:CloudwatchEncryptionKMSPolicyArn"},
226+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:LambdaInsightsLogGroupPolicy:Arn"},
227+
{"Fn::ImportValue": "account-resources-cdk-uk:IAM:CloudwatchEncryptionKMSPolicy:Arn"},
228228
{Ref: testPolicyResource.Ref}
229229
])
230230
})

0 commit comments

Comments
 (0)