Skip to content

chore(init-templates): remove v1 init templates#21019

Merged
mergify[bot] merged 2 commits intomainfrom
TheRealAmazonKendra/v1-init-templates
Jul 8, 2022
Merged

chore(init-templates): remove v1 init templates#21019
mergify[bot] merged 2 commits intomainfrom
TheRealAmazonKendra/v1-init-templates

Conversation

@TheRealAmazonKendra
Copy link
Copy Markdown
Contributor

A v1 app or library cannot be created from the v2 cli. This cleans up the v1 init template code.

This is stupidly long because of the amount of files deleted and moved so here's a rundown of the changes:

  • v1 templates deleted (github is showing some of these as renamed because they were duplicates of the v2 files that did get moved)
  • v2 templates removed from v2 folder and moved directly under init-templates
  • hook files imports updated (another place where it shows the change to v1 instead of v2 because the contents were the same) for templates and sample apps
  • init.ts: updated file paths to flattened directory
  • init.test.ts:
    • updated tests to only run for v2 templates
    • added test for fsharp since it was missing
    • updated .NET tests to look in the contents of the .sln file for the project information. I noticed that this test sometimes still passed when the init actually failed.

Note: This is the first of two PRs to fix the bug for creating .NET projects with spaces in the file path (issue aws/aws-cdk-cli#683). This PR was done separately so the bug fix didn't get lost in the 300 file changes due to the cleanup.


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

@gitpod-io
Copy link
Copy Markdown

gitpod-io bot commented Jul 6, 2022

@github-actions github-actions bot added the p2 label Jul 6, 2022
@aws-cdk-automation aws-cdk-automation requested a review from a team July 6, 2022 20:07
@mergify mergify bot added the contribution/core This is a PR that came from AWS. label Jul 6, 2022
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

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

@TheRealAmazonKendra
Copy link
Copy Markdown
Contributor Author

@Mergifyio refresh

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

refresh

✅ Pull request refreshed

@TheRealAmazonKendra
Copy link
Copy Markdown
Contributor Author

@Mergifyio unqueue

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

unqueue

✅ The pull request has been removed from the queue

@TheRealAmazonKendra
Copy link
Copy Markdown
Contributor Author

@Mergifyio requeue

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

requeue

✅ The queue state of this pull request has been cleaned. It can be re-embarked automatically

@TheRealAmazonKendra
Copy link
Copy Markdown
Contributor Author

@Mergifyio refresh

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

refresh

✅ Pull request refreshed

@TheRealAmazonKendra
Copy link
Copy Markdown
Contributor Author

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

rebase

✅ Branch has been successfully rebased

@TheRealAmazonKendra TheRealAmazonKendra force-pushed the TheRealAmazonKendra/v1-init-templates branch from 1133950 to 1745927 Compare July 7, 2022 17:16
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

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

A v1 app or library cannot be created from the v2 cli. This cleans up the v1 init template code.
@TheRealAmazonKendra TheRealAmazonKendra force-pushed the TheRealAmazonKendra/v1-init-templates branch from 1745927 to 8147860 Compare July 7, 2022 22:20
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 7, 2022

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 02099e1 into main Jul 8, 2022
@mergify mergify bot deleted the TheRealAmazonKendra/v1-init-templates branch July 8, 2022 00:19
@mergify
Copy link
Copy Markdown
Contributor

mergify bot commented Jul 8, 2022

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
Copy Markdown
Collaborator

AWS CodeBuild CI Report

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

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

daschaa pushed a commit to daschaa/aws-cdk that referenced this pull request Jul 9, 2022
A v1 app or library cannot be created from the v2 cli. This cleans up the v1 init template code.

This is stupidly long because of the amount of files deleted and moved so here's a rundown of the changes:
- v1 templates deleted (github is showing some of these as renamed because they were duplicates of the v2 files that did get moved)
- v2 templates removed from `v2` folder and moved directly under `init-templates`
- hook files imports updated (another place where it shows the change to v1 instead of v2 because the contents were the same) for templates and sample apps
- `init.ts`: updated file paths to flattened directory
- `init.test.ts`: 
    - updated tests to only run for v2 templates
    - added test for `fsharp` since it was missing
    - updated .NET tests to look in the contents of the `.sln` file for the project information. I noticed that this test sometimes still passed when the `init` actually failed.


Note: This is the first of two PRs to fix the bug for creating .NET projects with spaces in the file path (issue #18803). This PR was done separately so the bug fix didn't get lost in the 300 file changes due to the cleanup.


----

*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. p2

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants