Skip to content
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.

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

Merge from base #3

Merged
merged 68 commits into from
Jun 16, 2021
Merged

Merge from base #3

merged 68 commits into from
Jun 16, 2021

Conversation

abhi7cr
Copy link
Owner

@abhi7cr abhi7cr commented Jun 16, 2021

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)

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

yuth and others added 30 commits May 6, 2021 15:19
Expose e2e-test context to cleanup script task
Add the feature flag value for adding timestamp fields in modelgen. Related PR: aws-amplify/amplify-codegen#114

Related docs PR: aws-amplify/docs#3192
Increase test coverage of amplify-cli.
Increase test coverage of amplify-cli.
Update warning message when creating overlapping REST API paths
Increase test coverage of amplify-graphql-docs-generator.
This PR fixes the e2e amplify-app tests for iOS projects.
* fix: initial commit

* fix: remove table dependency from functions

* fix: check to remove duplicate fn resource

* fix: unit test

* fix: added unit tests

* chore: addressing comments

* fix: minor refractor as per comments

* fix: dependsOn when category resources have same names

* fix: tests and address comments

* fix: changes as per comments

* fix: added list of dependenct functions

* fix: added extra question in push workflow

* fix: added more unit tests

* fix: remove only

* fix: updating unit tests

* fix: lgtm errors

* fix: changed func names and normal refractoring

* fix: enable forcePush

* chore: improve comments
This syntax fails on older versions of Node.

