Skip to content

Commit 31d458e

Browse files
author
Vieltojarvi
committed
Merge branch 'main' into seed-feat
2 parents 3cf5bec + 7962bc5 commit 31d458e

File tree

60 files changed

+3344
-217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+3344
-217
lines changed

.changeset/eighty-items-repeat.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/sandbox': patch
3+
---
4+
5+
stagger FilterLogEvents API calls to prevent throttling exceptions

.changeset/five-dancers-search.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'create-amplify': patch
3+
---
4+
5+
update create-amplify template's data resource to use "identityPool" as the default authorization mode

.changeset/floppy-pianos-fold.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@aws-amplify/cli-core': patch
3+
'@aws-amplify/sandbox': patch
4+
---
5+
6+
reroute stderr through printer and ensure printing is done around spinners

.changeset/fuzzy-flowers-agree.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/backend-cli': patch
3+
---
4+
5+
Add notices

.changeset/rich-walls-peel.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
'@aws-amplify/backend-cli': patch
3+
'@aws-amplify/platform-core': minor
34
---
45

56
fix: exclude logs streaming options from sandbox command help output

.changeset/ten-ravens-rest.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@aws-amplify/cli-core': patch
3+
---
4+
5+
Move the spinner between timestamp and spinner text

.changeset/vast-dragons-yawn.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'@aws-amplify/cli-core': patch
3+
'@aws-amplify/sandbox': patch
4+
---
5+
6+
Updates to pretty sandbox display

.eslint_dictionary.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
[
22
"acceptor",
33
"acceptors",
4+
"acknowledgement",
5+
"acknowledgements",
46
"aggregator",
57
"amazonaws",
68
"amazoncognito",
@@ -63,6 +65,7 @@
6365
"esbuild",
6466
"esnext",
6567
"execa",
68+
"evaluator",
6669
"facebook",
6770
"filepath",
6871
"filesystem",

.github/workflows/health_checks.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -532,6 +532,37 @@ jobs:
532532
cdk-cli-version: ${{ needs.resolve_inputs.outputs.cdk_cli_version }}
533533
link_cli: true
534534
run: npm run test:dir ${{ matrix.testPaths }}
535+
e2e_notices:
536+
if: needs.do_include_e2e.outputs.run_e2e == 'true'
537+
strategy:
538+
# will finish running other test matrices even if one fails
539+
fail-fast: false
540+
matrix:
541+
os: ${{ fromJSON(needs.resolve_inputs.outputs.os) }}
542+
runs-on: ${{ matrix.os }}
543+
name: e2e_notices ${{ matrix.os }}
544+
timeout-minutes: 5
545+
needs:
546+
- do_include_e2e
547+
- build
548+
- resolve_inputs
549+
permissions:
550+
# these permissions are required for the configure-aws-credentials action to get a JWT from GitHub
551+
id-token: write
552+
contents: read
553+
steps:
554+
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # version 4.1.4
555+
- uses: ./.github/actions/setup_node
556+
with:
557+
node-version: 18
558+
- uses: ./.github/actions/restore_build_cache
559+
with:
560+
node-version: 18
561+
cdk-lib-version: ${{ needs.resolve_inputs.outputs.cdk_lib_version }}
562+
cdk-cli-version: ${{ needs.resolve_inputs.outputs.cdk_cli_version }}
563+
- run: cd packages/cli && npm link
564+
- name: Run e2e notices tests
565+
run: npm run test:dir packages/integration-tests/lib/test-e2e/notices.test.js
535566
e2e_backend_output:
536567
if: needs.do_include_e2e.outputs.run_e2e == 'true'
537568
runs-on: ubuntu-latest
@@ -841,6 +872,7 @@ jobs:
841872
- e2e_package_manager
842873
- e2e_deployment
843874
- e2e_sandbox
875+
- e2e_notices
844876
- e2e_create_amplify
845877
- resolve_inputs
846878
runs-on: ubuntu-latest

package-lock.json

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)