chore: fix up v2 from inaccurate merge commits #13751
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current Python namespace in v2 for the monopackage is `aws_cdk_lib`, which means people need to update a lot of imports their source code. `aws_cdk` is the namespace used by the v1 packages, which means people who have already written code against v1 have less updating to do. Unfortunately there will still be SOME updating, as some classes *used* to be in `aws_cdk.core` but are now in `aws_cdk` directly. Tested that the `aws_cdk_lib` package that vends `aws_cdk/__init__.py` can still be installed without problems alongside `aws_cdk.cx_api` which vends `aws_cdk/cx_api/__init__.py`, and others. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
…0210309 # Conflicts: # packages/@aws-cdk/aws-cloudwatch-actions/lib/ec2.ts # packages/@aws-cdk/aws-dynamodb/lib/replica-provider.ts # packages/@aws-cdk/aws-dynamodb/test/dynamodb.test.ts # packages/@aws-cdk/aws-ecs/lib/ec2/ec2-service.ts # packages/@aws-cdk/aws-events-targets/lib/ecs-task.ts # packages/@aws-cdk/aws-events-targets/lib/util.ts # packages/@aws-cdk/aws-neptune/README.md # packages/@aws-cdk/aws-neptune/lib/cluster.ts # packages/@aws-cdk/aws-neptune/test/cluster.test.ts # packages/@aws-cdk/aws-s3-assets/lib/asset.ts # packages/aws-cdk/lib/init-templates/v2/app/java/pom.template.xml # packages/aws-cdk/lib/init-templates/v2/sample-app/java/pom.template.xml
Automated action from aws/cdk-ops
Automated action from aws/cdk-ops
Automated action from aws/cdk-ops
Automated action from aws/cdk-ops
Automated action from aws/cdk-ops
Automated action from aws/cdk-ops
The forward merge #13414 was erroneously squash-merged, resulting in some defects in the future forward merges. In particular, #13426 was dropped, un-reverting the commit and causing issues. There were also some test changes from #13462 that appeared to be dropped. This PR fixes the issue by just directly applying a patch to v2-main that solves the difference between the current v2-main and what we'd have if we un-squashed the squashed merge-commit and replayed all commits after that. This is an effective duplicate of #13742, except that this is a clean patch that can be applied, whereas the other is a rebased branch that will need to be force-pushed to be applied.
|
|
AWS CodeBuild CI Report
Powered by github-codebuild-logs, available on the AWS Serverless Application Repository |
nija-at
approved these changes
Mar 23, 2021
|
Resolved in favor of #13742 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The forward merge #13414 was erroneously squash-merged, resulting in some
defects in the future forward merges. In particular, #13426 was dropped,
un-reverting the commit and causing issues. There were also some test changes
from #13462 that appeared to be dropped.
This PR fixes the issue by just directly applying a patch to v2-main that solves
the difference between the current v2-main and what we'd have if we un-squashed
the squashed merge-commit and replayed all commits after that.
This is an effective duplicate of #13742, except that this is a clean patch that
can be applied, whereas the other is a rebased branch that will need to be
force-pushed to be applied.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license