From 7f1d9dbafa30f0430b216e141d0d72a3927cf10c Mon Sep 17 00:00:00 2001 From: Zhang Date: Wed, 17 Apr 2024 10:13:11 -0700 Subject: [PATCH 1/2] fix(spec2cdk): Get tag gives null result in Java CDK --- tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts b/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts index 7b981cacb8fd7..fa7ab1d6f08f8 100644 --- a/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts +++ b/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts @@ -153,11 +153,11 @@ export class ResourceDecider { summary: 'Tag Manager which manages the tags for this resource', }, }, - initializer: (_: Expression) => + initializer: (props: Expression) => new CDK_CORE.TagManager( this.tagManagerVariant(variant), expr.lit(this.resource.cloudFormationType), - expr.UNDEFINED, + $E(props)[originalName], expr.object({ tagPropertyName: expr.lit(originalName) }), ), cfnValueToRender: { From 23c3e039a4e3e46fe0b186a1219815e71151183a Mon Sep 17 00:00:00 2001 From: Zhang Date: Wed, 17 Apr 2024 10:43:06 -0700 Subject: [PATCH 2/2] Remove render tag params --- tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts b/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts index fa7ab1d6f08f8..23906deef7805 100644 --- a/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts +++ b/tools/@aws-cdk/spec2cdk/lib/cdk/resource-decider.ts @@ -161,7 +161,7 @@ export class ResourceDecider { expr.object({ tagPropertyName: expr.lit(originalName) }), ), cfnValueToRender: { - [originalName]: $this.tags.renderTags($this[rawTagsPropName]), + [originalName]: $this.tags.renderTags(), }, }, {