Skip to content

Commit 612f43b

Browse files
committed
Fixed umccrise cdk jsii cross-stack resource references
* With latest cdk version, it does not like to import external fragments i.e. `cb.Project.from_project_name(...)` return object fragment from jsii reflection. Hence, not resolving full object state. * Related aws/aws-cdk#10234
1 parent aca31d2 commit 612f43b

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

cdk/apps/umccrise/app.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
common_dev_props,
9494
env=aws_env
9595
)
96-
CICDStack(
96+
cicd = CICDStack(
9797
app,
9898
cicd_dev_props['namespace'],
9999
cicd_dev_props,
@@ -112,6 +112,7 @@
112112
env=aws_env
113113
)
114114
slack_dev_props['ecr_name'] = common.ecr_name
115+
slack_dev_props['cb_project'] = cicd.cb_project
115116
CodeBuildLambdaStack(
116117
app,
117118
slack_dev_props['namespace'],

cdk/apps/umccrise/stacks/cicd.py

+5
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,8 @@ def __init__(self, scope: core.Construct, id: str, props, **kwargs) -> None:
4848
iam.ManagedPolicy.from_aws_managed_policy_name('AmazonEC2ContainerRegistryPowerUser')
4949
)
5050
refdata.grant_read(cb_project)
51+
self._cb_project = cb_project
52+
53+
@property
54+
def cb_project(self):
55+
return self._cb_project

cdk/apps/umccrise/stacks/slack.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ def __init__(self, scope: core.Construct, id: str, props, **kwargs) -> None:
4848

4949
################################################################################
5050
# Create a reference to the UMCCRise CodeBuild project
51-
# TODO: should probably use cross-stack resource references
52-
cb_project = cb.Project.from_project_name(
53-
self,
54-
id='UmccriseCodeBuildProject',
55-
project_name=props['codebuild_project_name']
56-
)
51+
cb_project = props['cb_project']
5752

5853
################################################################################
5954
# Create an SNS topic to receive CodeBuild state change events

0 commit comments

Comments
 (0)