Skip to content

Commit

Permalink
Merge branch 'main' into fix/create_amplify_absolute_path
Browse files Browse the repository at this point in the history
  • Loading branch information
magisystem0408 committed Mar 14, 2024
2 parents cccc41e + fb9bf5f commit 7cc3407
Show file tree
Hide file tree
Showing 228 changed files with 6,380 additions and 2,283 deletions.
5 changes: 5 additions & 0 deletions .changeset/afraid-flies-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend': minor
---

Re-export some plugin-types from submodule export @aws-amplify/backend/types/platform
5 changes: 5 additions & 0 deletions .changeset/brave-shirts-push.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-function': patch
---

Set default function memory to 512
5 changes: 5 additions & 0 deletions .changeset/breezy-eyes-appear.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-data': minor
---

plumb function access definition from schema into IAM policies attached to the functions
5 changes: 5 additions & 0 deletions .changeset/chatty-icons-mix.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-storage': patch
---

fix cogntio identity placeholder value in IAM policy
6 changes: 6 additions & 0 deletions .changeset/clean-pets-join.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/model-generator': minor
'@aws-amplify/backend-cli': patch
---

Rename target format type and prop in model gen package
2 changes: 2 additions & 0 deletions .changeset/empty-emus-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/famous-eels-kiss.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/famous-glasses-know.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-data': minor
---

remove allowListedRoleNames from defineData
6 changes: 6 additions & 0 deletions .changeset/fluffy-books-dance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/backend-data': patch
'@aws-amplify/backend': patch
---

backend-data: add js resolver support
6 changes: 6 additions & 0 deletions .changeset/four-peaches-pull.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/integration-tests': patch
'@aws-amplify/backend-data': patch
---

backend-data: add support for first-class defineFunction
5 changes: 5 additions & 0 deletions .changeset/good-wasps-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-auth': minor
---

attach policy & ssm params to acces userpool from auth resource
5 changes: 5 additions & 0 deletions .changeset/great-timers-invent.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-storage': minor
---

Implement deny-by-default behavior on access rules
5 changes: 5 additions & 0 deletions .changeset/late-worms-rule.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend': patch
---

add aspect on root stack to valid role trust policies
5 changes: 5 additions & 0 deletions .changeset/little-baboons-tan.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-function': patch
---

store attribution string in funciton stack
5 changes: 5 additions & 0 deletions .changeset/lucky-tigers-carry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-data': minor
---

feat: enable destructive schema updates in amplify sandbox
5 changes: 5 additions & 0 deletions .changeset/modern-files-arrive.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/client-config': minor
---

fix(client-config): add legacy analytics configuration key
5 changes: 5 additions & 0 deletions .changeset/modern-moons-fail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-cli': patch
---

Update text to match sandbox default behavior
6 changes: 6 additions & 0 deletions .changeset/modern-terms-stare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/integration-tests': patch
'@aws-amplify/backend-function': patch
---

Ensure resource access env vars are added to function typed shim files
5 changes: 5 additions & 0 deletions .changeset/new-kings-beg.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/cli-core': patch
---

add error message for PNPM on windows
7 changes: 7 additions & 0 deletions .changeset/new-meals-destroy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'@aws-amplify/cli-core': minor
'@aws-amplify/sandbox': patch
'@aws-amplify/backend-cli': patch
---

use `format` to replace `color` and remove `color`.
5 changes: 5 additions & 0 deletions .changeset/odd-shirts-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/auth-construct-alpha': patch
---

Fix deployment bug with SAML providers.
6 changes: 6 additions & 0 deletions .changeset/popular-bobcats-provide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/integration-tests': minor
'@aws-amplify/backend-function': minor
---

Add dynamic environment variables to function type definition files
47 changes: 46 additions & 1 deletion .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,24 +27,69 @@
"@aws-amplify/sandbox": "0.5.1"
},
"changesets": [
"afraid-flies-repair",
"brave-carrots-glow",
"brave-pets-clean",
"brave-shirts-push",
"breezy-eyes-appear",
"brown-otters-smoke",
"chatty-icons-mix",
"clean-pets-join",
"cyan-steaks-repeat",
"eighty-rings-pull",
"empty-emus-thank",
"famous-eels-kiss",
"famous-glasses-know",
"five-fireants-shout",
"fluffy-books-dance",
"four-donuts-jump",
"four-peaches-pull",
"friendly-kids-lick",
"giant-feet-sing",
"good-wasps-sin",
"great-timers-invent",
"khaki-panthers-grin",
"khaki-pants-sniff",
"late-worms-rule",
"lemon-peas-sin",
"light-cougars-give",
"little-baboons-tan",
"little-books-press",
"loud-sheep-occur",
"lucky-tigers-carry",
"lucky-trainers-matter",
"mean-frogs-visit",
"mighty-experts-compare",
"modern-files-arrive",
"modern-moons-fail",
"modern-terms-stare",
"new-kings-beg",
"new-meals-destroy",
"odd-shirts-collect",
"polite-kiwis-brake",
"popular-bobcats-provide",
"pretty-cups-jog",
"pretty-lobsters-prove",
"proud-bags-dream",
"proud-feet-hide",
"quiet-pets-scream",
"quiet-shirts-hug",
"rich-onions-learn",
"rude-toys-visit",
"serious-maps-wait",
"short-bulldogs-punch",
"short-olives-bow",
"shy-horses-act",
"silver-needles-rush",
"small-hotels-do",
"smart-crews-serve",
"smooth-penguins-joke",
"smooth-tigers-double",
"sour-rice-listen",
"spicy-bulldogs-itch",
"thin-steaks-shave",
"three-doors-act",
"tidy-readers-prove"
"tidy-readers-prove",
"two-shirts-type"
]
}
5 changes: 5 additions & 0 deletions .changeset/proud-bags-dream.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/sandbox': patch
---

