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

fix(cli): broken java init template #13988

Merged
merged 2 commits into from
Apr 6, 2021
Merged

fix(cli): broken java init template #13988

merged 2 commits into from
Apr 6, 2021

Conversation

MrArnoldPalmer
Copy link
Contributor

Change the java init templates to not call the stack builder classes and
instead call the generated stack class constructor. Change the structure
of the comments to correctly allow uncommenting in order to pass env
config if needed.

fix: #13964


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

Change the java init templates to not call the stack builder classes and
instead call the generated stack class constructor. Change the structure
of the comments to correctly allow uncommenting in order to pass env
config if needed.

fix: #13964
@MrArnoldPalmer MrArnoldPalmer added p0 ui Related to CLI User Interface issues labels Apr 6, 2021
@MrArnoldPalmer MrArnoldPalmer requested review from NetaNir and a team April 6, 2021 01:29
@gitpod-io
Copy link

gitpod-io bot commented Apr 6, 2021

@github-actions github-actions bot added the package/tools Related to AWS CDK Tools or CLI label Apr 6, 2021
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Apr 6, 2021
Copy link
Contributor

@NetaNir NetaNir left a comment

Choose a reason for hiding this comment

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

What about the sample app templates?

@NetaNir NetaNir added the pr-linter/exempt-test The PR linter will not require test changes label Apr 6, 2021
@MrArnoldPalmer
Copy link
Contributor Author

@Mergifyio refresh

@mergify
Copy link
Contributor

mergify bot commented Apr 6, 2021

Command refresh: success

Pull request refreshed

@MrArnoldPalmer
Copy link
Contributor Author

The sample app templates didn't get these changes originally but we can unify those to include all of these comments as well in another PR.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildProject89A8053A-LhjRyN9kxr8o
  • Commit ID: b8c8e70
  • Result: SUCCEEDED
  • Build Logs (available for 30 days)

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

@mergify
Copy link
Contributor

mergify bot commented Apr 6, 2021

Thank you for contributing! Your pull request will be updated from master 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 c6ca2ab into master Apr 6, 2021
@mergify mergify bot deleted the fix/issue-13964 branch April 6, 2021 02:38
rix0rrr added a commit that referenced this pull request Apr 6, 2021
The Java init templates were recently fixed to use `new` instead
of the builder, because the builder would instantiate the wrong class
(`Stack` instead of `MyStack`) (#13988).

However, the structure was changed to have 3 different `new` calls
in 3 different comment blocks.

Change it back to the old structure: there is one instantiation, and
uncommenting just passes or doesn't pass the `env` property. Except
this time we use `new` instead of the builder.
mergify bot pushed a commit that referenced this pull request Apr 6, 2021
The Java init templates were recently fixed to use `new` instead
of the builder, because the builder would instantiate the wrong class
(`Stack` instead of `MyStack`) (#13988).

However, the structure was changed to have 3 different `new` calls
in 3 different comment blocks.

Change it back to the old structure: there is one instantiation, and
uncommenting just passes or doesn't pass the `env` property. Except
this time we use `new` instead of the builder.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
hollanddd pushed a commit to hollanddd/aws-cdk that referenced this pull request Aug 26, 2021
Change the java init templates to not call the stack builder classes and
instead call the generated stack class constructor. Change the structure
of the comments to correctly allow uncommenting in order to pass env
config if needed.

fix: aws#13964


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
hollanddd pushed a commit to hollanddd/aws-cdk that referenced this pull request Aug 26, 2021
The Java init templates were recently fixed to use `new` instead
of the builder, because the builder would instantiate the wrong class
(`Stack` instead of `MyStack`) (aws#13988).

However, the structure was changed to have 3 different `new` calls
in 3 different comment blocks.

Change it back to the old structure: there is one instantiation, and
uncommenting just passes or doesn't pass the `env` property. Except
this time we use `new` instead of the builder.


----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contribution/core This is a PR that came from AWS. p0 package/tools Related to AWS CDK Tools or CLI pr-linter/exempt-test The PR linter will not require test changes ui Related to CLI User Interface issues
Projects
None yet
Development

Successfully merging this pull request may close these issues.

!! NOTICE Empty java init template
4 participants