chore(init-templates): allow renaming in templates for cdk migrate apps #27166

HBobertz · 2023-09-15T17:16:56Z

New integ test for the new CDK migrate command. Template.txt is a sample cloudformation template with enough complexity to be a good enough sample.

Tests for Java and Csharp aren't there because they are broken right now. Add them back after we fix

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

TheRealAmazonKendra

I'm thinking this should actually be placed within the cli-integ-tests folder. It could even go in the cli.integtest.ts file because it is a CLI test.

HBobertz · 2023-09-15T19:20:24Z

I'm thinking this should actually be placed within the cli-integ-tests folder. It could even go in the cli.integtest.ts file because it is a CLI test.

I had planned to separate them because it seems any test that uses cdk init is separated from the other commands. I didn't know if this was due to a compatibility issue, runtime optimization, or if it was just arbitrary. But I had planned to keep that structure just in case. If that's not right, then I'm happy to put it in the cli-integ-tests suite because it would definitely simplify the process.

Of note any test that uses cdk init (including our migrate command) seems to fail locally, where as the others seem to succeed locally so I had assumed these suites were separated for compatibility reasons. Unsure if this is just an issue with my environment or it's an issue with init being testable locally

TheRealAmazonKendra · 2023-09-15T19:31:52Z

Looking a bit more closely, I do think that we should put this in the cli.integtest.ts file and then reuse the setup already being used in there so that we can actually do a deployment of the synthesized app. I know we had discussed only testing as far as synthesis goes before, but since, in this case we know we're starting with good templates, I think we should actually deploy it and verify that deployment.

HBobertz · 2023-09-15T19:48:45Z

Looking a bit more closely, I do think that we should put this in the cli.integtest.ts file and then reuse the setup already being used in there so that we can actually do a deployment of the synthesized app. I know we had discussed only testing as far as synthesis goes before, but since, in this case we know we're starting with good templates, I think we should actually deploy it and verify that deployment.

will do

HBobertz · 2023-09-15T19:49:03Z

Was gonna close but I'll just push a commit. That'll be significantly easier.

rix0rrr · 2023-09-18T16:54:45Z

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/template.txt

template.txt 🫣

lol want it to be .json? or just a more descriptive name than "template"

changed them

TheRealAmazonKendra · 2023-09-18T17:59:20Z

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

@@ -50,6 +50,31 @@ integTest('VPC Lookup', withDefaultFixture(async (fixture) => {
  await fixture.cdkDeploy('import-vpc', { modEnv: { ENABLE_VPC_TESTING: 'IMPORT' } });
 }));

