Skip to content

Commit cd58764

Browse files
anthony-nhsanthony-nhs
committed
change export names
1 parent 61a529c commit cd58764

4 files changed

Lines changed: 33 additions & 31 deletions

File tree

‎packages/cdkConstructs/src/constants.ts‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,27 @@ export const CDK_ENV_PREFIX = "CDK_CONFIG_"
77
export const ACCOUNT_RESOURCES = {
88
CloudwatchEncryptionKMSPolicyArn: Fn.importValue("account-resources-cdk-uk:IAM:CloudwatchEncryptionKMSPolicy:Arn"),
99
CloudwatchLogsKmsKeyArn: Fn.importValue("account-resources-cdk-uk:KMS:CloudwatchLogsKmsKey:Arn"),
10+
TrustStoreBucketArn: Fn.importValue("account-resources-cdk-uk:Bucket:TrustStoreBucket:Arn"),
11+
TrustStoreBucketKMSKeyArn: Fn.importValue("account-resources-cdk-uk:KMS:TrustStoreBucketKMSKey:Arn"),
12+
TrustStoreDeploymentBucketArn: Fn.importValue("account-resources-cdk-uk:Bucket:TrustStoreDeploymentBucket:Arn"),
13+
LambdaInsightsLogGroupPolicyArn: Fn.importValue("account-resources-cdk-uk:IAM:LambdaInsightsLogGroupPolicy:Arn"),
14+
SplunkDeliveryStreamArn: Fn.importValue("account-resources-cdk-uk:Firehose:SplunkDeliveryStream:Arn"),
15+
SplunkSubscriptionFilterRoleArn: Fn.importValue("account-resources-cdk-uk:IAM:SplunkSubscriptionFilterRole:Arn")
16+
}
17+
18+
export const ROUTE53_RESOURCES = {
1019
EpsDomainName: Fn.importValue("eps-route53-resources:EPS-domain"),
11-
EpsZoneId: Fn.importValue("eps-route53-resources:EPS-ZoneID"),
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")
20+
EpsZoneId: Fn.importValue("eps-route53-resources:EPS-ZoneID")
2221
}
2322

24-
/** Imported shared Lambda resource values used by Lambda and API Gateway constructs. */
25-
export const LAMBDA_RESOURCES = {
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")
23+
export const SECRETS_RESOURCES = {
24+
LambdaAccessSecretsPolicyArn: Fn.importValue("secrets-cdk:IAM:LambdaAccessSecretsPolicy:Arn"),
25+
LambdaDecryptSecretsKMSPolicyArn: Fn.importValue("secrets-cdk:IAM:LambdaDecryptSecretsKMSPolicy:Arn"),
26+
SpinePrivateKeyArn: Fn.importValue("secrets-cdk:Secrets:SpinePrivateKey:Arn"),
27+
SpinePublicCertificateArn: Fn.importValue("secrets-cdk:Secrets:SpinePublicCertificate:Arn"),
28+
SpineASIDArn: Fn.importValue("secrets-cdk:Secrets:SpineASID:Arn"),
29+
SpinePartyKeyArn: Fn.importValue("secrets-cdk:Secrets:SpinePartyKey:Arn"),
30+
SpineCAChainArn: Fn.importValue("secrets-cdk:Secrets:SpineCAChain:Arn")
2931
}
3032

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

‎packages/cdkConstructs/src/constructs/RestApiGateway.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import {
3333
} from "aws-cdk-lib/aws-route53"
3434
import {ApiGateway as ApiGatewayTarget} from "aws-cdk-lib/aws-route53-targets"
3535
import {NagSuppressions} from "cdk-nag"
36-
import {ACCOUNT_RESOURCES, LAMBDA_RESOURCES} from "../constants"
36+
import {ACCOUNT_RESOURCES, ROUTE53_RESOURCES} from "../constants"
3737
import {addSuppressions} from "../utils/helpers"
3838

3939
/** Configuration for creating a REST API with optional mTLS and log forwarding integrations. */
@@ -119,27 +119,27 @@ export class RestApiGateway extends Construct {
119119
this, "cloudWatchLogsKmsKey", ACCOUNT_RESOURCES.CloudwatchLogsKmsKeyArn)
120120

121121
const splunkDeliveryStream = Stream.fromStreamArn(
122-
this, "SplunkDeliveryStream", LAMBDA_RESOURCES.SplunkDeliveryStream)
122+
this, "SplunkDeliveryStream", ACCOUNT_RESOURCES.SplunkDeliveryStreamArn)
123123

124124
const splunkSubscriptionFilterRole = Role.fromRoleArn(
125-
this, "splunkSubscriptionFilterRole", LAMBDA_RESOURCES.SplunkSubscriptionFilterRole)
125+
this, "splunkSubscriptionFilterRole", ACCOUNT_RESOURCES.SplunkSubscriptionFilterRoleArn)
126126

127127
const trustStoreBucket = Bucket.fromBucketArn(
128-
this, "TrustStoreBucket", ACCOUNT_RESOURCES.TrustStoreBucket)
128+
this, "TrustStoreBucket", ACCOUNT_RESOURCES.TrustStoreBucketArn)
129129

130130
const trustStoreDeploymentBucket = Bucket.fromBucketArn(
131-
this, "TrustStoreDeploymentBucket", ACCOUNT_RESOURCES.TrustStoreDeploymentBucket)
131+
this, "TrustStoreDeploymentBucket", ACCOUNT_RESOURCES.TrustStoreDeploymentBucketArn)
132132

