feat(core): cfn constructs (L1s) can now accept constructs as parameters for known resource relationships

[leonmk-aws]

Issue # (if applicable)

Closes #.

Reason for this change

Reintroduces #35713

Description of changes

This generates code that looks like this for non nested properties:

In the properties:
readonly role: IamIRoleRef | string;

This is then used in the constructor:

this.role = (props.role as IamIRoleRef)?.roleRef?.roleArn ?? cdk.ensureStringOrUndefined(props.role, "role", "iam.IRoleRef | string");

If there were multiple possible IxxRef:

"targetArn": (props.targetArn as SqsIQueueRef)?.queueRef?.queueArn ?? (props.targetArn as SnsITopicRef)?.topicRef?.topicArn ?? cdk.ensureStringOrUndefined(props.targetArn, "targetArn", "sqs.IQueueRef | sns.ITopicRef | string")

For arrays

this.layers = (props.layers?.forEach((item: ILayerVersionRef | string, i: number, arr: Array<ILayerVersionRef | string>) => { arr[i] = (item as ILayerVersionRef)?.layerVersionRef?.layerVersionArn ?? cdk.ensureStringOrUndefined(item, "layers", "lambda.ILayerVersionRef | string"); }), props.layers as Array<string>);

Nested properties are currently disabled as they are backwards incompatible in the state of this PR

For nested properties

The props behave the same way, "flatten" functions are generated to recursively perform the same role that was done in the constructor for non nested properties:

function flattenCfnFunctionCodeProperty(props: CfnFunction.CodeProperty | cdk.IResolvable): CfnFunction.CodeProperty | cdk.IResolvable {
  if (cdk.isResolvableObject(props)) return props;
  return {
    "imageUri": props.imageUri,
    "s3Bucket": (props.s3Bucket as S3IBucketRef)?.bucketRef?.bucketName ?? cdk.ensureStringOrUndefined(props.s3Bucket, "s3Bucket", "s3.IBucketRef | string"),
    "s3Key": props.s3Key,
    "s3ObjectVersion": props.s3ObjectVersion,
    "sourceKmsKeyArn": props.sourceKmsKeyArn,
    "zipFile": props.zipFile
  };
}

For arrays of nested props:

(cdk.isResolvableObject(props.fileSystemConfigs) ? props.fileSystemConfigs : (!props.fileSystemConfigs ? undefined : props.fileSystemConfigs.forEach((item: any, i: number, arr: any[]) => { arr[i] = flattenCfnFunctionFileSystemConfigProperty(item) }), props.fileSystemConfigs));

Description of how you validated changes

• Checked the diffs between the previously generated code and the new one.
• Added snapshot tests
• Added unit tests for lambda
• Deployed a stack manually consisting of mixes of L1 and L2 resources using the new capabilities this PR adds

Checklist

• My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

---

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license

[aws-cdk-automation]

(This review is outdated)

[rix0rrr]

Is there something we can do in the codegen to not change the identity of the input array, so we don't have to go down all the places where our change has affected the L2s?

[rix0rrr]

Probably jest.restoreAll() in the beforeEach?

[leonmk-aws]

Added a restore in afterEach: a mock for one test should not affect the others

[leonmk-aws]

The codegen has been updated to modify the arrays in place rather than creating new ones (see description)

[aws-cdk-automation]

➡️ PR build request submitted to test-main-pipeline ⬅️

A maintainer must now check the pipeline and add the pr-linter/cli-integ-tested label once the pipeline succeeds.

✅ Updated pull request passes all PRLinter validations. Dismissing previous PRLinter review.

[mergify]

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

[mergify]

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

[github-actions]

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.