Merge branch 'main' into poc/package-manager-support and use main

.changeset/brown-shrimps-give.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-storage': patch
+---
+
+Move storage construct to be internal to backend-storage and modify api types to not expose implementation details

.changeset/clean-trees-collect.md

@@ -0,0 +1,8 @@
+---
+'@aws-amplify/backend-storage': minor
+'@aws-amplify/backend-data': minor
+'@aws-amplify/plugin-types': minor
+'@aws-amplify/backend': minor
+---
+
+Reinstate accessing all properties on backend construct objects

.changeset/hot-pears-sell.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-function': minor
+---
+
+Add runtime to defineFunction

.changeset/itchy-suits-look.md

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

.changeset/little-weeks-reply.md

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

.changeset/nice-socks-complain.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/auth-construct-alpha': patch
+---
+
+Fixes bug with ARN construction when configuring SAML/OIDC

.changeset/stale-ghosts-provide.md

@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-function': minor
+---
+
+Add timeout, memory and environment variables to defineFunction

.changeset/sweet-terms-rush.md

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

.changeset/tender-bags-visit.md

@@ -0,0 +1,5 @@
+---
+'create-amplify': patch
+---
+
+generate new projects with tsconfig moduleResolution = bundler and remove '.js' extension from relative imports

.changeset/tender-ligers-cross.md

@@ -0,0 +1,7 @@
+---
+'@aws-amplify/backend-data': minor
+'@aws-amplify/plugin-types': minor
+'@aws-amplify/backend': minor
+---
+
+Rework Backend platform type to allow accessing CDK constructs using backend.<name>.<constructName> rather than backend.resources.<name>.resources.<constructName>

.eslint_dictionary.json

@@ -57,6 +57,7 @@
   "invoker",
   "javascript",
   "jsdoc",
+  "keyof",
   "lang",
   "linux",
   "localhost",
@@ -116,10 +117,12 @@
   "toggleable",
   "tokenized",
   "totp",
+  "tsbuildinfo",
   "tsconfig",
   "tsdoc",
   "tslint",
   "typename",
+  "typeof",
   "unauth",
   "unix",
   "unlink",

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,46 @@
+<!--
+Thank you for your Pull Request! Please describe the problem this PR fixes and a summary of the changes made.
+Link to any relevant issues, code snippets, or other PRs.
+
+For trivial changes, this template can be ignored in favor of a short description of the changes.
+-->
+
+## Problem
+
+<!--
+Describe the issue this PR is solving
+-->
+
+**Issue number, if available:**
+
+## Changes
+
+<!--
+Summarize the changes introduced in this PR. This is a good place to call out critical or potentially problematic parts of the change.
+-->
+
+**Corresponding docs PR, if applicable:**
+
+## Validation
+
+<!--
+Describe how changes in this PR have been validated. This may include added or updated unit, integration and/or E2E tests, test workflow runs, or manual verification. If manual verification is the only way changes in this PR have been validated, you will need to write some automated tests before this PR is ready to merge.
+
+For changes to test infra, or non-functional changes, tests are not always required. Instead, you should call out _why_ you think tests are not required here.
+
+If changes affect a GitHub workflow that is not included in the PR checks, include a link to a passing test run of the modified workflow.
+--->
+
+## Checklist
+
+<!--
+These items must be completed before a PR is ready to be merged.
+Feel free to publish a draft PR before these items are complete.
+-->
+
+- [ ] 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](../PROJECT_ARCHITECTURE.md), 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._

.github/workflows/canary_checks.yml

@@ -39,7 +39,13 @@ jobs:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
       - uses: ./.github/actions/setup_node
       - uses: ./.github/actions/build_with_cache
-      - name: Configure AWS Credentials
+      - 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 }}

.github/workflows/health_checks.yml

@@ -43,6 +43,41 @@ jobs:
       - uses: ./.github/actions/restore_build_cache
       - run: npm run set-script-shell
       - run: npm run test:coverage:threshold
+  test_scripts:
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
+      - uses: ./.github/actions/setup_node
+      - uses: ./.github/actions/restore_build_cache
+      - run: |
+          npm run set-script-shell
+          npm run test:scripts
+  check_api_changes:
+    if: github.event_name == 'pull_request'
+    needs:
+      - build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout pull request ref
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
+      - uses: ./.github/actions/setup_node
+      - uses: ./.github/actions/restore_build_cache
+      - name: Publish packages locally
+        run: |
+          npm run start:npm-proxy
+          # keep git diff with version increment to make sure test projects resolve right version
+          npm run publish:local -- --keepGitDiff
+      - name: Checkout base branch
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
+        with:
+          path: base-branch-content
+          ref: ${{ github.event.pull_request.base.sha }}
+      - name: Check API changes
+        run: |
+          mkdir api-validation-projects
+          npx tsx scripts/check_api_changes.ts base-branch-content api-validation-projects
   do_include_e2e:
     runs-on: ubuntu-latest
     permissions:
@@ -104,9 +139,7 @@ jobs:
       - name: Configure test execution credentials
         uses: aws-actions/configure-aws-credentials@04b98b3f9e85f563fb061be8751a0352327246b0 # version 3.0.1
         with:
-          # TODO follow up PR to switch this back after merge
-          # (can't do it before merge without impacting other e2e runs)
-          role-to-assume: ${{ secrets.E2E_RUNNER_ROLE_ARN_NEW }}
+          role-to-assume: ${{ secrets.E2E_RUNNER_ROLE_ARN }}
           aws-region: us-west-2
       - name: Run E2E tests
         run: npm run e2e

.github/workflows/issue-pending-response.yml

@@ -0,0 +1,15 @@
+name: issue-pending-response
+on:
+  issue_comment:
+    types: [created]
+permissions:
+  issues: write
+jobs:
+  issue_commented:
+    if: ${{ !github.event.issue.pull_request  && contains(github.event.issue.labels.*.name, 'pending-response') }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: siegerts/pending-author-response@409a63bf27370ba9a0e98e8d5fbda7a12398d456 # version 1.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          pending-response-label: pending-response

.gitignore

@@ -10,7 +10,9 @@ tsconfig.tsbuildinfo
 .nvmrc
 .npmrc
 .DS_Store
+.vscode
 verdaccio-cache
 verdaccio-logs.txt
 cdk.out/
 e2e-tests
+concurrent_workspace_script_cache.json

.husky/pre-push

@@ -2,3 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"
 
 npx changeset status --since main
+npm run check:api

.prettierignore

@@ -9,5 +9,5 @@ API.md
 verdaccio-cache
 expected-cdk-out
 .changeset/pre.json
-examples/simple_react/cdk.out
-examples/simple_react/src/amplifyconfiguration.js
+concurrent_workspace_script_cache.json
+scripts/components/api-changes-validator/test-resources/working-directory

CONTRIBUTING.md

@@ -38,6 +38,11 @@ To send us a pull request, please:
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
 [creating a pull request](https://help.github.com/articles/creating-a-pull-request/).
 
+## Project architecture
+
+Understanding the structure of the current codebase is a great first step to knowing where to implement a change. Check out the [Project Architecture README](./PROJECT_ARCHITECTURE.md) for information on how the repo is structured.
+Also check out the README files in the root of each package directory for a brief description of the intent of that package.
+
 ## Finding contributions to work on
 
 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.