Skip to content

feat: add Package Manager test to health_checks #968

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

Merged

Conversation

0618
Copy link
Contributor

@0618 0618 commented Jan 31, 2024

Problem

Issue number, if available:

#961

Changes

  • merge poc-e2e-flow-test.yml into health_checks
  • create re-usable action tag-trigger-action

Corresponding docs PR, if applicable:

Validation

https://github.com/0618/amplify-backend/actions/runs/7733532723
https://github.com/0618/amplify-backend/actions/runs/7733922426?pr=1

Checklist

  • If this PR includes a functional change to the runtime behavior of the code, I have added or updated automated test coverage for this change.
  • If this PR requires a change to the Project Architecture README, I have included that update in this PR.
  • If this PR requires a docs update, I have linked to that docs PR above.
  • If this PR modifies E2E tests, makes changes to resource provisioning, or makes SDK calls, I have run the PR checks with the run-e2e label set.

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

Copy link

changeset-bot bot commented Jan 31, 2024

⚠️ No Changeset found

Latest commit: af8d396

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

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

Click here to learn what changesets are, and how to add one.

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

@0618 0618 mentioned this pull request Jan 31, 2024
8 tasks
Comment on lines 119 to 135
do_include_package_manager_tests:
runs-on: ubuntu-latest
permissions:
# This is required so that the step can read the labels on the pull request
pull-requests: read
env:
# The gh cli expects the token at this environment variable
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
outputs:
run_package_manager_tests: ${{ steps.check.outputs.run_package_manager_tests }}
steps:
- name: Check event is push to main or pull request has run-e2e label
id: check
uses: ./.github/actions/tag_trigger_action
with:
tag-name: run-package-manager-tests
test-name: run_package_manager_tests
Copy link
Member

Choose a reason for hiding this comment

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

I think we should just use run-e2e label to include package manager tests.
package manager test are a kind of e2e tests.
I.e. I'd revert this part and make run_package_manager_tests_tests below dependent on run_e2e "GITHUB_OUTPUT".

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done af8d396

@@ -164,6 +172,53 @@ jobs:
aws-region: us-west-2
- name: Run E2E tests
run: npm run e2e
run_package_manager_tests_tests:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
run_package_manager_tests_tests:
run_package_manager_e2e_tests:

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done af8d396

env:
PACKAGE_MANAGER: ${{ matrix.pkg-manager }}
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Copy link
Member

Choose a reason for hiding this comment

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

can timeout be smaller? how long these tests run ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

changed to 25 min af8d396

@@ -0,0 +1,26 @@
name: tag_trigger_action
description: Trigger a workflow on a tag addition
Copy link
Contributor

Choose a reason for hiding this comment

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

I wonder if this should be called something like job_execution_gate? It's doing more than just checking a tag value.

Also, it's specifically setting the "run_e2e" output which seems too specific if we're making this a reusable action. Maybe it should just output "continue_execution=true|false"?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if we use run-e2e test, the re-usable action is unnecessary

tag-name:
description: 'The tag to trigger the workflow on'
required: true
test-name:
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't see where this input is used?

Copy link
Contributor Author

@0618 0618 Jan 31, 2024

Choose a reason for hiding this comment

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

it's used in ... echo "run_e2e=true" ;... 😂 but I forgot to change it

@0618 0618 merged commit 154bdb2 into aws-amplify:poc/package-manager-support Feb 1, 2024
sobolk added a commit that referenced this pull request Feb 1, 2024
* 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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants