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.

Sign up for GitHub

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

Jump to bottom

test: Package Manager Support for deploy #869

Closed
wants to merge 24 commits into from
Closed

test: Package Manager Support for deploy #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
bd0ef45
chore: change trigger
0618 Jan 2, 2024
247e17b
chore: setup AWS credentials
0618 Jan 2, 2024
52d0f6a
chore: enable e2e deployment
0618 Jan 2, 2024
c4be31e
chore: change test order
0618 Jan 3, 2024
2be6ae7
fix: change rootTestDir
0618 Jan 3, 2024
d3e936f
fix: install typescript
0618 Jan 3, 2024
67e7382
fix: install @aws-amplify/backend
0618 Jan 3, 2024
2e343ef
fix: install @aws-amplify/backend-cli
0618 Jan 3, 2024
e83b172
fix: install @aws-amplify/auth-construct-alpha and deployer
0618 Jan 3, 2024
8bed4d7
chore: ignore logs
0618 Jan 4, 2024
339c4e5
fix: install uuid for data-storage-auth
0618 Jan 4, 2024
e1c22c0
temp: comment out cdk deploys
0618 Jan 4, 2024
214681d
fix: auth-cdk projects
0618 Jan 4, 2024
3d15a4d
fix: fileURLToPath error
0618 Jan 4, 2024
ba1ee8b
fix: fix fileURLToPath error
0618 Jan 4, 2024
41803e6
fix: fix fileURLToPath error again
0618 Jan 4, 2024
c1f12e6
Merge branch 'poc/package-manager-support' into poc/pms-deploy
0618 Jan 5, 2024
c52a65b
publish locally
0618 Jan 5, 2024
7ff5e9e
remove stop:npm-proxy
0618 Jan 5, 2024
2d798e3
Merge branch 'poc/package-manager-support' into poc/pms-deploy
0618 Jan 5, 2024
436bb17
chore: update package.lock
0618 Jan 5, 2024
5744032
feat: test different package managers
0618 Jan 5, 2024
7aadedd
chore: cleanup
0618 Jan 5, 2024
20f72ce
chore: add readonly
0618 Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/poc-e2e-flow-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,19 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: Restore Build Cache
uses: ./.github/actions/restore_build_cache
- name: Configure test tooling credentials
uses: ./.github/actions/setup_profile
with:
role-to-assume: ${{ secrets.E2E_TOOLING_ROLE_ARN }}
aws-region: us-west-2
profile-name: e2e-tooling
- name: Configure test execution credentials
uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # version 3.0.1
with:
role-to-assume: ${{ secrets.E2E_RUNNER_ROLE_ARN }}
aws-region: us-west-2
- name: Run E2E tests with ${{ matrix.pkg-manager }}
shell: bash
run: |
PACKAGE_MANAGER_EXECUTABLE=${{matrix.pkg-manager}} npm run test:dir packages/integration-tests/src/test-e2e/create_amplify.test.ts
PACKAGE_MANAGER_EXECUTABLE=${{matrix.pkg-manager}} npm run test:dir packages/integration-tests/src/test-e2e/deployment.test.ts
Copy link
Contributor Author

Choose a reason for hiding this comment

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

not use npm run e2e at this moment because we'll add more test (e.g. sandbox.test.ts) later.

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm assuming the end goal is to replace these with a single call to PACKAGE_MANAGER_EXECUTABLE=${{matrix.pkg-manager}} npm run e2e?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep. We'll eventually use PACKAGE_MANAGER_EXECUTABLE=${{matrix.pkg-manager}} npm run e2e when merge poc/package-manager-support to main

Copy link
Contributor Author

Choose a reason for hiding this comment

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

leave the create amplify as it is and add deployment test for only npm

Copy link
Member

@sobolk sobolk Jan 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

:-)
I'd say "leave existing e2e tests as is, create new job with matrix to run create-amplify test (with added deployment step inside test)".

2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.log
logs
coverage
docs
lib
Expand Down
160 changes: 80 additions & 80 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions packages/create-amplify/src/package-manager-controller/package_manager_controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ export abstract class PackageManagerController {
*/
constructor(
readonly projectRoot: string,
protected executable: string,
protected binaryRunner: string,
protected initDefault: string[],
protected installCommand: string,
protected readonly executable: string,
protected readonly binaryRunner: string,
protected readonly initDefault: string[],
protected readonly installCommand: string,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

for the comment #793 (comment) in a previous PR

protected readonly fsp = _fsp,
protected readonly path = _path,
protected readonly execa = _execa,
Expand Down
Loading
Loading