133133
const trustStoreBucketKmsKey = Key.fromKeyArn(
134-
this, "TrustStoreBucketKmsKey", ACCOUNT_RESOURCES.TrustStoreBucketKMSKey)
134+
this, "TrustStoreBucketKmsKey", ACCOUNT_RESOURCES.TrustStoreBucketKMSKeyArn)
135135

136136
let hostedZone: IHostedZone | undefined
137137
let serviceDomainName: string | undefined
138138

139139
if (enableServiceDomain) {
140-
const epsDomainName: string = ACCOUNT_RESOURCES.EpsDomainName
140+
const epsDomainName: string = ROUTE53_RESOURCES.EpsDomainName
141141
hostedZone = HostedZone.fromHostedZoneAttributes(this, "HostedZone", {
142-
hostedZoneId: ACCOUNT_RESOURCES.EpsZoneId,
142+
hostedZoneId: ROUTE53_RESOURCES.EpsZoneId,
143143
zoneName: epsDomainName
144144
})
145145
serviceDomainName = `${props.stackName}.${epsDomainName}`

‎packages/cdkConstructs/src/constructs/StateMachine.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import {
2020
} from "aws-cdk-lib/aws-stepfunctions"
2121
import {Construct} from "constructs"
2222
import {CfnDeliveryStream} from "aws-cdk-lib/aws-kinesisfirehose"
23-
import {ACCOUNT_RESOURCES, CFN_GUARD_RULES, LAMBDA_RESOURCES} from "../constants"
23+
import {ACCOUNT_RESOURCES, CFN_GUARD_RULES} from "../constants"
2424
import {addSuppressions} from "../utils/helpers"
2525

2626
/**
@@ -98,7 +98,7 @@ export class ExpressStateMachine extends Construct {
9898
this, "cloudwatchEncryptionKMSPolicy", ACCOUNT_RESOURCES.CloudwatchEncryptionKMSPolicyArn),
9999
splunkDeliveryStream,
100100
splunkSubscriptionFilterRole = Role.fromRoleArn(
101-
this, "splunkSubscriptionFilterRole", LAMBDA_RESOURCES.SplunkSubscriptionFilterRole),
101+
this, "splunkSubscriptionFilterRole", ACCOUNT_RESOURCES.SplunkSubscriptionFilterRoleArn),
102102
addSplunkSubscriptionFilter = true
103103
} = props
104104

@@ -122,7 +122,7 @@ export class ExpressStateMachine extends Construct {
122122
})
123123
} else {
124124
const splunkDeliveryStreamImport = Stream.fromStreamArn(
125-
this, "SplunkDeliveryStream", LAMBDA_RESOURCES.SplunkDeliveryStream)
125+
this, "SplunkDeliveryStream", ACCOUNT_RESOURCES.SplunkDeliveryStreamArn)
126126
new CfnSubscriptionFilter(this, "StateMachineLogsSplunkSubscriptionFilter", {
127127
destinationArn: splunkDeliveryStreamImport.streamArn,
128128
filterPattern: "",

‎packages/cdkConstructs/src/constructs/lambdaSharedResources.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import {
1313
} from "aws-cdk-lib/aws-iam"
1414
import {NagSuppressions} from "cdk-nag"
1515
import {LAMBDA_INSIGHTS_LAYER_ARNS} from "../config"
16-
import {ACCOUNT_RESOURCES, CFN_GUARD_RULES, LAMBDA_RESOURCES} from "../constants"
16+
import {ACCOUNT_RESOURCES, CFN_GUARD_RULES} from "../constants"
1717
import {addSuppressions} from "../utils/helpers"
1818
import {CfnDeliveryStream} from "aws-cdk-lib/aws-kinesisfirehose"
1919
import {Stream} from "aws-cdk-lib/aws-kinesis"
@@ -55,9 +55,9 @@ export const createSharedLambdaResources = (
5555
),
5656
splunkDeliveryStream,
5757
splunkSubscriptionFilterRole = Role.fromRoleArn(
58-
scope, "splunkSubscriptionFilterRole", LAMBDA_RESOURCES.SplunkSubscriptionFilterRole),
58+
scope, "splunkSubscriptionFilterRole", ACCOUNT_RESOURCES.SplunkSubscriptionFilterRoleArn),
5959
lambdaInsightsLogGroupPolicy = ManagedPolicy.fromManagedPolicyArn(
60-
scope, "lambdaInsightsLogGroupPolicy", LAMBDA_RESOURCES.LambdaInsightsLogGroupPolicy),
60+
scope, "lambdaInsightsLogGroupPolicy", ACCOUNT_RESOURCES.LambdaInsightsLogGroupPolicyArn),
6161
addSplunkSubscriptionFilter = true
6262
} = props
6363
const insightsLambdaLayerArn = architecture === Architecture.ARM_64
@@ -88,7 +88,7 @@ export const createSharedLambdaResources = (
8888
})
8989
} else {
9090
const splunkDeliveryStreamImport = Stream.fromStreamArn(
91-
scope, "SplunkDeliveryStream", LAMBDA_RESOURCES.SplunkDeliveryStream)
91+
scope, "SplunkDeliveryStream", ACCOUNT_RESOURCES.SplunkDeliveryStreamArn)
9292
new CfnSubscriptionFilter(scope, "LambdaLogsSplunkSubscriptionFilter", {
9393
destinationArn: splunkDeliveryStreamImport.streamArn,
9494
filterPattern: "",

0 commit comments

Comments
 (0)