upgrade @parcel/watcher wo use the latest version
2 changes: 2 additions & 0 deletions .changeset/proud-feet-hide.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
7 changes: 7 additions & 0 deletions .changeset/rich-onions-learn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
'create-amplify': patch
'@aws-amplify/cli-core': patch
'@aws-amplify/backend-cli': patch
---

use printer from cli-core
5 changes: 5 additions & 0 deletions .changeset/rude-toys-visit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/cli-core': patch
---

update PackageManagerControllerFactory to take Operation System platform information optionally
11 changes: 11 additions & 0 deletions .changeset/serious-maps-wait.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@aws-amplify/backend-deployer': patch
'@aws-amplify/platform-core': minor
'@aws-amplify/backend-auth': patch
'@aws-amplify/backend-data': patch
'@aws-amplify/cli-core': patch
'@aws-amplify/sandbox': patch
'@aws-amplify/backend-cli': patch
---

require "resolution" in AmplifyUserError options
5 changes: 5 additions & 0 deletions .changeset/short-olives-bow.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/backend-storage': minor
---

Add "list" to available storage resource actions
2 changes: 2 additions & 0 deletions .changeset/shy-horses-act.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
2 changes: 2 additions & 0 deletions .changeset/small-hotels-do.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
6 changes: 6 additions & 0 deletions .changeset/smart-crews-serve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/integration-tests': patch
'@aws-amplify/backend-function': patch
---

Ensure typed shim files contain only the function name
6 changes: 6 additions & 0 deletions .changeset/spicy-bulldogs-itch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@aws-amplify/backend-storage': minor
'@aws-amplify/backend-auth': minor
---

Enable auth group access to storage and change syntax for specifying owner-based access
2 changes: 2 additions & 0 deletions .changeset/thin-steaks-shave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
5 changes: 5 additions & 0 deletions .changeset/two-shirts-type.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@aws-amplify/deployed-backend-client': minor
---

Add listBackends method to return a list of stacks for sandbox and branch deployments
2 changes: 2 additions & 0 deletions .eslint_dictionary.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"argv",
"arn",
"arns",
"backends",
"birthdate",
"bundler",
"cdk",
Expand Down Expand Up @@ -126,6 +127,7 @@
"subcommand",
"subcommands",
"submodule",
"subpath",
"syncable",
"timestamps",
"tmpdir",
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install_with_cache/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ runs:
path: |
node_modules
packages/**/node_modules
key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}
key: ${{ runner.os }}-${{ hashFiles('package-lock.json') }}-v2
# only install if cache miss
- if: steps.npm-cache.outputs.cache-hit != 'true'
shell: bash
Expand Down
21 changes: 8 additions & 13 deletions .github/workflows/health_checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ jobs:
# 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]
# Changing between standard and custom workers requires full install cache invalidation
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
Expand All @@ -35,7 +36,7 @@ jobs:
- build
strategy:
matrix:
os: [ubuntu-latest, macos-latest, amplify-backend_windows-latest_8-core]
os: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
Expand Down Expand Up @@ -131,12 +132,7 @@ jobs:
# will finish running other test matrices even if one fails
fail-fast: false
matrix:
os:
[
amplify-backend_ubuntu-latest_4-core,
macos-latest-xl,
amplify-backend_windows-latest_8-core,
]
os: [ubuntu-latest, macos-latest-xl, windows-latest]
runs-on: ${{ matrix.os }}
timeout-minutes: 25
needs:
Expand Down Expand Up @@ -170,12 +166,9 @@ jobs:
# 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]
os: [ubuntu-latest, macos-latest, windows-latest]
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 }}
Expand Down Expand Up @@ -305,7 +298,9 @@ jobs:
update_or_publish_versions:
if: ${{ github.event_name == 'push' && github.ref_name == 'main' }}
needs:
- build
- run_package_manager_e2e_tests
- test_with_coverage
- run_e2e_tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # version 3.6.0
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ e2e-tests
concurrent_workspace_script_cache.json

testDir
.amplify
/.amplify
2 changes: 1 addition & 1 deletion PROJECT_ARCHITECTURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ The following diagram has a basic dependency graph of the package structure. Thi

![Simple dependency graph](markdown-assets/simple-dependency-graph.png)

At the root, the customer project declares a dependency on `@aws-amplify/cli` and `@aws-amplify/backend`. The cli package depends on several packages for handling various subcommands.
At the root, the customer project declares a dependency on `@aws-amplify/backend-cli` and `@aws-amplify/backend`. The backend-cli package depends on several packages for handling various subcommands.

The backend package depends on several feature vertical packages (auth, data, storage, functions). The feature vertical packages implement interfaces defined in plugin-types which the backend package also depends on.

Expand Down
Binary file modified markdown-assets/simple-dependency-graph.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7cc3407

Please sign in to comment.