Skip to content

merge cb into dev branch #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
aws-eddy wants to merge 243 commits into
base: cb-evcodes-dev
Choose a base branch
from
Open

merge cb into dev branch #19

aws-eddy wants to merge 243 commits into from

Conversation

@aws-eddy
Copy link
Owner

@aws-eddy aws-eddy commented Apr 24, 2023

Description of changes

Issue #, if available

Description of how you validated changes

Checklist

  • PR description included
  • yarn test passes
  • Tests are changed or added
  • Relevant documentation is changed or added (and PR referenced)
  • New AWS SDK calls or CloudFormation actions have been added to relevant test and service IAM policies
  • Pull request labels are added

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

aws-amplify-bot and others added 30 commits April 4, 2023 01:37
chore(release): Publish rc [ci skip]
9440d8b 
 - @aws-amplify/amplify-app@5.0.2-rc.4a4caf393.0
 - @aws-amplify/amplify-appsync-simulator@2.10.4-rc.4a4caf393.0
 - @aws-amplify/amplify-category-analytics@5.0.4-rc.4a4caf393.0
 - @aws-amplify/amplify-category-auth@3.0.2-rc.4a4caf393.0
 - @aws-amplify/amplify-category-custom@3.0.2-rc.4a4caf393.0
 - @aws-amplify/amplify-category-function@5.1.2-rc.4a4caf393.0
 - @aws-amplify/amplify-category-geo@3.0.2-rc.4a4caf393.0
 - @aws-amplify/amplify-category-hosting@3.5.4-rc.4a4caf393.0
 - @aws-amplify/amplify-category-interactions@5.0.4-rc.4a4caf393.0
 - @aws-amplify/amplify-category-notifications@2.24.4-rc.4a4caf393.0
 - @aws-amplify/amplify-category-predictions@5.0.4-rc.4a4caf393.0
 - @aws-amplify/amplify-category-storage@5.0.2-rc.4a4caf393.0
 - @aws-amplify/amplify-cli-core@4.0.2-rc.4a4caf393.0
 - amplify-cli-core@4.0.2-rc.4a4caf393.0
 - @aws-amplify/cli-extensibility-helper@3.0.2-rc.4a4caf393.0
 - @aws-amplify/cli@11.0.4-rc.4a4caf393.0
 - @aws-amplify/cli-internal@11.0.4-rc.4a4caf393.0
 - @aws-amplify/amplify-console-hosting@2.5.2-rc.4a4caf393.0
 - @aws-amplify/amplify-console-integration-tests@2.6.10-rc.4a4caf393.0
 - @aws-amplify/amplify-container-hosting@2.6.2-rc.4a4caf393.0
 - amplify-dotnet-function-runtime-provider@1.7.5-rc.4a4caf393.0
 - @aws-amplify/amplify-dotnet-function-template-provider@2.5.2-rc.4a4caf393.0
 - amplify-dynamodb-simulator@2.5.11-rc.4a4caf393.0
 - @aws-amplify/amplify-e2e-core@4.8.2-rc.4a4caf393.0
 - amplify-e2e-tests@4.0.2-rc.4a4caf393.0
 - @aws-amplify/amplify-environment-parameters@1.4.2-rc.4a4caf393.0
 - @aws-amplify/amplify-frontend-ios@3.6.4-rc.4a4caf393.0
 - @aws-amplify/amplify-frontend-javascript@3.9.2-rc.4a4caf393.0
 - amplify-go-function-runtime-provider@2.3.15-rc.4a4caf393.0
 - amplify-graphql-migration-tests@2.4.2-rc.4a4caf393.0
 - amplify-java-function-runtime-provider@2.3.15-rc.4a4caf393.0
 - amplify-java-function-template-provider@1.5.18-rc.4a4caf393.0
 - @aws-amplify/amplify-migration-tests@5.4.3-rc.4a4caf393.0
 - amplify-nodejs-function-runtime-provider@2.3.15-rc.4a4caf393.0
 - @aws-amplify/amplify-nodejs-function-template-provider@2.7.4-rc.4a4caf393.0
 - @aws-amplify/amplify-opensearch-simulator@1.2.4-rc.4a4caf393.0
 - @aws-amplify/amplify-prompts@2.6.7-rc.4a4caf393.0
 - @aws-amplify/amplify-provider-awscloudformation@8.0.4-rc.4a4caf393.0
 - amplify-python-function-runtime-provider@2.4.15-rc.4a4caf393.0
 - @aws-amplify/amplify-util-mock@5.0.6-rc.4a4caf393.0
 - @aws-amplify/amplify-util-uibuilder@1.6.13-rc.4a4caf393.0
