Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(toolkit): programmatic toolkit for the AWS CDK initial code #32919

Merged
merged 21 commits into from
Jan 16, 2025

Conversation

mrgrain
Copy link
Contributor

@mrgrain mrgrain commented Jan 14, 2025

Description of changes

Initial code for the Programmatic Toolkit. This won't be released just yet.
Contains a mix of extensions and hard copies to the current CLI code.
After this PR we are moving the appropriate tests over from the CLI.

Describe any new or updated permissions being added

n/a

Description of how you validated changes

For the changes to aws-cdk we run the existing tests and the integration tests.

Checklist


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

@aws-cdk-automation aws-cdk-automation requested a review from a team January 14, 2025 18:18
@github-actions github-actions bot added the p2 label Jan 14, 2025
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jan 14, 2025
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@aws-cdk-automation aws-cdk-automation added the pr/needs-cli-test-run This PR needs CLI tests run against it. label Jan 14, 2025
@mrgrain mrgrain force-pushed the mrgrain/toolkit-poc branch from e76260b to eab8965 Compare January 14, 2025 18:34
Copy link

codecov bot commented Jan 14, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 81.48%. Comparing base (d68020b) to head (ed37f6e).
Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main   #32919   +/-   ##
=======================================
  Coverage   81.48%   81.48%           
=======================================
  Files         226      226           
  Lines       13768    13768           
  Branches     2416     2416           
=======================================
  Hits        11219    11219           
  Misses       2271     2271           
  Partials      278      278           
Flag Coverage Δ
suite.unit 81.48% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
packages/aws-cdk 80.89% <ø> (ø)
packages/aws-cdk-lib/core 82.10% <ø> (ø)

@mrgrain mrgrain force-pushed the mrgrain/toolkit-poc branch from eab8965 to e292c01 Compare January 14, 2025 19:43
@mrgrain mrgrain force-pushed the mrgrain/toolkit-poc branch from e292c01 to 0d62d34 Compare January 14, 2025 20:07
@mrgrain mrgrain force-pushed the mrgrain/toolkit-poc branch from 0d62d34 to 32d8494 Compare January 14, 2025 20:24
@mrgrain mrgrain marked this pull request as ready for review January 15, 2025 00:13
@mrgrain mrgrain requested a review from a team as a code owner January 15, 2025 00:13
@mrgrain mrgrain changed the title feat(toolkit): a programmatic toolkit for the AWS CDK chore(toolkit): a programmatic toolkit for the AWS CDK Jan 15, 2025
@mrgrain mrgrain changed the title chore(toolkit): a programmatic toolkit for the AWS CDK feat(toolkit): a programmatic toolkit for the AWS CDK Jan 15, 2025
mrgrain and others added 10 commits January 15, 2025 21:58
Fix remaining build failures

### Checklist
- [x] My code adheres to the [CONTRIBUTING
GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and
[DESIGN
GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)

----

*By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license*
Options for `watch` in the programmatic toolkit

----

*By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license*
cdk watch builds in toolkit

----

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

---------

Co-authored-by: Momo Kornher <[email protected]>
### Description of changes

Adds support for creating cloud assemblies from the 3 main sources:

- A builder function
- A CDK app dir
- A cdk.out dir

### Describe any new or updated permissions being added

n/a


### Checklist
- [x] My code adheres to the [CONTRIBUTING
GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and
[DESIGN
GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md)

----

*By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache-2.0 license*
@mrgrain mrgrain removed the pr/needs-cli-test-run This PR needs CLI tests run against it. label Jan 15, 2025
@aws-cdk-automation aws-cdk-automation dismissed their stale review January 15, 2025 22:43

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

@mrgrain
Copy link
Contributor Author

mrgrain commented Jan 15, 2025

The change to @aws-cdk/aws-custom-resource-sdk-adapter is incidental. The addition of a new dependency on @aws-sdk/client-kms forces a change to the dependency hoisting in the monorepo. This highlights a problem with the tests in this repo: The test cases mock the clients from within @aws-cdk/custom-resource-handlers, however the code includes the, from @aws-cdk/aws-custom-resource-sdk-adapter. Unless the dependency is hoisted up to the root (and thus the same package is used by both), we mock a version that's not use. Adding the additional deps is again forcing this hoisting. It's not a real solution though.

@mrgrain
Copy link
Contributor Author

mrgrain commented Jan 15, 2025

@Mergifyio update

Copy link
Contributor

mergify bot commented Jan 15, 2025

update

✅ Branch has been successfully updated

Copy link
Contributor

mergify bot commented Jan 16, 2025

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).

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: ed37f6e
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

Copy link
Contributor

mergify bot commented Jan 16, 2025

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 mergify bot merged commit 35275c3 into main Jan 16, 2025
19 checks passed
@mergify mergify bot deleted the mrgrain/toolkit-poc branch January 16, 2025 06:03
Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 16, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
contribution/core This is a PR that came from AWS. p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants