fix: e2e tests

.changeset/curly-toes-doubt.md

@@ -0,0 +1,11 @@
+---
+'@aws-amplify/integration-tests': patch
+'@aws-amplify/backend-deployer': patch
+'create-amplify': patch
+'@aws-amplify/platform-core': patch
+'@aws-amplify/backend-data': patch
+'@aws-amplify/sandbox': patch
+'@aws-amplify/backend-cli': patch
+---
+
+Refactor error handling, introduce two new AmplifyErrors

.changeset/eight-bags-walk.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/few-carpets-search.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-function': minor
+---
+
+Initial implementation of new 'defineFunction' entry point

.changeset/few-pillows-pay.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend': patch
+---
+
+add link to docs in secrets jsdoc

.changeset/mighty-bottles-leave.md

@@ -0,0 +1,7 @@
+---
+'@aws-amplify/backend-deployer': minor
+'@aws-amplify/sandbox': patch
+'@aws-amplify/backend-cli': patch
+---
+
+require backend identifier in deployer, remove redundant deploymentType parameter

.changeset/mighty-rockets-shake.md

@@ -0,0 +1,7 @@
+---
+'create-amplify': patch
+'@aws-amplify/plugin-types': minor
+'@aws-amplify/backend': minor
+---
+
+Expose new `defineFunction` interface

.changeset/plenty-maps-doubt.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-data': patch
+---
+
+Add messaging and test about not updating provision strategy

.changeset/proud-vans-protect.md

@@ -0,0 +1,2 @@
+---
+---

.changeset/rotten-swans-study.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/deployed-backend-client': patch
+---
+
+filter non-sandbox stacks

.changeset/young-cherries-know.md

@@ -0,0 +1,2 @@
+---
+---

.eslint_dictionary.json

@@ -7,6 +7,7 @@
   "argv",
   "arn",
   "arns",
+  "birthdate",
   "bundler",
   "cdk",
   "changelog",
@@ -25,6 +26,7 @@
   "deployer",
   "disambiguator",
   "downlevel",
+  "durations",
   "dynamodb",
   "ecma",
   "enum",
@@ -43,7 +45,9 @@
   "globals",
   "grantable",
   "graphql",
+  "homedir",
   "hotswap",
+  "hotswapped",
   "iamv2",
   "identitypool",
   "idps",
@@ -58,6 +62,7 @@
   "localhost",
   "lsof",
   "lstat",
+  "macos",
   "matchers",
   "mfas",
   "mkdtemp",
@@ -90,6 +95,8 @@
   "schema",
   "schemas",
   "searchable",
+  "semver",
+  "serializable",
   "shopify",
   "shortstat",
   "sigint",
@@ -105,6 +112,7 @@
   "syncable",
   "timestamps",
   "tmpdir",
+  "todos",
   "toggleable",
   "tokenized",
   "totp",
@@ -124,6 +132,7 @@
   "versioned",
   "versioning",
   "whoami",
+  "workspace",
   "yaml",
   "yargs"
 ]

.eslintrc.cjs

@@ -25,6 +25,7 @@ module.exports = {
     ecmaVersion: 'latest',
     sourceType: 'module',
     project: ['**/tsconfig.json'],
+    tsconfigRootDir: __dirname,
   },
   plugins: [
     '@typescript-eslint',

.github/CODEOWNERS

@@ -1,10 +1,7 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence.
-*  @edwardfoyle @sobolk @Amplifiyer
-
-# Examples
-/examples @edwardfoyle @sobolk @Amplifiyer @swaminator @renebrandel @wrpeck @abdallahshaban557 @josefaidt
+*  @edwardfoyle @sobolk @Amplifiyer @srquinn21
 
 # API approval - public surface and dependencies.
-**/API.md @edwardfoyle @sobolk @Amplifiyer
-**/package.json @edwardfoyle @sobolk @Amplifiyer
+**/API.md @edwardfoyle @sobolk @Amplifiyer @srquinn21
+**/package.json @edwardfoyle @sobolk @Amplifiyer @srquinn21

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -13,7 +13,7 @@ body:
       description: |
         Please copy and paste output of the following command. This will be automatically formatted into code, so no need for backticks.
         ```bash
-        npx envinfo --system --binaries --npmPackages "@aws-amplify/backend,typescript,aws-cdk,aws-cdk-lib,aws-amplify" --showNotFound
+        npx envinfo --system --binaries --npmPackages "@aws-amplify/backend,@aws-amplify/backend-cli,typescript,aws-cdk,aws-cdk-lib,aws-amplify" --showNotFound
         ```
       render: plain text
     validations:

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -13,7 +13,7 @@ body:
       description: |
         Please copy and paste output of the following command. This will be automatically formatted into code, so no need for backticks.
         ```bash
-        npx envinfo --system --binaries --npmPackages "@aws-amplify/backend,typescript,aws-cdk,aws-cdk-lib,aws-amplify" --showNotFound
+        npx envinfo --system --binaries --npmPackages "@aws-amplify/backend,@aws-amplify/backend-cli,typescript,aws-cdk,aws-cdk-lib,aws-amplify" --showNotFound
         ```
       render: plain text
     validations:

.github/workflows/canary_checks.yml

@@ -30,6 +30,7 @@ jobs:
           npm run test
   live_dependency_health_checks:
     runs-on: ubuntu-latest
+    timeout-minutes: 15
     permissions:
       # these permissions are required for the configure-aws-credentials action to get a JWT from GitHub
       id-token: write

.github/workflows/health_checks.yml

@@ -7,14 +7,16 @@ on:
   pull_request:
     branches:
       - main
-  schedule:
-    - cron: '0 12 * * *' # every day 12:00 UTC
+  workflow_dispatch:
 
 jobs:
   install:
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        # Windows install must happen on the same worker size as subsequent jobs.
+        # Larger workers use different drive (C: instead of D:) to check out project and NPM installation
+        # creates file system links that include drive letter.
+        os: [ubuntu-latest, macos-latest, amplify-backend_windows-latest_8-core]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
@@ -33,7 +35,7 @@ jobs:
       - build
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [ubuntu-latest, macos-latest, amplify-backend_windows-latest_8-core]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
@@ -53,13 +55,14 @@ jobs:
       run_e2e: ${{ steps.check.outputs.run_e2e }}
     steps:
       # if this workflow is running on a push (ie merge to main), then e2e tests always run
+      # if this workflow is triggered manually, then e2e tests always run
       # if the workflow is running on a pull request, we perform an additional check for the run-e2e label
       # this is not a security measure (that is already handled by the pull_request event behavior) but rather a way for PR authors to easily check e2e test results if they wish
       # the reason it doesn't run all the time is because it will always fail for external contributor PRs (they don't have access to repo secrets) and we don't want to waste resources running e2e on every PR commit
-      - name: Check event is push or pull request has run-e2e label
+      - name: Check event is push to main or pull request has run-e2e label
         id: check
         run: |
-          if [[ ${{ github.event_name }} == 'push' ]] || gh api /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }} | jq -r '.labels[].name' | grep run-e2e --quiet; then
+          if [[ ${{ github.event_name }} == 'push' ]] || [[ ${{ github.event_name }} == 'workflow_dispatch' ]] || gh api /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }} | jq -r '.labels[].name' | grep run-e2e --quiet; then
             echo setting run_e2e to true;
             echo "run_e2e=true" >> "$GITHUB_OUTPUT";
           else
@@ -72,9 +75,14 @@ jobs:
       # will finish running other test matrices even if one fails
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os:
+          [
+            amplify-backend_ubuntu-latest_4-core,
+            macos-latest-xl,
+            amplify-backend_windows-latest_8-core,
+          ]
     runs-on: ${{ matrix.os }}
-    timeout-minutes: 60
+    timeout-minutes: 25
     needs:
       - do_include_e2e
       - build
@@ -139,7 +147,7 @@ jobs:
       - uses: ./.github/actions/setup_node
       - uses: ./.github/actions/restore_build_cache
       - run: npm run docs
-      - if: github.event_name == 'push'
+      - if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
         uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # version 3.9.3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -180,7 +188,7 @@ jobs:
       - uses: ./.github/actions/restore_install_cache
       - run: npm run check:package-versions
   update_or_publish_versions:
-    if: github.event_name == 'push'
+    if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
     needs:
       - build
     runs-on: ubuntu-latest

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

@@ -5,7 +5,10 @@ name: 'poc-e2e-flow-test'
 on: # TODO: need to change the trigger
   push:
     branches:
-      - poc/e2e-create-amplify
+      - poc/package-manager-support
+  pull_request:
+    branches:
+      - poc/package-manager-support
 
 jobs:
   install:
@@ -37,18 +40,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        pkg-manager: [npm, yarn, pnpm]
+        pkg-manager: [npm, yarn, yarn-stable, pnpm]
         node-version: [20]
         include:
           - os: ubuntu-latest
             pkg-manager: yarn-stable
-            node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
+            node-version: 18.18 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
           - os: macos-latest
             pkg-manager: yarn-stable
-            node-version: 19 # TODO: use Node 20 once https://github.com/yarnpkg/berry/pull/5961 is released
+            node-version: 18.18 # 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
+            node-version: 18.18 # 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().
     runs-on: ${{ matrix.os }}

.husky/pre-push

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx changeset status --since main

CONTRIBUTING.md

@@ -42,17 +42,79 @@ GitHub provides additional document on [forking a repository](https://help.githu
 
 Looking at the existing issues is a great way to find something to contribute on. As our projects, by default, use the default GitHub issue labels (enhancement/bug/duplicate/help wanted/invalid/question/wontfix), looking at any 'help wanted' issues is a great place to start.
 
-## Code of Conduct
+## Contribute to create-amplify package
+
+### Set up your local development environment
+
+```sh
+# clone project repo
+cd <project directory>
+npm run install:local
+npm run test
+```
 
-This project has adopted the [Amazon Open Source Code of Conduct](https://aws.github.io/code-of-conduct).
-For more information see the [Code of Conduct FAQ](https://aws.github.io/code-of-conduct-faq) or contact
-[email protected] with any additional questions or comments.
+`npm run install:local` will run `npm install`, then build all packages in the project and run `npm link`
 
-## Security issue notifications
+`npm run test` will run all the unit tests in the project
 
-If you discover a potential security issue in this project we ask that you notify AWS/Amazon Security via our [vulnerability reporting page](http://aws.amazon.com/security/vulnerability-reporting/). Please do **not** create a public github issue.
+You should now be able to run the new `amplify` CLI.
 
-## Contribute to create-amplify package
+#### Other helpful scripts
+
+`npm run watch` will start the tsc server and watch for changes in all packages
+
+`npm run test:coverage:threshold` will let you know if your changes are passing test coverage limits
+
+`npm run test:dir packages/<package directory>` will run only the tests in that directory
+
+`npm run vend` will start a local npm proxy and publish the local packages to this proxy so they can be installed / used as if they were published on npm
+
+`npm run e2e` will run the E2E test suite. Note: you must have valid AWS credentials configured locally to run this command successfully.
+
+### Creating changesets
+
+This repo uses [changesets](https://github.com/changesets/changesets) for versioning and releasing changes.
+
+All changes that affect release artifacts must have a corresponding changeset. To create a changeset run `changeset`.
+This will start a walkthrough to author the changeset file. This file should be committed to the repo.
+
+### Publishing packages locally
+
+Publishing packages locally allows you to install local package changes as if they were published to NPM. This is useful for testing or demo scenarios.
+
+To set up a local npm proxy and publish the current local state to the proxy, run `npm run vend`.
+This will start a local npm proxy using [Verdaccio](https://verdaccio.org/) and run `changeset version` and `changeset publish`.
+
+This will also point your local npm config to the local npm proxy. At this point you can npm install any packages in the repo and it will pull from the local proxy instead of directly from npm.
+
+To stop the local server and reset your npm registry run `npm run stop:npm-proxy`.
+
+To clear the proxy package cache run `npm run clean:npm-proxy`. This will stop the local proxy and remove all packages you have published.
+
+To start the npm proxy without immediately publishing, run `npm run start:npm-proxy`.
+
+To publish a snapshot to an already running npm proxy run `npm run publish:snapshot:local latest`
+
+### Adding a package
+
+This repo uses a monorepo structure managed by npm workspaces. All the packages in the workspace are under `packages/*`
+
+There are package templates for some common scenarios in the `templates` directory.
+These templates can be copied to a new package directory using `npm run new -- --template=<template> --name=<new name>`
+`--template` specifies which template to use and `--name` specifies the new package name.
+Valid templates are the directories in the `templates` directory
+
+If you are adding a new package that does not have a template, consider adding a template for that package type.
+You'll probably want to use an existing template as a starting point for the new package.
+
+At a minimum, each package needs:
+
+1. A `package.json` file
+2. A `tsconfig.json` file. This file should extend `tsconfig.base.json`
+3. An `api-extractor.json` file. This file should extend `api-extractor.base.json`
+4. An `update:api` script in the `package.json` file
+5. A `typedoc.json` file
+6. An `.npmignore` file
 
 ### Dev