@marcvberg
fix: build exe context for mock push
03bdec8
@marcvberg
mock fixes for shutdown handling and lack of overrides
ceb5be1
@marcvberg
wip: adding mock E2E tests
9e4682c
@marcvberg
wip: added correct setup/teardown for mock e2e
264336b
@marcvberg
add E2E test for mock
8cc128f
@marcvberg
fix: add util mock to dependencies for e2e tests
cddc267
@marcvberg
Linting fixes and API extraction
05dbd00
@marcvberg
remove E2E dependency on util-mock
f623efd
@marcvberg
Update API extraction
9b4293a
@marcvberg
linting fixes
fe52776
@marcvberg
fix dev dependency ordering
cea69a8
@aws-eddy @hein-j
@Amplifiyer @edwardfoyle @sdstolworthy
chore: complete cli core migration (#12408)
7eaeeaa 
* chore: complete prefixing cli-core migration

* chore: generate api extract and sort package.json

* feat(amplify-util-uibuilder): support StorageField (#12386)

* feat((amplify-util-uibuilder): support StorageField

* chore: update all aws-sdk versions to ^2.1350.0

* fix: revert changes to package.json.ejs

* chore: add **/aws-sdk to package.json under resolutions

* fix: revert white space changes in package.json.ejs

* fix: bump codegen-ui to 2.12.1

* chore: bump lint memory

---------

Co-authored-by: Hein Jeong <heinje@amazon.com>
Co-authored-by: Kamil Sobol <sobkamil@amazon.com>

* chore: reclassify CFN deployment errors if all the errors are from custom resources (#12398)

* chore: reclassify CFN deployment errors if all the errors are from custom resources

* fix: run prettier

* fix: correctly scope amplify-cli-core

* fix: pr review updates

* fix: reclassify BucketNotExists error during init-env (#12399)

* feat: create new NodeJS functions with nodejs18.x runtime (#12394)

* chore: use node 18 in the packaged cli

* chore: force prebuild-install to 7.11

* chore: try update

* Revert "chore: try update"

This reverts commit 6332c61.

* chore: disable deprecation flags

* chore: try node18 image

* chore: more memory

* chore: less parallelization

* chore: try newer windows

* Revert "chore: try newer windows"

This reverts commit 59d5e6d.

* chore: install node 18 on windows

* chore: install node 18 on windows

* chore: try this

* chore: try this

* chore: try this

* chore: try this

* Revert "Revert "chore: try newer windows""

This reverts commit dcac927.

* chore: try this

* chore: try this

* chore: consolidate steps

* chore: parallel in UT

* chore: parallel in UT

* chore: remove dotnet migration test

* chore: fix results script

* chore: fix dotnet

* chore: install create react app

* chore: allow old ssl

* Revert "chore: allow old ssl"

This reverts commit 08d03f9.

* chore: use new react scripts

* chore: poke ci

* chore: fix init test

* chore: use usual ECR repo

* chore: use previous windows image

* Revert "chore: use previous windows image"

This reverts commit f3299f1.

* chore: update pkg

* chore: remove sequential promise

* chore: run this in us west

* Revert "chore: remove sequential promise"

This reverts commit f053413.

* chore: wait for selection

* chore: wait for selection

* chore: wait for selection

* chore: wait for choice first

* feat: generate nodejs18 lambdas

* chore: dont use modules

* chore: undo that

* chore: make crud work

* chore: fix test

* chore: fix that test

* chore: refactor imports

* chore: fix test

* chore: fix test

* chore: fix test

* chore: fix test

* chore: fix test

* chore: add nodejs12.x to migrate from

* chore: fix test

* chore: fix test

* chore: test nodejs crud

* chore: update tests

* chore: pr feedback

* fix: block auth w/ triggers push if not migrated to cli-inputs (#12337)

* fix: catch undefined LogicalName when Lambda Layer versions are deleted from the console (#12351)

* fix: throw a descriptive AmplifyError when an existing lambda layer LogicalName is undefined

* chore: migrate missing files

* chore: fixing failing tests

* chore: sort package.json

* chore: complete prefixing cli-core migration

* chore: regenerate yarn.lock and address codeQL warnings

* chore: lint file

---------

Co-authored-by: Hein Jeong <73264629+hein-j@users.noreply.github.com>
Co-authored-by: Hein Jeong <heinje@amazon.com>
Co-authored-by: Kamil Sobol <sobkamil@amazon.com>
Co-authored-by: Amplifiyer <51211245+Amplifiyer@users.noreply.github.com>
Co-authored-by: Edward Foyle <foyleef@amazon.com>
Co-authored-by: Spencer Stolworthy <sstol@amazon.com>
@dependabot
build(deps): bump vm2 from 3.9.11 to 3.9.15 (#12410)
7e1fab1 
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.11 to 3.9.15.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](patriksimek/vm2@3.9.11...3.9.15)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@sdstolworthy
revert: #12351 (#12412)
329a606
@AaronZyLee
fix(api): API hotfix for ownerfield as pk (#12422)
2a63df0
@dependabot @jhockett
build(deps): bump vm2 from 3.9.11 to 3.9.15 (#12410)
4c4357d 
Bumps [vm2](https://github.com/patriksimek/vm2) from 3.9.11 to 3.9.15.
- [Release notes](https://github.com/patriksimek/vm2/releases)
- [Changelog](https://github.com/patriksimek/vm2/blob/master/CHANGELOG.md)
- [Commits](patriksimek/vm2@3.9.11...3.9.15)

---
updated-dependencies:
- dependency-name: vm2
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@AaronZyLee @jhockett
fix: api hotfix for ownerfield as pk (#12422)
fe4347a
chore(release): Publish latest [ci skip]
9c7442b 
 - @aws-amplify/amplify-app@5.0.2
 - @aws-amplify/amplify-appsync-simulator@2.10.4
 - @aws-amplify/amplify-category-analytics@5.0.4
 - @aws-amplify/amplify-category-auth@3.0.2
 - @aws-amplify/amplify-category-custom@3.0.2
 - @aws-amplify/amplify-category-function@5.1.2
 - @aws-amplify/amplify-category-geo@3.0.2
 - @aws-amplify/amplify-category-hosting@3.5.4
 - @aws-amplify/amplify-category-interactions@5.0.4
 - @aws-amplify/amplify-category-notifications@2.24.4
 - @aws-amplify/amplify-category-predictions@5.0.4
 - @aws-amplify/amplify-category-storage@5.0.2
 - @aws-amplify/amplify-cli-core@4.0.2
 - amplify-cli-core@4.0.2
 - @aws-amplify/cli-extensibility-helper@3.0.2
 - @aws-amplify/cli@11.0.4
 - @aws-amplify/cli-internal@11.0.4
 - @aws-amplify/amplify-console-hosting@2.5.2
 - @aws-amplify/amplify-console-integration-tests@2.6.10
 - @aws-amplify/amplify-container-hosting@2.6.2
 - amplify-dotnet-function-runtime-provider@1.7.5
 - @aws-amplify/amplify-dotnet-function-template-provider@2.5.2
 - amplify-dynamodb-simulator@2.5.11
 - @aws-amplify/amplify-e2e-core@4.8.2
 - amplify-e2e-tests@4.0.2
 - @aws-amplify/amplify-environment-parameters@1.4.2
 - @aws-amplify/amplify-frontend-ios@3.6.4
 - @aws-amplify/amplify-frontend-javascript@3.9.2
 - amplify-go-function-runtime-provider@2.3.15
 - amplify-graphql-migration-tests@2.4.2
 - amplify-java-function-runtime-provider@2.3.15
 - amplify-java-function-template-provider@1.5.18
 - @aws-amplify/amplify-migration-tests@5.4.3
 - amplify-nodejs-function-runtime-provider@2.3.15
 - @aws-amplify/amplify-nodejs-function-template-provider@2.7.4
 - @aws-amplify/amplify-opensearch-simulator@1.2.4
 - @aws-amplify/amplify-prompts@2.6.7
 - @aws-amplify/amplify-provider-awscloudformation@8.0.4
 - amplify-python-function-runtime-provider@2.4.15
 - @aws-amplify/amplify-util-mock@5.0.6
 - @aws-amplify/amplify-util-uibuilder@1.6.13
@jhockett
chore: merge release commit from main to dev
afb8158
@jhockett
Merge pull request #12429 from aws-amplify/dev-main-merge-9c7442b702
ada6c7a 
chore(release): Merge main into dev
@pavellazar @jhockett
fix: support flutter project for idp with social providers (#12381)
cb3b0fc 
* fix: support flutter project for idp with social providers

* chore: replace context.print with printer

* fix: support flutter project for idp with social providers

* test: fix tests to pass the correct AmplifyFrontend enum argument

* chore: add lint rule for exhaustive switch check

* test: add e2e test for flutter pull with idp and google sign in

* chore: address PR feedback

* test: fix to support legacy flow in migrations tests

* Update packages/amplify-e2e-tests/src/__tests__/amplify-app.test.ts

Co-authored-by: John Hockett <jhockett@users.noreply.github.com>

* Update packages/amplify-e2e-tests/src/__tests__/pull-2.test.ts

Co-authored-by: John Hockett <jhockett@users.noreply.github.com>

* test: fix to support legacy flow in migrations tests

* Revert "Update packages/amplify-e2e-tests/src/__tests__/pull-2.test.ts"

This reverts commit c0bb9e2.

* Revert "Update packages/amplify-e2e-tests/src/__tests__/amplify-app.test.ts"

This reverts commit 7fb4339.

* Revert "Update packages/amplify-e2e-tests/src/amplify-app-helpers/amplify-app-validation.ts"

This reverts commit 08dd404.

* chore: address PR feedback

* chore: remove unused references

* chore: address PR feedback

* test: fix to support legacy flow in migrations tests

* test: add utility to import auth when user pool is autoselected

* chore: address PR feedback

* chore: fix build

---------

Co-authored-by: John Hockett <jhockett@users.noreply.github.com>
@marcvberg
Merge pull request #12199 from aws-amplify/mock-exe-info-fix
e02e23c 
Mock exe info fix
@aws-eddy
chore: prepend headless scopes (#12415)
60d2bb2 
* chore: prepend to headless interface

* chore: sort dependencies

* chore: verify api-extract
@jhockett
Revert "Mock exe info fix" (#12437)
ac7a873
chore: don't retry locally (#12438)
505e70d
@aws-eddy
Revert "chore: prepend headless scopes (#12415)" (#12439)
88b2508 
This reverts commit 60d2bb2.
feat: generate S3 and DynamoDB triggers for node18 runtime (#12436)
0d4d44c
@jhockett
chore: bump aws-sdk v2 to latest (#12423)
17283c5
chore: upgrade runtime of update idp roles lambda to node 18 (#12443)
d578c81 
* chore: which tests use it?

* Revert "chore: which tests use it?"

This reverts commit 0883a4b.

* chore: move to node18

* chore: fix that

* chore: fix that
awinberg-aws and others added 30 commits May 31, 2023 23:54
@awinberg-aws
fix: skip automatic form generation when datastore is not enabled
e45fcc1
@pavellazar
chore: yarn modern (3.5.0) migration feature branch (#12579)
9621788 
* chore: migrate to yarn 2 (#12501)
@aws-eddy
chore: provide better mitigation steps for hosting error (#12715)
65d11e9 
* chore: provide better mitigation steps for hosting error

* chore: improve error message for publishing apps

* chore: improve error messaging

* chore: add quotes

* chore: address codeql warning

* chore: revert
@awinberg-aws
Merge branch 'dev' into fix-studio-form-generation
95ac090
@awinberg-aws
chore: resolve build errors with latest updates from dev branch
966da92
@ykethan
fix: throw message when adding lambda function with same name (#12623)
0819db4 
* feat: throw message when adding lambda function with same name

* feat: generalQuestionsWalkthrough test
@ykethan @jhockett
feat: display error message instead of object (#12636)
811e8fc 
* feat: display error message instead of object

* Update packages/amplify-util-mock/src/func/index.ts

Co-authored-by: John Hockett <jhockett@users.noreply.github.com>

* feat: update printer and fix tests

* fix: api-extract

* fix: nested statements

---------

Co-authored-by: John Hockett <jhockett@users.noreply.github.com>
@awinberg-aws
Merge pull request #12713 from aws-amplify/fix-studio-form-generation
cb9b61e 
fix: skip automatic form generation when datastore is not enabled
@goldbez
chore: enable report aggregation for migration and windows tests (#12731
f8ae198 
)

* chore: encable report aggregation for migration and windows tests

* chore: encable report aggregation for migration and windows tests

* chore: encable report aggregation for migration and windows tests

* chore: encable report aggregation for migration and windows tests
@awsluja
ci: rename e2e branch to avoid triggering circleci job (#12721)
68dcea2 
* ci: rename e2e branch to avoid triggering circleci job

* ci: update docs
chore: remove lint section from contributing.md (#12737)
5fe5cb2
fix: lint warnings (#12738)
99026e1
@goldbez
fix: local test reporting wait ids variable in buildspec (#12741)
545dcc4 
* chore: fix local reports ids variable

* chore: fix local reports ids variable

* chore: fix local reports ids variable
@awsluja
Merge branch 'dev' into dev-cb-merge-jun-3
f2c18e4
@goldbez
chore: fix windows buildspec (#12743)
c1aeac9 
* chore: fix_windows_buildspec

* chore: fix_windows_buildspec
@awsluja
ci: fix lint error
ea7e328
@awsluja
Merge remote-tracking branch 'upstream/cb' into dev-cb-merge-jun-3
58fc479
@awsluja
ci: format
ee219f2
@awsluja
ci: fix publish
084984e
@awsluja
ci: add integration test to generated workflow
76087a3
fix: functions e2e tests on windows (#12745)
0de4529 
* fix: console integration test

* fix: e2e test on Windows

* fix: try this

* fix: simplify single select

* fix: try this

* fix: undo that
fix: console integration tests (#12748)
e177b13 
* fix: console integration test

* fix: console integration test

* fix: try this

* fix: try this

* fix: ugh

* fix: try this

* fix: try this

* fix: try this

* fix: try this
fix: remove logs from update idp lambda (#12749)
adc5b22
@jhockett
chore: bump vm2 to 3.9.19 (#12742)
aee086c
@awsluja
Merge pull request #12744 from awsluja/dev-cb-merge-jun-3
fcfebe1 
chore: dev cb merge
@awsluja
ci: separate codebuild & cci differences (#12751)
756db0f
@AaronZyLee
chore: bump api category to 5.4.1 (#12740)
2b6a8fd
@awsluja
Merge branch 'dev' into dev-cb-merge-e2e-fixes
90f2faa
@awsluja
Merge pull request #12753 from awsluja/dev-cb-merge-e2e-fixes
660923b 
chore: dev cb merge e2e fixes
@awsluja
ci: update windows build for yarn2 (#12759)
b99b9b3 
* ci: update scripts to match latest yarn2 windows build

* ci: try again

* ci: try again

* ci: dont set global npm path

* ci: cleanup var names & scripts

* chore: cleanup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.