fix: e2e tests #771

0618 · 2023-12-05T04:49:03Z

Issue #, if available:

Description of changes:

Refactor e2e test for paralleled e2e tests (test: run e2e tests in parallel #674)
Test Yarn Stable with Node 20.10 since test module fails with not ascii text nodejs/node#46159 is merged
Refactor Yarn Stable code for the newly release Yarn 4.0.2
- Not install yarn globally (Yarn V4 doesn't encourage to be installed globally)
- Hybrid PnP and Node_module (doc) because tsc is not supported by PnP Add new moduleResolution option: yarn-pnp microsoft/TypeScript#28289
- Change create amplify test concurrency to 1 for yarn since it doesn't handle cache Concurrent yarn call in parallel directories causes cache failure yarnpkg/yarn#8854 (comment)

How did I verify it?

PoC: https://github.com/aws-amplify/amplify-backend/actions/runs/7096112417?pr=771
Note: the test failure in the PoC build was becasue Github randomly uses Node v20.9 instead of v20.10.

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

This reverts commit f7a167b.

changeset-bot · 2023-12-05T04:49:07Z

🦋 Changeset detected

Latest commit: f98ddb9

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 0 packages

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

0618 · 2023-12-05T04:55:50Z

packages/integration-tests/src/test-e2e/create_amplify.test.ts

+
+const concurrency = process.env.PACKAGE_MANAGER_EXECUTABLE?.startsWith('yarn')
+  ? 1
+  : testConcurrencyLevel;


Remove the concurrency for yarn since it doesn't support cache for call in parallel yarnpkg/yarn#8854

0618 · 2023-12-05T04:57:45Z

packages/integration-tests/src/test-e2e/create_amplify.test.ts

+        );
+
+        if (PACKAGE_MANAGER_EXECUTABLE === 'yarn-stable') {
+          await packageManagerSetup(


yarn-stable should not be installed globally https://yarnpkg.com/getting-started/install

sobolk · 2023-12-05T18:27:28Z

packages/create-amplify/src/amplify_project_creator.ts

@@ -14,7 +14,7 @@ export class AmplifyProjectCreator {
  private readonly defaultDevPackages = [
    '@aws-amplify/backend',
    '@aws-amplify/backend-cli',
-    'typescript@^5.0.0',
+    'typescript@^5.0.0', // TODO: remove this line for yarn since it's installed in amplify/


is there any change here ?

I removed typescript from defaultDevPackages for yarn and yarn-stable because they need to be installed inside amplify/

checked. amplify folder can't consume the package from its parent folder. It might work if we make it as a workspace, but I don't think we want to do that, do we?

sobolk · 2023-12-05T18:27:49Z

packages/create-amplify/src/initial_project_file_generator.ts

+      await this.executeWithDebugLogger(
+        targetDir,
+        'yarn',
+        ['add', 'typescript@^5'],
+        execa
+      );


why do we need this ?

Before we convert to hybrid PnP and Node_modules, we had to install typescript in amplify/ folder to make sure tsc works, but since we adopt the hybrid mode, I can try if we still need to install typescript.

please check.

Just checked and we have to install typescript at both root and amplify/ folder because

amplify/ folder doesn't have access to the modoles in root folder if it's not a workspace

we use tsc from the root folder in the e2e test for compile. Also we may use tsc for deploy.

This reverts commit 0d83dd0.

PR updated. PTAL again

edwardfoyle

couple comments but no blockers for merging to the feature branch

edwardfoyle · 2023-12-05T22:58:04Z

.github/workflows/poc-e2e-flow-test.yml

@@ -37,18 +40,8 @@ jobs:
      fail-fast: false
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
-        pkg-manager: [npm, yarn, pnpm]
+        pkg-manager: [npm, yarn, yarn-stable, pnpm]


based on the discussion from the demo, can we name these something like yarn-classic and yarn-modern?

Renamed f98ddb9

edwardfoyle · 2023-12-05T23:00:10Z

.github/workflows/poc-e2e-flow-test.yml

-            node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
-          - os: windows-latest
-            pkg-manager: yarn-stable
-            node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
    env:
      ACKAGE_MANAGER_EXECUTABLE: ${{ matrix.pkg-manager }} # TODO: remove PACKAGE_MANAGER_EXECUTABLE once CLI is able to getPackageManager().


I realize it's not part of this PR, but this seems to be setting the wrong env var

Good catch!!! It's weird that the test ran as expected even with the wrong var name 😂

Oh, I see ${{ matrix.pkg-manager }} was directly passed to the env var in the commend line. Github env var has never been used

PR updated. PTAL again!

* feat: create amplify skip prompts for `--yes` option (#507) * feat: add env ci support * test: update unit tests * feat: create amplify --yes option * chore: remove un-used code * feat: support Panage Manager env var * chore: add comments * chore: remove env.CI * chore: update changeset * chore: rename PACKAGE_MANAGER_EXECUTABLE * fix: tests * fix npm -> npx * feat: init e2e test workflow for Package Manager Support (#533) * test: init e2e flow test * fix GH hash * use dynamic pkg manager * setup nodejs with npm * setup more pkg managers * install pkg managers * fix yarn1 and change step name * fix yarn1 * fix yarn1 * split yarn1 into 2 steps * fix yarn1 * fix yarn1 win * exclude bun on windows * yarn1 windows * setup yarn3 * yarn3 * yarn3 yarnPath * yarn use 3rd party action * try yarn3 * set yarn 3.6.x * set yarn berry * set yarn stable and pass --yes * feat: add env ci support * test: update unit tests * feat: create amplify --yes option * chore: remove un-used code * feat: support Panage Manager env var * chore: add comments * chore: remove env.CI * chore: update changeset * chore: rename PACKAGE_MANAGER_EXECUTABLE * fix: tests * use Env Var PACKAGE_MANAGER_EXECUTABLE * fix npm -> npx, remove bun * fix npm -> npx * change -- --yes * chore: update package.lock * chore: remove @Alpha * fix: clean up yarn * fix: change yarn1 to yarn * chore: rename yarn step * chore: use env * fix: yarn-stable env var * add comments * chore: update sample app with new imports (#541) * feat: use "use client"; directive in generated react components (#540) * fix: flatten prop types auth (#534) * fix: flatten auth login with types * chore: update snapshots * chore: update api * chore: add changeset * chore: add TODO --------- Co-authored-by: Amplifiyer <[email protected]> Co-authored-by: Spencer Stolworthy <[email protected]> Co-authored-by: awsluja <[email protected]> * fix: pnpm init and env var (#563) * fix: npm_project_initializer to use env var * fix: pnpm init * chore: update package.lock * chore: update package.lock * test: use GH workflow for e2e test of create amplify (#636) * feat: setup GH workflow for create amplify * chore: changeset * fix: add pkg type for modern yarn * fix npm install * feat: test Node v20 and Node v19 * feat: test Node v20 and yarn-stable with Node 19 * feat: exclude yarn-stable * feat: include node 20 and exclude node 19 * feat: use node 20 for others, use node 19 for yarn-stable * chore: add TODO to use Node 20 * fix: e2e tests (#771) * chore: change branch to poc/pms-create-amplify * fix: gitIgnore test * fix: refactor e2e for pms * chore: update package.lock * chore: update package.lock * temp: refactor * temp: run 1 test * temp: fix npx * temp: install packages for yarn * temp: update initial_project_file_generator * temp: install ts for yarn * temp: ignore node_modules and yarn.lock * temp: create yarn.lock for yarn stable * temp: fix yarn-stable init * temp: fix --help * fix: assert for gitignore * chore: change yarn stable install * fix: not install yarn stable globally * add @yarnpkg/sdks base * yarn stable use node-modules * remove emoji * remove @yarnpkg/sdks * yarn stable use node 18.18 * yarn stable use node 20 * chore: re-enable all tests * Revert "chore: re-enable all tests" This reverts commit f7a167b. * chore: uncomment test * chore: enable all initialStatues * test: change concurrencyLevel for yarn and yarn stable * add yarn-stable to test fails fast * chore: update changeset * chore: change workflow trigger * chore: yarn not install typescript in root folder * chore: update package.lock * Revert "chore: yarn not install typescript in root folder" This reverts commit 0d83dd0. * chore: remove comment * chore: fix typo * chore: rename yarn-classic and yarn modern * fix(create_amplify.test): after merge main * fix the concurrency for yarn classic and modern, and fix expect * feat: package manager support create amplify (#793) * chore: update package.lock * init * feat: dynamically get package manager * chore: change workflow trigger * chore: change workflow trigger * chore: rename npm functions * chore: update output log * fix: pnpm cache clear command * chore: refactor packageManager * fix: remove pnpm store * chore: create package_manager file * chore: change workflow trigger * chore: refactor PackageManager Controller and Initializer * fix: update types * chore: refactor to use factory * chore: remove try catch from the controllers * chore: change type * chore: use abstract class * fix tests * fix: PackageManagerBase * chore: refactor PackageManagerControllerFactory * chore: refactor packageJsonExists * chore: cleanup code * fix: projectJsonExists * remove package_manager file * chore: refactor package_manager props into package manager controllers * chore: rename packageManagerControllerFactory * chore: make projectRoot, userAgent, getPackageManagerName private * chore: refactor ensureInitialized * chore: refactor PackageManagerController to extend PackageManagerControllerFactory * Revert "chore: refactor PackageManagerController to extend PackageManagerControllerFactory" This reverts commit 7ddc64f. * chore: refactor to inject PackageManagerControllerFactory to xPackageManagerController * chore: move initialProjectFileGenerator to packageManagerController * fix: initializeAMplifyFolder * fix: generateInitialProjectFiles * fix: template path * chore: refactor getPackageManagerController yarn-modern * chore: create getWelcomeMessage * Revert "chore: refactor getPackageManagerController yarn-modern" This reverts commit 28da8a9. * chore: refactor generateInitialProjectFiles for yarn-modern * chore: cleanup code * chore: remove PackageManagerControllerFactory index * chore: remove ensureInitialized * Revert "chore: remove ensureInitialized" This reverts commit 96483ce. * Revert "Revert "chore: remove ensureInitialized"" This reverts commit 7c59c80. * temp: add initializeProject to PackageManagerController * temp: revert InitialProjectFileGenerator * fix: InitialProjectFileGenerator * test: restore initial_project_file_generator * move installDependencies and getWelcomeMessage to PackageManagerController * add addLockFile * add JSDocs and resolve some review comments * fix: create_amplify.test * chore: add addTypescript * chore: refactor generateInitialProjectFiles * Update packages/create-amplify/src/package-manager-controller/package_manager_controller_factory.ts Co-authored-by: Edward Foyle <[email protected]> * chore: refactor generateInitialProjectFiles again * chore: refactor welcomeMessage * test: add package_manager_controller_factory * test: fix test types * chore: comments update * chore: handle process.env.npm_config_user_agent undefined * chore: move addLockFile and addTypescript into initializeTsConfig * test: refactor packageManagerControllerFactory * fix: yarn initializeTsConfig * fix: yarn modern initializeTsConfig * fix: amplify_project_creator test * chore: refactor contructor * chore: update package.lock * fix: pnpm init, remove --debug, etc * test: add test for NpmPackageManagerController * fix build error * chore: refactor NpmPackageManagerController * test: add test for xPackageManagerController * chore: convert fs to fsp * fix yarn modern --------- Co-authored-by: Edward Foyle <[email protected]> * chore: update package-lock * test: add deploy test (#901) * chore: add e2e_flow.test * add deploy test but don't work * comment out deploy test * fix: e2e test assert * chore: update package.lock * add deploy test * use before and after * change amplifyCli to execa * change test trigger * Revert "change amplifyCli to execa" This reverts commit 9f85439. * setupProfile * Revert "Revert "change amplifyCli to execa"" This reverts commit 4950b7d. * remove fail test and initialStates * install @aws-amplify/backend-deployer * chore: update changeset * chore: set nodeLinker in test project * fix execaOptions syntax error * fix: npx in cdk deployer * chore: update changeset * fix: yarn modern build * chore: update package-lock * chore: remove some asserts * chore: remove synth * install packages to fix yarn * remove create-amplify help * simplify before and after * remove one packageManagerSetup * refactor packageManagerSetup * fix yarn- * move yarn add to setupPackageManager * fix type error * Revert "fix type error" and "move yarn add to setupPackageManager" This reverts commit d88ef61. * try fix pnpm for windows by adding @AWS-SDK+credential-providers * remove the pnpm patch * add nodir to dictionary * move setupPackageManager to a new file * rename PACKAGE_MANAGER_EXECUTABLE to PACKAGE_MANAGER * refactor packageManagerSetup to use switch * refactor packageManagerSetup to initializeX * use beforeEach and afterEach * add TODO comment * temp * simplify yarn-modern treatments * misc changes * add TODO comments * exclude pnpm on windows * Revert "exclude pnpm on windows" This reverts commit dd7b423. * exclude pnpm on windows * resolve review comments * fix syntax error * address review comments * move this.packageManager logic to ctor * fix yarn-modern * add packageManagerCli and packageManagerExecutable * fix yarn * address review comments * rename package_manager_sanity_check * update workflow yml * chore: update package-lock * move npm proxy to before and after * change comments * feat(backend-deploy): use packageManagerController (#947) * fix logger * fix logLevel * change workflow trigger to include poc/pms-cli-core * move package_manager_controller to cli-core * chore: update changeset * move npm_config_user_agent to getPackageManagerName and add runWithPackageManager * fix build error * modify executeWithDebugLogger * add getPackageManagerCommandArgs * refactor cdk_deployer to use package manager * install cli-core * fix execaChildProcess type * use PackageManagerControllerFactory in cdkDeployer * fix amplify/amplify path * chore: update API.md * clean up package-manager-controller export * update API.md * add type PackageManagerController * use PackageManagerController type from plugin-types * rename PackageManagerControllerBase and use plugin-types * change workflow trigger to exclude poc/pms-cli-core * refactor BackendDeployerFactory to take PackageManagerController * clean up getPackageManagerCommandArgs * add projectRoot and rename packageManagerControllerBase file * set projectRoot default value * rename execute_with_debugger_logger * use execa Options * Revert "use execa Options" This reverts commit 30cd61e. * rename executeChildProcessWithPackageManager to executeCommand * make BackendDeployerFactory param mandatory * make BackendDeployerFactory param mandatory * remove DependencyType * remove @aws-amplify/platform-core from cli-core * remove some default projectRoot * remove all default projectRoot * inject printer to factory * update package-lock * fix cli-core version in backend-deployer * move @aws-amplify/cli-core to devDep * add getCommand * change execa option type * change projectRoot to private * rename projectRoot to cwd * change ./ to cwd * remove @aws-amplify/cli-core from backend-deployer * patch dependencies_validator for execa * fix getCommand, cdk_deployer.test, amplify_project_creator.test * fix initial_project_file_generator.test * fix executeWithDebugLogger test * fix YarnModernPackageManagerController test * fix packageManagerControllerFactory test * fix lint error * Update packages/cli-core/src/package-manager-controller/package_manager_controller_factory.ts Co-authored-by: Kamil Sobol <[email protected]> * remove never used packageManagerExecutable * update changeset * feat: add Package Manager test to health_checks (#968) * add package-manager-tests to health-checks * remove poc-e2e-flow-test * add run_package_manager_tests_tests condition * fix run_package_manager_tests_tests condition * remove amplify-backend_windows-latest_8-core * use re-usable action for run-e2e * Revert "remove amplify-backend_windows-latest_8-core" This reverts commit 547834a. * Revert "use re-usable action for run-e2e" This reverts commit 3159e01. * revert re-usable action * Update .changeset/new-timers-warn.md Co-authored-by: Kamil Sobol <[email protected]> * clean up commented code * use amplify-backend_windows-latest_8-core * Update .changeset/new-timers-warn.md Co-authored-by: Edward Foyle <[email protected]> * remove inaccurate JSdoc * remove integration-tests from changeset --------- Co-authored-by: Amplifiyer <[email protected]> Co-authored-by: Spencer Stolworthy <[email protected]> Co-authored-by: awsluja <[email protected]> Co-authored-by: Edward Foyle <[email protected]> Co-authored-by: Kamil Sobol <[email protected]>

0618 added 30 commits November 27, 2023 17:46

chore: change branch to poc/pms-create-amplify

6577ebf

fix: gitIgnore test

63e498b

Merge branch 'main' into poc/pms-create-amplify

2649b52

fix: refactor e2e for pms

b12306f

chore: update package.lock

0fdb132

Merge branch 'main' into poc/pms-create-amplify

dfe3aab

chore: update package.lock

5023934

temp: refactor

12c183b

temp: run 1 test

020f87a

temp: fix npx

1ca1400

temp: install packages for yarn

307e613

temp: update initial_project_file_generator

7d9537b

temp: install ts for yarn

333d33d

temp: ignore node_modules and yarn.lock

ab0af4e

temp: create yarn.lock for yarn stable

43ec0c6

temp: fix yarn-stable init

efcbca4

temp: fix --help

5fc04ca

fix: assert for gitignore

2ab3397

chore: change yarn stable install

d4e52ba

Merge branch 'main' into poc/pms-create-amplify

1c1ca48

fix: not install yarn stable globally

4a1a848

add @yarnpkg/sdks base

15fa887

yarn stable use node-modules

d25ba85

remove emoji

068c40b

remove @yarnpkg/sdks

6a994f0

yarn stable use node 18.18

430f0a1

yarn stable use node 20

f1eb76a

chore: re-enable all tests

f7a167b

Revert "chore: re-enable all tests"

7d9bb78

This reverts commit f7a167b.

Merge branch 'poc/package-manager-support' into poc/pms-create-amplify

8edfb56

add yarn-stable to test fails fast

f45b6c8

0618 requested review from edwardfoyle, sobolk, Amplifiyer and srquinn21 as code owners December 5, 2023 04:49

chore: update changeset

45090b2

0618 commented Dec 5, 2023

View reviewed changes

chore: change workflow trigger

ac452fb

sobolk reviewed Dec 5, 2023

View reviewed changes

0618 added 3 commits December 5, 2023 11:19

Merge branch 'main' into poc/fix-e2e

4728a4c

chore: yarn not install typescript in root folder

0d83dd0

chore: update package.lock

5829bd3

sobolk previously approved these changes Dec 5, 2023

View reviewed changes

0618 and others added 3 commits December 5, 2023 12:02

Revert "chore: yarn not install typescript in root folder"

ddf9e6c

This reverts commit 0d83dd0.

chore: remove comment

e88dbee

Merge branch 'poc/package-manager-support' into poc/fix-e2e

35ad270

sobolk previously approved these changes Dec 5, 2023

View reviewed changes

edwardfoyle previously approved these changes Dec 5, 2023

View reviewed changes

0618 added 2 commits December 5, 2023 15:30

chore: fix typo

338457d

chore: rename yarn-classic and yarn modern

f98ddb9

sobolk approved these changes Dec 6, 2023

View reviewed changes

edwardfoyle approved these changes Dec 6, 2023

View reviewed changes

0618 merged commit cd46cf8 into aws-amplify:poc/package-manager-support Dec 6, 2023
16 checks passed

0618 deleted the poc/fix-e2e branch December 6, 2023 00:35

0618 mentioned this pull request Jan 30, 2024

feat: package manager support #960

Merged

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: e2e tests #771

fix: e2e tests #771

0618 commented Dec 5, 2023 •

edited

Loading

changeset-bot bot commented Dec 5, 2023 •

edited

Loading

0618 Dec 5, 2023

0618 Dec 5, 2023

sobolk Dec 5, 2023

0618 Dec 5, 2023

0618 Dec 5, 2023

sobolk Dec 5, 2023

0618 Dec 5, 2023

sobolk Dec 5, 2023

0618 Dec 5, 2023

edwardfoyle left a comment

edwardfoyle Dec 5, 2023

0618 Dec 6, 2023

edwardfoyle Dec 5, 2023

0618 Dec 5, 2023

0618 Dec 6, 2023

fix: e2e tests #771

fix: e2e tests #771

Conversation

0618 commented Dec 5, 2023 • edited Loading

changeset-bot bot commented Dec 5, 2023 • edited Loading

🦋 Changeset detected

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

edwardfoyle left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

0618 commented Dec 5, 2023 •

edited

Loading

changeset-bot bot commented Dec 5, 2023 •

edited

Loading