+integTest(


Let's synth and deploy this in each target language and then verify the deployment with something like

// verify the the stack const response = await fixture.aws.cloudFormation('describeStacks', { StackName: stackArn, }); expect(response.StackName).toEqual(stackName);

As the test is written, it's not testing anything beyond what our unit tests already cover.

Also, I'd move it below the tests that actually test synth and deploy.

TheRealAmazonKendra · 2023-09-18T18:04:31Z

packages/@aws-cdk-testing/cli-integ/tests/cli-integ-tests/cli.integtest.ts

+      const tempPath = path.resolve(context.integTestDir);
+      const inputFile = path.join(__dirname, 'template.txt');
+
+      await tempShell.shell([


This can't possibly pass. It's missing --stack-name.

Hm good point. It's actually kind of alarming because this did pass, and that likely means our other init tests aren't being tested currently. Since this is identical to how we do our init tests today

Most of those tests have an expect statement of some sort. I see that not all do but I'm not totally familiar with their inner workings.

TheRealAmazonKendra · 2023-09-20T17:00:08Z

What's the error you're getting for csharp and java?

HBobertz · 2023-09-20T17:03:44Z

What's the error you're getting for csharp and java?

Java

  [ERROR] COMPILATION ERROR : 
  [ERROR] /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0bmx1jjif5c/cdktest-0bmx1jjif5c-java-migrate-stack/src/main/java/com/myorg/Cdktest0Bmx1Jjif5CJavaMigrateStackStack.java:[14,1] duplicate class: com.acme.test.simple.Cdktest0Bmx1Jjif5CJavaMigrateStackStack
  [ERROR] /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0bmx1jjif5c/cdktest-0bmx1jjif5c-java-migrate-stack/src/main/java/com/myorg/Cdktest0Bmx1Jjif5CJavaMigrateStackApp.java:[13,13] cannot access com.myorg.Cdktest0Bmx1Jjif5CJavaMigrateStackStack
    bad source file: /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0bmx1jjif5c/cdktest-0bmx1jjif5c-java-migrate-stack/src/main/java/com/myorg/Cdktest0Bmx1Jjif5CJavaMigrateStackStack.java
      file does not contain class com.myorg.Cdktest0Bmx1Jjif5CJavaMigrateStackStack
      Please remove or make sure it appears in the correct subdirectory of the sourcepath.
  [ERROR] Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:compile (default-compile) on project cdktest-0bmx1jjif5c-java-migrate-stack: Compilation failure: Compilation failure: 
  [ERROR] /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0bmx1jjif5c/cdktest-0bmx1jjif5c-java-migrate-stack/src/main/java/com/myorg/Cdktest0Bmx1Jjif5CJavaMigrateStackStack.java:[14,1] duplicate class: com.acme.test.simple.Cdktest0Bmx1Jjif5CJavaMigrateStackStack
  [ERROR] /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0bmx1jjif5c/cdktest-0bmx1jjif5c-java-migrate-stack/src/main/java/com/myorg/Cdktest0Bmx1Jjif5CJavaMigrateStackApp.java:[13,13] cannot access com.myorg.Cdktest0Bmx1Jjif5CJavaMigrateStackStack
  [ERROR]   bad source file: /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0bmx1jjif5c/cdktest-0bmx1jjif5c-java-migrate-stack/src/main/java/com/myorg/Cdktest0Bmx1Jjif5CJavaMigrateStackStack.java
  [ERROR]     file does not contain class com.myorg.Cdktest0Bmx1Jjif5CJavaMigrateStackStack
  [ERROR]     Please remove or make sure it appears in the correct subdirectory of the sourcepath.
  [ERROR] -> [Help 1]
  org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.apache.maven.plugins:maven-compiler-plugin:3.8.1:compile (default-compile) on project cdktest-0bmx1jjif5c-java-migrate-stack: Compilation failure

Csharp

  /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0q452a90fgkm/cdktest-0q452a90fgkm-csharp-migrate-stack/src/Cdktest0Q452A90FgkmCsharpMigrateStack/Cdktest0Q452A90FgkmCsharpMigrateStackStack.cs(2,22): error CS0234: The type or namespace name 'dynamodb' does not exist in the namespace 'Amazon.CDK.AWS' (are you missing an assembly reference?) [/private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0q452a90fgkm/cdktest-0q452a90fgkm-csharp-migrate-stack/src/Cdktest0Q452A90FgkmCsharpMigrateStack/Cdktest0Q452A90FgkmCsharpMigrateStack.csproj]
  /private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0q452a90fgkm/cdktest-0q452a90fgkm-csharp-migrate-stack/src/Cdktest0Q452A90FgkmCsharpMigrateStack/Cdktest0Q452A90FgkmCsharpMigrateStackStack.cs(10,87): error CS0246: The type or namespace name 'Cdktest0Q452A90FgkmCsharpMigrateStackStackProps' could not be found (are you missing a using directive or an assembly reference?) [/private/var/folders/7z/jm3q4jws2mdcjw47_sswyw0m0000gr/T/cdk-integ-0q452a90fgkm/cdktest-0q452a90fgkm-csharp-migrate-stack/src/Cdktest0Q452A90FgkmCsharpMigrateStack/Cdktest0Q452A90FgkmCsharpMigrateStack.csproj]

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

aws-cdk-automation · 2023-10-11T22:56:19Z

➡️ 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.

mergify · 2023-10-11T23:20:44Z

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 · 2023-10-11T23:49:02Z

AWS CodeBuild CI Report

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

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

mergify · 2023-10-11T23:49:20Z

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 requested a review from a team September 15, 2023 17:17

github-actions bot added the p2 label Sep 15, 2023

mergify bot added the contribution/core This is a PR that came from AWS. label Sep 15, 2023

HBobertz marked this pull request as ready for review September 15, 2023 17:19

aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Sep 15, 2023

TheRealAmazonKendra requested changes Sep 15, 2023

View reviewed changes

aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Sep 15, 2023

HBobertz requested a review from TheRealAmazonKendra September 15, 2023 19:26

HBobertz closed this Sep 15, 2023

HBobertz reopened this Sep 15, 2023

HBobertz changed the title ~~chore: add dummy test for future canary testing~~ chore: add CDK migrate CLI integ test Sep 18, 2023

rix0rrr reviewed Sep 18, 2023

View reviewed changes

TheRealAmazonKendra requested changes Sep 18, 2023

View reviewed changes

HBobertz had a problem deploying to test-pipeline September 19, 2023 19:59 — with GitHub Actions Failure

HBobertz force-pushed the bobertzh/testing branch from 32dd15f to 316ac35 Compare September 19, 2023 19:59

HBobertz force-pushed the bobertzh/testing branch from 343c2b0 to 626cc9c Compare September 20, 2023 20:49

Hogan Bobertz added 8 commits September 21, 2023 10:14

chore: empty test for future canary

bacccb3

dummify test even more

9809217

fix clippy being upset

deb71a1

add migrate test into cli-integ-tets

68e53a3

integ test for CDK migrate

5984f1a

test fixes

7b5a39e

working migrate test

7c8ff72

add multi language support

07b71e4

TheRealAmazonKendra temporarily deployed to test-pipeline October 10, 2023 03:00 — with GitHub Actions Inactive

more troubleshooting

5ac289a

TheRealAmazonKendra temporarily deployed to test-pipeline October 10, 2023 21:19 — with GitHub Actions Inactive

fix test

bdaaffb

TheRealAmazonKendra temporarily deployed to test-pipeline October 10, 2023 22:56 — with GitHub Actions Inactive

fix path

b13a080

TheRealAmazonKendra temporarily deployed to test-pipeline October 11, 2023 00:57 — with GitHub Actions Inactive

wrong path

0c6770d

TheRealAmazonKendra temporarily deployed to test-pipeline October 11, 2023 03:03 — with GitHub Actions Inactive

kendra is dumb

f319e9c

TheRealAmazonKendra changed the title ~~chore: add CDK migrate CLI integ test~~ chore(init-templates): allow renaming in templates for cdk migrate apps Oct 11, 2023

TheRealAmazonKendra temporarily deployed to test-pipeline October 11, 2023 04:56 — with GitHub Actions Inactive

remove test updates and only update init

b6aa7ec

TheRealAmazonKendra force-pushed the bobertzh/testing branch from c626a1c to b6aa7ec Compare October 11, 2023 22:47

TheRealAmazonKendra approved these changes Oct 11, 2023

View reviewed changes

TheRealAmazonKendra temporarily deployed to test-pipeline October 11, 2023 22:48 — with GitHub Actions Inactive

Merge branch 'main' into bobertzh/testing

385232a

TheRealAmazonKendra added pr-linter/cli-integ-tested Assert that any CLI changes have been integ tested and removed pr/do-not-merge This PR should not be merged at this time. labels Oct 11, 2023

TheRealAmazonKendra temporarily deployed to test-pipeline October 11, 2023 22:53 — with GitHub Actions Inactive

aws-cdk-automation removed the pr/needs-cli-test-run This PR needs CLI tests run against it. label Oct 11, 2023

Merge branch 'main' into bobertzh/testing

52d024b

mergify bot had a problem deploying to test-pipeline October 11, 2023 23:21 Failure

mergify bot merged commit 6143b16 into main Oct 11, 2023
7 of 8 checks passed

mergify bot deleted the bobertzh/testing branch October 11, 2023 23:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(init-templates): allow renaming in templates for cdk migrate apps #27166

chore(init-templates): allow renaming in templates for cdk migrate apps #27166

HBobertz commented Sep 15, 2023 •

edited

Loading

TheRealAmazonKendra left a comment

HBobertz commented Sep 15, 2023 •

edited

Loading

TheRealAmazonKendra commented Sep 15, 2023

HBobertz commented Sep 15, 2023

HBobertz commented Sep 15, 2023 •

edited

Loading

rix0rrr Sep 18, 2023

HBobertz Sep 18, 2023 •

edited

Loading

mrgrain Sep 19, 2023

HBobertz Sep 20, 2023

TheRealAmazonKendra Sep 18, 2023

TheRealAmazonKendra Sep 18, 2023

TheRealAmazonKendra Sep 18, 2023

HBobertz Sep 18, 2023 •

edited

Loading

TheRealAmazonKendra Sep 18, 2023

TheRealAmazonKendra commented Sep 20, 2023

HBobertz commented Sep 20, 2023

aws-cdk-automation commented Oct 11, 2023

mergify bot commented Oct 11, 2023

aws-cdk-automation commented Oct 11, 2023

mergify bot commented Oct 11, 2023

chore(init-templates): allow renaming in templates for cdk migrate apps #27166

chore(init-templates): allow renaming in templates for cdk migrate apps #27166

Conversation

HBobertz commented Sep 15, 2023 • edited Loading

TheRealAmazonKendra left a comment

Choose a reason for hiding this comment

HBobertz commented Sep 15, 2023 • edited Loading

TheRealAmazonKendra commented Sep 15, 2023

HBobertz commented Sep 15, 2023

HBobertz commented Sep 15, 2023 • edited Loading

rix0rrr Sep 18, 2023

Choose a reason for hiding this comment

HBobertz Sep 18, 2023 • edited Loading

Choose a reason for hiding this comment

mrgrain Sep 19, 2023

Choose a reason for hiding this comment

HBobertz Sep 20, 2023

Choose a reason for hiding this comment

TheRealAmazonKendra Sep 18, 2023

Choose a reason for hiding this comment

TheRealAmazonKendra Sep 18, 2023

Choose a reason for hiding this comment

TheRealAmazonKendra Sep 18, 2023

Choose a reason for hiding this comment

HBobertz Sep 18, 2023 • edited Loading

Choose a reason for hiding this comment

TheRealAmazonKendra Sep 18, 2023

Choose a reason for hiding this comment

TheRealAmazonKendra commented Sep 20, 2023

HBobertz commented Sep 20, 2023

Java

Csharp

aws-cdk-automation commented Oct 11, 2023

mergify bot commented Oct 11, 2023

aws-cdk-automation commented Oct 11, 2023

AWS CodeBuild CI Report

mergify bot commented Oct 11, 2023

HBobertz commented Sep 15, 2023 •

edited

Loading

HBobertz commented Sep 15, 2023 •

edited

Loading

HBobertz commented Sep 15, 2023 •

edited

Loading

HBobertz Sep 18, 2023 •

edited

Loading

HBobertz Sep 18, 2023 •

edited

Loading