Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
fe038a4
feat: create amplify skip prompts for `--yes` option (#507)
0618 Oct 30, 2023
b155096
Merge branch 'main' into poc/package-manager-support
0618 Oct 30, 2023
3f37820
Merge branch 'main' into poc/package-manager-support
0618 Oct 31, 2023
3799a9c
Merge branch 'main' into poc/package-manager-support
0618 Oct 31, 2023
c7af239
feat: init e2e test workflow for Package Manager Support (#533)
0618 Oct 31, 2023
3940efa
Merge branch 'main' into poc/package-manager-support
0618 Nov 2, 2023
6c0036f
fix: pnpm init and env var (#563)
0618 Nov 2, 2023
6cb29c6
Merge branch 'main' into poc/package-manager-support
0618 Nov 2, 2023
7634c37
Merge branch 'main' into poc/package-manager-support
0618 Nov 9, 2023
cb56b3d
Merge branch 'main' into poc/package-manager-support
0618 Nov 10, 2023
cbed3f4
Merge branch 'main' into poc/package-manager-support
0618 Nov 10, 2023
6750713
chore: update package.lock
0618 Nov 10, 2023
43d8da3
Merge branch 'update-package-lock' into poc/package-manager-support
0618 Nov 10, 2023
4b30f2a
Merge branch 'main' into poc/package-manager-support
0618 Nov 10, 2023
d5eab4a
chore: update package.lock
0618 Nov 10, 2023
e2bbafc
Merge branch 'update-package-lock' into poc/package-manager-support
0618 Nov 10, 2023
c1edfdf
Merge branch 'main' into poc/package-manager-support
0618 Nov 11, 2023
c34a987
test: use GH workflow for e2e test of create amplify (#636)
0618 Nov 13, 2023
5dbbc62
Merge branch 'main' into poc/package-manager-support
0618 Dec 4, 2023
8943ac5
Merge branch 'main' into poc/package-manager-support
0618 Dec 5, 2023
cd46cf8
fix: e2e tests (#771)
0618 Dec 6, 2023
ddbc3c5
Merge branch 'main' into poc/package-manager-support
0618 Dec 6, 2023
fd3defe
Merge branch 'main' into poc/package-manager-support
0618 Dec 6, 2023
6bff8b4
Merge branch 'main' into poc/package-manager-support and use `main`
0618 Dec 19, 2023
4c77c70
fix(create_amplify.test): after merge main
0618 Dec 20, 2023
0413a9e
fix the concurrency for yarn classic and modern, and fix expect
0618 Dec 20, 2023
af81b8e
Merge branch 'main' into poc/package-manager-support
0618 Dec 27, 2023
548f9d1
feat: package manager support create amplify (#793)
0618 Dec 27, 2023
b6a0050
Merge branch 'main' into poc/package-manager-support
0618 Jan 4, 2024
2f51f94
Merge branch 'main' into poc/package-manager-support
0618 Jan 5, 2024
2a5b0a5
Merge branch 'main' into poc/package-manager-support
0618 Jan 5, 2024
0cfa145
Merge branch 'main' into poc/package-manager-support
0618 Jan 8, 2024
129f94f
Merge branch 'main' into poc/package-manager-support
0618 Jan 10, 2024
f19588a
chore: update package-lock
0618 Jan 11, 2024
dc91ae0
Merge branch 'main' into poc/package-manager-support
0618 Jan 13, 2024
cb8313f
Merge branch 'main' into poc/package-manager-support
0618 Jan 17, 2024
774267c
Merge branch 'main' into poc/package-manager-support
0618 Jan 19, 2024
ff9c6aa
test: add deploy test (#901)
0618 Jan 19, 2024
d34775f
Merge branch 'main' into poc/package-manager-support
0618 Jan 23, 2024
df63a1d
Merge branch 'main' into poc/package-manager-support
0618 Jan 23, 2024
1bb74d7
Merge branch 'main' into poc/package-manager-support
0618 Jan 25, 2024
a0c5449
Merge branch 'main' into poc/package-manager-support
0618 Jan 30, 2024
8b4619f
feat(backend-deploy): use packageManagerController (#947)
0618 Jan 30, 2024
3b923b7
patch dependencies_validator for execa
0618 Jan 31, 2024
e6f143e
fix getCommand, cdk_deployer.test, amplify_project_creator.test
0618 Jan 31, 2024
51d6dad
fix initial_project_file_generator.test
0618 Jan 31, 2024
99c1b0b
fix executeWithDebugLogger test
0618 Jan 31, 2024
4bfda61
fix YarnModernPackageManagerController test
0618 Jan 31, 2024
4ee0cf2
fix packageManagerControllerFactory test
0618 Jan 31, 2024
ead5864
fix lint error
0618 Jan 31, 2024
c4a03ad
Update packages/cli-core/src/package-manager-controller/package_manag…
0618 Jan 31, 2024
e344b5b
remove never used packageManagerExecutable
0618 Jan 31, 2024
a4011c4
update changeset
0618 Feb 1, 2024
154bdb2
feat: add Package Manager test to health_checks (#968)
0618 Feb 1, 2024
1f297f0
Update .changeset/new-timers-warn.md
0618 Feb 1, 2024
010277b
clean up commented code
0618 Feb 1, 2024
4f85b3d
use amplify-backend_windows-latest_8-core
0618 Feb 1, 2024
e98d642
Update .changeset/new-timers-warn.md
0618 Feb 1, 2024
223f9eb
remove inaccurate JSdoc
0618 Feb 1, 2024
276b82a
remove integration-tests from changeset
0618 Feb 1, 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
10 changes: 10 additions & 0 deletions .changeset/new-timers-warn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@aws-amplify/backend-deployer': minor
'create-amplify': minor
'@aws-amplify/plugin-types': minor
'@aws-amplify/cli-core': minor
'@aws-amplify/sandbox': minor
'@aws-amplify/backend-cli': minor

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

are all of the versions minor?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

given where we are today (0.x versions and added feature with api breaks) yes that seems ok.

---

Support yarn 1, yarn 2+ and pnpm package managers
3 changes: 3 additions & 0 deletions .eslint_dictionary.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"ecma",
"enum",
"enums",
"esbuild",
"esnext",
"execa",
"facebook",
Expand Down Expand Up @@ -74,6 +75,7 @@
"namespace",
"nodejs",
"nodenext",
"nodir",
"npmrc",
"npx",
"nullability",
Expand All @@ -85,6 +87,7 @@
"passthrough",
"pathname",
"pipelined",
"pnpm",
"posix",
"readdir",
"readline",
Expand Down
47 changes: 47 additions & 0 deletions .github/workflows/health_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,53 @@ jobs:
aws-region: us-west-2
- name: Run E2E tests
run: npm run e2e
run_package_manager_e2e_tests:
if: needs.do_include_e2e.outputs.run_e2e == 'true'
strategy:
# will finish running other test matrices even if one fails
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, amplify-backend_windows-latest_8-core]
pkg-manager: [npm, yarn-classic, yarn-modern, pnpm]
node-version: [20]
exclude:
- os: amplify-backend_windows-latest_8-core
pkg-manager: pnpm
env:
PACKAGE_MANAGER: ${{ matrix.pkg-manager }}
runs-on: ${{ matrix.os }}
timeout-minutes: 25
needs:
- build
- do_include_e2e
permissions:
# these permissions are required for the configure-aws-credentials action to get a JWT from GitHub
id-token: write
contents: read
steps:
- name: Checkout aws-amplify/amplify-cli repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Setup Node.js
uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # version 3.8.1
with:
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 flow tests with ${{ matrix.pkg-manager }}
shell: bash
run: |
PACKAGE_MANAGER=${{matrix.pkg-manager}} npm run test:dir packages/integration-tests/src/package_manager_sanity_checks.test.ts
lint:
runs-on: ubuntu-latest
needs:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ verdaccio-logs.txt
cdk.out/
e2e-tests
concurrent_workspace_script_cache.json

testDir
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ expected-cdk-out
concurrent_workspace_script_cache.json
scripts/components/api-changes-validator/test-resources/working-directory
test-projects
testDir
148 changes: 121 additions & 27 deletions package-lock.json

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

4 changes: 3 additions & 1 deletion packages/backend-deployer/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
```ts

import { BackendIdentifier } from '@aws-amplify/plugin-types';
import { PackageManagerController } from '@aws-amplify/plugin-types';

// @public
export type BackendDeployer = {
Expand All @@ -14,7 +15,8 @@ export type BackendDeployer = {

// @public
export class BackendDeployerFactory {
static getInstance: () => BackendDeployer;
constructor(packageManagerController: PackageManagerController);
getInstance(): BackendDeployer;
}

// @public (undocumented)
Expand Down
Loading