Co-authored-by: Colin Ihrig <colihrig@amazon.com>
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.7.6 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](handlebars-lang/handlebars.js@v4.7.6...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.20 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.20...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…oys (#7278)

- add logging in `deployment-manager` and `stack-event-monitor`
- add types for `aws-logger`
- add `maxRetries` option when creating DynamoDB Client
Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.22 to 0.7.28.
- [Release notes](https://github.com/faisalman/ua-parser-js/releases)
- [Commits](faisalman/ua-parser-js@0.7.22...0.7.28)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Increase test coverage of amplify-cli/extensions.
Fixes function e2e test bugs
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](npm/hosted-git-info@v2.8.8...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix(amplify-category-auth): siwa end to end tests

* fix(amplify-category-auth): typo flo to flow

Co-authored-by: David Lopez <lopezbnd@amazon.com>
* feat: add support for banner message

* chore: add check for SMS sandbox status

* chore: address review comments

* chore: fix test

* chore: fix lgtm error

* chore: change env var name
 - amplify-app@2.24.0
 - amplify-category-analytics@2.21.7
 - amplify-category-api@2.31.7
 - amplify-category-auth@2.31.0
 - amplify-category-function@2.31.7
 - amplify-category-hosting@2.7.7
 - amplify-category-predictions@2.8.7
 - amplify-category-storage@2.11.7
 - amplify-category-xr@2.8.7
 - amplify-cli-core@1.22.0
 - @aws-amplify/cli@4.51.0
 - amplify-console-hosting@1.8.7
 - amplify-console-integration-tests@1.6.0
 - amplify-container-hosting@1.3.7
 - amplify-dotnet-function-template-provider@1.5.7
 - amplify-dynamodb-simulator@1.18.7
 - amplify-e2e-core@1.19.0
 - amplify-e2e-tests@2.40.0
 - amplify-frontend-ios@2.20.0
 - amplify-frontend-javascript@2.22.0
 - amplify-go-function-runtime-provider@1.8.0
 - amplify-graphql-docs-generator@2.2.4
 - amplify-headless-interface@1.6.0
 - amplify-java-function-runtime-provider@1.8.0
 - amplify-migration-tests@2.21.7
 - amplify-nodejs-function-template-provider@1.6.7
 - amplify-provider-awscloudformation@4.48.0
 - amplify-python-function-runtime-provider@1.8.0
 - amplify-util-headless-input@1.4.4
 - amplify-util-import@1.4.7
 - amplify-util-mock@3.31.0
 - graphql-auth-transformer@6.24.7
 - graphql-connection-transformer@4.21.7
 - graphql-dynamodb-transformer@6.22.7
 - graphql-elasticsearch-transformer@4.11.7
 - graphql-function-transformer@2.5.7
 - graphql-http-transformer@4.17.7
 - graphql-key-transformer@2.23.7
 - graphql-predictions-transformer@2.5.7
 - graphql-transformer-core@6.28.7
 - graphql-transformers-e2e-tests@6.23.7
 - graphql-versioned-transformer@4.17.7
…6337)

* fix(graphql-dynamodb-transformer): make primary key non null on del

make primary key non nullable on delete input

fix #2564

* Update snapshot tests
* feat: searchable v2 transformer

* feat: graphql @searchable v2

* feat: added tests and some fixes

* refactor: removed unused and added publishConfig

* fix: fixed the package versions

* refactor: addressed comments on PR

* refactor: sort dependency

* refactor: removed unused

* refactor: removed unused

* refactor: remove datetime unused

* refactor: addressing review suggestions
yuth and others added 28 commits May 20, 2021 16:38
* feat: display SNS sandbox status

* chore: SNS API error handling

* chore: add support for SMS Sandbox check

* chore: auth add show sandbox warning

* chore: add some tests

* chore: address review comments and remove unused code
 - amplify-category-auth@2.32.0
 - amplify-category-function@2.31.9
 - @aws-amplify/cli@4.51.2
 - amplify-console-integration-tests@1.6.2
 - amplify-e2e-core@1.19.2
 - amplify-e2e-tests@2.40.2
 - amplify-migration-tests@2.21.9
 - amplify-provider-awscloudformation@4.50.0
 - amplify-util-mock@3.31.2
Co-authored-by: Colin Ihrig <colihrig@amazon.com>
add action to lock closed threads after 30 days of inactivity
This commit updates externalAuthEnable() to include the auth
sharedId when creating an auth resource. The sharedId is given
the lowest priority in the authProps object so that it will not
overwrite any previously existing sharedId. It also uses the
sharedId from cognito-defaults for consistency. This change
prevents the creation of "snsundefined" roles.


Co-authored-by: Colin Ihrig <colihrig@amazon.com>
…elog (#7264)

This commit updates to @commitlint/cz-commitlint, which adds the `scope` enum from commitlint
without changing the interactive commit experience. Further motivation is explained in
conventional-changelog/commitlint#2547

Co-authored-by: John Corser <xss@amazon.com>
updated Auth SMS workflow check to handle the case when user name can be both email and phone number
remove duplicate function which had same code and update tests
 - amplify-app@2.24.2
 - amplify-appsync-simulator@1.26.6
 - amplify-category-analytics@2.21.9
 - amplify-category-api@2.31.9
 - amplify-category-auth@2.32.1
 - amplify-category-function@2.31.10
 - amplify-category-hosting@2.7.9
 - amplify-category-notifications@2.19.2
 - amplify-category-predictions@2.8.9
 - amplify-category-storage@2.11.9
 - amplify-category-xr@2.8.9
 - amplify-cli-core@1.22.2
 - @aws-amplify/cli@4.51.3
 - amplify-console-hosting@1.8.9
 - amplify-console-integration-tests@1.6.3
 - amplify-container-hosting@1.3.9
 - amplify-dotnet-function-template-provider@1.5.9
 - amplify-dynamodb-simulator@1.18.9
 - amplify-e2e-core@1.19.3
 - amplify-e2e-tests@2.40.3
 - amplify-frontend-ios@2.20.2
 - amplify-frontend-javascript@2.22.2
 - amplify-go-function-runtime-provider@1.8.2
 - @aws-amplify/graphql-function-transformer@0.3.2
 - @aws-amplify/graphql-http-transformer@0.3.2
 - @aws-amplify/graphql-model-transformer@0.4.1
 - @aws-amplify/graphql-searchable-transformer@0.2.1
 - @aws-amplify/graphql-transformer-core@0.6.1
 - amplify-java-function-runtime-provider@1.8.2
 - amplify-java-function-template-provider@1.5.6
 - amplify-migration-tests@2.21.10
 - amplify-nodejs-function-template-provider@1.6.9
 - amplify-provider-awscloudformation@4.50.1
 - amplify-python-function-runtime-provider@1.8.2
 - amplify-util-import@1.4.9
 - amplify-util-mock@3.31.3
 - amplify-velocity-template@1.4.5
 - graphql-auth-transformer@6.24.9
 - graphql-connection-transformer@4.21.9
 - graphql-dynamodb-transformer@6.22.9
 - graphql-elasticsearch-transformer@4.11.9
 - graphql-function-transformer@2.5.9
 - graphql-http-transformer@4.17.9
 - graphql-key-transformer@2.23.9
 - graphql-predictions-transformer@2.5.9
 - graphql-transformer-core@6.28.9
 - graphql-transformers-e2e-tests@6.23.9
 - graphql-versioned-transformer@4.17.9
…lver creation (#7419)

create update and delete resolvers should check for model object key

fix #i7417
 - @aws-amplify/cli@4.51.4
 - amplify-provider-awscloudformation@4.50.2
 - amplify-util-mock@3.31.4
 - graphql-auth-transformer@6.24.10
 - graphql-connection-transformer@4.21.10
 - graphql-dynamodb-transformer@6.22.10
 - graphql-elasticsearch-transformer@4.11.10
 - graphql-key-transformer@2.23.10
 - graphql-transformers-e2e-tests@6.23.10
 - graphql-versioned-transformer@4.17.10
Update CLI to add support for SMS Sandbox
 - amplify-appsync-simulator@1.27.0
 - amplify-category-api@2.31.10
 - amplify-category-auth@2.33.0
 - amplify-category-predictions@2.9.0
 - amplify-category-storage@2.11.10
 - @aws-amplify/cli@4.52.0
 - amplify-console-hosting@1.9.0
 - amplify-console-integration-tests@1.7.0
 - amplify-container-hosting@1.3.10
 - amplify-dynamodb-simulator@1.19.0
 - amplify-e2e-tests@2.41.0
 - amplify-migration-tests@2.22.0
 - amplify-provider-awscloudformation@4.51.0
 - amplify-storage-simulator@1.6.0
 - amplify-util-import@1.5.0
 - amplify-util-mock@3.32.0
 - graphql-relational-schema-transformer@2.18.0
 - graphql-transformers-e2e-tests@6.24.0
…7144)

Adds a new advanced project configuration option to specify a permissions boundary that will be applied to all IAM roles in the project. This is broken into 3 components:
1. add a permissions boundary state manager to amplify-cli-core
2. add a prompt to amplify configure project that writes the boundary to the state manager
3. adds a permissions boundary template modifier to the pre-push cloudformation transformer that reads the value from the state manager and applies it to cfn templates
BREAKING CHANGE: bump amplify-cli to v5 for Lambda layers rework
* fix(amplify-provider-awscloudformation): fix tests failing due to system-config-manager.js (#7053)

* feat: s3 sse by default

* chore: fix init push issue

* chore: cleanup

* test: whole lotta tests

* test: update nondeterministic test

* fix: serialize modifiers and improve test error handling

* fix: add parameterization to ResourceModifier

* fix: add type to sig

* test: update test with new modifier structure

* test: fix test

* feat: add permission boundary to IAM roles

* fix: update iam role modifier

* test: add e2e test for perm bound

* test: add unit tests for perm bound modifier

* fix: fix regex

* feat: switch to env-specific config

* chore: dumping env perm bound changes

* feat: fixup env-specific config and add headless support

* chore: cleaning up things

* test: more unit tests and e2e test

* test: small test tweaks

* chore: reverting some unintentional linting changes

* fix: add update to env help text

* test: add mock

* chore: address PR comments

* chore: use module var instead of global var

* chore: rename permission boundary -> permissions boundary

* fix: merge tpi instead of overwrite

* chore: remove newline

* fix: load creds for new env when checking policy

* fix: test fixes

* test: fix unit tests

* test: fix profile selection

* fix: change permissions boundary success text

Co-authored-by: Raj Rajhans <me@rajrajhans.com>
 - amplify-app@3.0.0
 - amplify-category-analytics@2.21.10
 - amplify-category-api@2.31.11
 - amplify-category-auth@2.33.1
 - amplify-category-function@2.32.0
 - amplify-category-hosting@2.7.10
 - amplify-category-predictions@2.9.1
 - amplify-category-storage@2.11.11
 - amplify-category-xr@2.8.10
 - amplify-cli-core@1.23.0
 - @aws-amplify/cli@5.0.0
 - amplify-console-hosting@1.9.1
 - amplify-console-integration-tests@1.7.1
 - amplify-container-hosting@1.3.11
 - amplify-dotnet-function-runtime-provider@1.6.0
 - amplify-dotnet-function-template-provider@1.5.10
 - amplify-dynamodb-simulator@1.19.1
 - amplify-e2e-core@1.20.0
 - amplify-e2e-tests@2.42.0
 - amplify-frontend-ios@2.20.3
 - amplify-frontend-javascript@2.22.3
 - amplify-function-plugin-interface@1.8.0
 - amplify-go-function-runtime-provider@1.8.3
 - amplify-go-function-template-provider@1.3.8
 - amplify-java-function-runtime-provider@1.8.3
 - amplify-java-function-template-provider@1.5.7
 - amplify-migration-tests@3.0.0
 - amplify-nodejs-function-runtime-provider@1.6.0
 - amplify-nodejs-function-template-provider@1.6.10
 - amplify-provider-awscloudformation@4.52.0
 - amplify-python-function-runtime-provider@1.9.0
 - amplify-python-function-template-provider@1.3.10
 - amplify-util-import@1.5.1
 - amplify-util-mock@3.33.0
 - graphql-auth-transformer@6.24.11
 - graphql-connection-transformer@4.21.11
 - graphql-dynamodb-transformer@6.22.11
 - graphql-elasticsearch-transformer@4.11.11
 - graphql-function-transformer@2.5.10
 - graphql-http-transformer@4.17.10
 - graphql-key-transformer@2.23.11
 - graphql-predictions-transformer@2.5.10
 - graphql-transformer-core@6.28.10
 - graphql-transformers-e2e-tests@6.24.1
 - graphql-versioned-transformer@4.17.11
@abhi7cr abhi7cr merged commit bc549b0 into abhi7cr:master Jun 16, 2021
abhi7cr pushed a commit that referenced this pull request May 6, 2022
* feat(cli-api): improve add and update api

* Delete sam.schema.json

* Delete cloudformation.schema.json

* remove auto apply authmode code from update api workflow

* remove unused import

* fix lint issues

* relative import

* fix dependencies

* fix lint comments

* remove unused code

* updated v2 templates

* remove unused import

* change to use executeProviderUtils

* fixed formatting

* several minor tweaks to add and update api workflow

* update conflict detection label

* remove app not deployed message

* auto apply auth mode

* auto apply authmode for v2 tranformer

* add type amplify_global to v2 schemas

* Update many-relationship-schema-v2.graphql

* Update single-object-auth-schema-v2.graphql

* Update single-object-schema-v2.graphql

* feat: add @auth (#1)

* feat: add @auth base package with Access Control

* feat: graphql auth v2 add schemaChanges, iam policy generation, and query/read resolvers

* feat: graphql auth v2 add auth on mutation and subscription resolvers

* feat(amplify-category-api): add global sandbox mode directive on schema generation (aws-amplify#8074)

* feat(amplify-category-api): add global sandbox mode directive on schema generation

* test(amplify-e2e-tests): add e2e tests for sandbox mode

* test(amplify-category-api): add unit test for generating sandbox mode directive; rm unused method

* feat(cli): add sandbox mode warning to amplify status (aws-amplify#8078)

* feat(amplify-category-api): prompt api key creation on amplify push (aws-amplify#8124)

* feat(amplify-category-api): prompt api key create when invalid with sandbox mode

* test(amplify-category-api): add unit tests for provider utils

* test(amplify-category-api): fix test for adding api key prompt

* refactor(cli): refactor api key prompt

* refactor(amplify-category-api): add api key with gql compiled

* feat: @model conflict resolution

* auth directive support for index, searchable, predictions, functions, and relational directives (aws-amplify#8146)

* feat: add support for index and updated unit and e2e tests

* feat: directive suport for functions, predictions, searchable, and relational

* test: updated unit tests for updated auth on directives

* @auth support for datastore and add has auth flag (aws-amplify#8168)

* feat: @auth v2 on datastore and updated unit tests
* feat: add hasAuthFlag

* feat(graphql-model-transformer): set up transformer for sandbox mode directive (aws-amplify#8138)

* feat(graphql-model-transformer): add sandbox mode support to model transformer

* refactor(graphql-transformer-core): do not persist sandbox mode meta data

* fix: add command to show access control and field auth evaluation in access control (aws-amplify#8174)

* fix: admin ui app state check and auth transformer index resolver name (aws-amplify#8175)

* fix: has auth typo and qref on field conditions for private rule (aws-amplify#8180)

* fix(graphql-model-transformer): use hasAuth flag when sandbox mode is disabled (aws-amplify#8179)

* fix: update hasMany to use join table name, sync config warning, updated unit test

* fix: add empty payload for sandbox mode

* fix: snapshot test for @searchable

* fix: udpated snapshot for index and relation directives

* fix: use same none datasource name as resolver manager

* fix: iam resolver check and relational payload (aws-amplify#8234)

* fix: add datastore query in config for auth (aws-amplify#8246)

* fix: auth filter expression (aws-amplify#8248)

* fix: update iam auth to include roles in before template (aws-amplify#8259)

* chore: rebase and update auth dependencies

* fix(graphql-model-transformer): iam role name does not exceed 64 characters

* fix: add base e2e tests with auth fixes

Co-authored-by: Danielle Adams <6271256+danielleadams@users.noreply.github.com>
Co-authored-by: lazpavel <85319655+lazpavel@users.noreply.github.com>

* fix: update dependency versions

* feat(amplify-provider-awscloudformation): match env directive field for sandbox mode (#3)

* fix(amplify-provider-awscloudformation): invoke api function from invoker plugin (aws-amplify#8274)

* fix(amplify-provider-awscloudformation): invoke api function from invoker plugin

* fix(graphql-index-transformer): update snapshots for tests

* test(amplify-provider-awscloudformation): fix tests for sandbox helpers

* fix(amplify-provider-awscloudformation): remove sandbox mode directive from schema before transform (aws-amplify#8272)

* chore(graphql-auth-transformer): update deps for auth transformer and api category

* fix(graphql-model-transformer): revert code to master version

* test(graphql-model-transformer): update the snapshot for the amplify/graphql-model-transformer test

* chore: remove showacm as that was for testing purposes only

* test(amplify-e2e-tests): update to use correct helpers

* test(graphql-transformers-e2e-tests): enable sandbox mode on v2 transforms

* test(amplify-e2e-tests): replace updateAPIResolution imports with new methods

* fix: get item query for @model and relational directives

* auto apply auth fix

* auto apply auth modes v2 fix (#4)

* test(amplify-e2e-tests): rm sandbox e2e test

* fix(amplify-provider-awscloudformation): fix api key creation when sandbox mode enable

* test(amplify-e2e-tests): create random app name generator for broken tests

* fix api e2e workflow

* test(amplify-e2e-core): add random app name generator, update snapshots and imports

* chore(graphql-auth-transformer): upgrade deps in auth transformer

* update e2e test to use new api workflow (#5)

* feat(graphql-model-transformer): fix default value e2e test (#6)

* test(amplify-e2e-tests): add missing helper

* e2e fix for auth tests using new api workflow  (aws-amplify#7)

* update e2e test to use new api workflow

* fix(test): update auth tests with new api workflow

* test(amplify-e2e-tests): add missing helper and fix broken test

Co-authored-by: Christopher Sundersingh <sundersc@amazon.com>
Co-authored-by: Christopher Sundersingh <83315412+sundersc@users.noreply.github.com>
Co-authored-by: Josue Ruiz <7465495+SwaySway@users.noreply.github.com>
Co-authored-by: lazpavel <85319655+lazpavel@users.noreply.github.com>
Co-authored-by: Colin Ihrig <colihrig@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.