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

Rebase ext 2 #8558

Merged
merged 129 commits into from
Oct 27, 2021
Merged

Rebase ext 2 #8558

merged 129 commits into from
Oct 27, 2021

Conversation

akshbhu
Copy link
Contributor

@akshbhu akshbhu commented Oct 26, 2021

Description of changes

Rebased with master

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

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 September 27, 2021 18:50
 - amplify-app@3.0.13
 - amplify-category-analytics@2.21.22
 - amplify-category-api@2.32.0
 - amplify-category-auth@2.38.2
 - amplify-category-function@2.35.0
 - amplify-category-geo@1.0.1
 - amplify-category-hosting@2.7.22
 - amplify-category-interactions@2.6.6
 - amplify-category-predictions@2.9.13
 - amplify-category-storage@2.12.10
 - amplify-category-xr@2.8.22
 - amplify-cli-core@1.30.0
 - @aws-amplify/cli@6.1.0
 - amplify-console-hosting@1.9.13
 - amplify-console-integration-tests@1.8.10
 - amplify-container-hosting@1.3.24
 - amplify-dotnet-function-template-provider@1.5.22
 - amplify-dynamodb-simulator@1.19.13
 - amplify-e2e-core@1.27.0
 - amplify-e2e-tests@2.51.0
 - amplify-frontend-ios@2.20.15
 - amplify-frontend-javascript@2.24.2
 - amplify-go-function-runtime-provider@1.9.5
 - @aws-amplify/graphql-function-transformer@0.4.4
 - @aws-amplify/graphql-http-transformer@0.5.4
 - @aws-amplify/graphql-index-transformer@0.3.3
 - @aws-amplify/graphql-model-transformer@0.6.3
 - @aws-amplify/graphql-predictions-transformer@0.3.4
 - @aws-amplify/graphql-relational-transformer@0.3.0
 - @aws-amplify/graphql-searchable-transformer@0.6.1
 - @aws-amplify/graphql-transformer-core@0.9.1
 - @aws-amplify/graphql-transformer-interfaces@1.9.1
 - amplify-java-function-runtime-provider@1.8.15
 - amplify-migration-tests@3.1.10
 - amplify-nodejs-function-runtime-provider@1.6.12
 - amplify-nodejs-function-template-provider@1.6.22
 - amplify-prompts@1.2.0
 - amplify-provider-awscloudformation@4.61.0
 - amplify-python-function-runtime-provider@1.9.12
 - amplify-util-import@1.5.13
 - amplify-util-mock@3.34.6
 - graphql-auth-transformer@6.24.23
 - graphql-connection-transformer@4.21.23
 - graphql-dynamodb-transformer@6.22.23
 - graphql-elasticsearch-transformer@4.12.2
 - graphql-function-transformer@2.5.22
 - graphql-http-transformer@4.18.10
 - graphql-key-transformer@2.23.23
 - graphql-predictions-transformer@2.5.22
 - graphql-relational-schema-transformer@2.18.7
 - graphql-transformer-common@4.19.10
 - graphql-transformer-core@6.30.0
 - graphql-transformers-e2e-tests@6.27.0
 - graphql-versioned-transformer@4.17.23
 - @aws-amplify/cli@6.1.1
 - amplify-console-integration-tests@1.8.11
 - amplify-e2e-core@1.27.1
 - amplify-e2e-tests@2.51.1
 - @aws-amplify/graphql-searchable-transformer@0.6.2
 - amplify-migration-tests@3.1.11
 - amplify-provider-awscloudformation@4.61.1
 - amplify-util-mock@3.34.7
 - graphql-auth-transformer@6.24.24
 - graphql-elasticsearch-transformer@4.12.3
 - graphql-transformers-e2e-tests@6.27.1
…lify#8068)

* Custom policy implementation

* feat: add custom policies file to function and API container

add custom policies file to function and API container, merge the custom policies to CFN template,
validation for regex of resources and actions in the custom policies file

* feat: changes for first PR

* feat: Some changes according to the PR comments

1. Add Json Schema to validate the customers input 2. some minor changes related to format issue 3.
error handle

* feat: replace env to current env in the resource when checkout and add env, and push

* feat: e2e test and replacing env

* feat: Minor changes for env replacement

* feat: remove changing env between env

* feat: Add cloudform type for type safety, move validation to provider-cloudformation, validation

* feat: remove some unused function and import, change regex for resource

* feat: Some changes according to the PR comment

* feat: changes according to PR comments

* feat: remove unused import

* feat: remove previous unused code

* feat: Changes according to PR comments

* feat: some changes according to PR comments

* feat: work on PR comments

* feat: rebase for conflict

* feat: rebase for failure of hooksmanager test failed

* feat: unit test

* feat: fix fail test

* feat: change default template of custom policies

* feat: fix failed test

* feat: PR comments

* feat: pr comments

* feat: fix failed test

* feat: PR comments from ED

Co-authored-by: Lu Han <lhnamz@amazon.com>
 - amplify-app@3.0.14
 - amplify-category-analytics@2.21.23
 - amplify-category-api@2.33.0
 - amplify-category-auth@2.38.3
 - amplify-category-function@2.36.0
 - amplify-category-geo@1.0.2
 - amplify-category-hosting@2.7.23
 - amplify-category-interactions@2.6.7
 - amplify-category-predictions@2.9.14
 - amplify-category-storage@2.12.11
 - amplify-category-xr@2.8.23
 - amplify-cli-core@1.31.0
 - @aws-amplify/cli@6.2.0
 - amplify-console-hosting@1.9.14
 - amplify-console-integration-tests@1.8.12
 - amplify-container-hosting@1.3.25
 - amplify-dotnet-function-template-provider@1.5.23
 - amplify-dynamodb-simulator@1.19.14
 - amplify-e2e-core@1.28.0
 - amplify-e2e-tests@2.52.0
 - amplify-frontend-ios@2.20.16
 - amplify-frontend-javascript@2.24.3
 - amplify-go-function-runtime-provider@1.9.6
 - amplify-java-function-runtime-provider@1.8.16
 - amplify-migration-tests@3.1.12
 - amplify-nodejs-function-runtime-provider@1.6.13
 - amplify-nodejs-function-template-provider@1.6.23
 - amplify-provider-awscloudformation@4.62.0
 - amplify-python-function-runtime-provider@1.9.13
 - amplify-util-import@1.5.14
 - amplify-util-mock@3.34.8
 - graphql-auth-transformer@6.24.25
 - graphql-connection-transformer@4.21.24
 - graphql-dynamodb-transformer@6.22.24
 - graphql-elasticsearch-transformer@4.12.4
 - graphql-function-transformer@2.5.23
 - graphql-http-transformer@4.18.11
 - graphql-key-transformer@2.23.24
 - graphql-predictions-transformer@2.5.23
 - graphql-transformer-core@6.30.1
 - graphql-transformers-e2e-tests@6.27.2
 - graphql-versioned-transformer@4.17.24
…ws-amplify#8371)

* fix: opensearch warning, add optional chaining to get api category

* fix: opensearch warning, add test with existing categories
akshbhu and others added 17 commits October 26, 2021 10:30
* feat: added root stack transformation

* feat: adding root-stack-builder

* feat: added e2e and migration tests

* fix: minor fixes

* fix: fixes unit tests

* fix: address comments
* feat: ddb overrides

* feat: add migration logic

* fix: remove older files post migration

* fix: address PR comments

* fix: remove inquirer and use amplify prompts instead

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>
* chore: overrides ddb and walthrough refactor tests

* chore: address pr comments

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>
aws-amplify#8355)

* feat: add auth override

* fix: auth state unit tests working

* feat: auth e2e fixes and migration e2e included

* fix: fixes package name

* fix: unit tests fix

* fix: unit tests

* fix: fixing overwritten files

* fix: added vm2 and addressed comments

* fix: minor fixes and e2e test for overrides

* fix: cli-core unit test

* fix: userPool group unit test

* fix: minor refractor and comments

* chore: lgtm warnings

* fix: minor fixes

* fix: unit tests
…ate) (aws-amplify#8383)

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>
)

* fix: dependsOn fix

* chore: address comments

* chore: remove JSON parsing

* fix: default migration set to true
…8497)

* fix: adds userPool resourceName instead of authResource

* fix: roleName in userPool groups
…ngle-group, deploy errors (aws-amplify#8501)

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>
* fix: template and naming fixed

* fix: addressed comments
… S3 (aws-amplify#8511)

* (fix) Call Auth migration from S3 migration for all auth resources used by S3

* (fix) use invokePluginMethod instead of direct category calls

* (fix) unit-test for s3 migration

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>
Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>
…amplify#8556)

Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>
@akshbhu akshbhu requested a review from a team as a code owner October 26, 2021 19:03
@lgtm-com
Copy link

lgtm-com bot commented Oct 27, 2021

This pull request introduces 7 alerts and fixes 3 when merging ae5f43d into 41f7329 - view on LGTM.com

new alerts:

  • 6 for Unused variable, import, function or class
  • 1 for Inefficient regular expression

fixed alerts:

  • 3 for Unused variable, import, function or class

@codecov-commenter
Copy link

codecov-commenter commented Oct 27, 2021

Codecov Report

Merging #8558 (0c0828d) into extOverrides (41f7329) will increase coverage by 0.72%.
The diff coverage is 63.19%.

Impacted file tree graph

@@               Coverage Diff                @@
##           extOverrides    #8558      +/-   ##
================================================
+ Coverage         54.52%   55.25%   +0.72%     
================================================
  Files               749      781      +32     
  Lines             42892    45244    +2352     
  Branches           8561     9135     +574     
================================================
+ Hits              23387    24999    +1612     
- Misses            18669    19392     +723     
- Partials            836      853      +17     
Impacted Files Coverage Δ
...egory-api/src/provider-utils/supported-services.ts 100.00% <ø> (ø)
packages/amplify-category-auth/src/index.js 13.89% <0.00%> (ø)
...dformation/auth-inputs-manager/auth-input-state.ts 54.76% <0.00%> (-2.74%) ⬇️
...s/amplify-category-geo/src/commands/geo/console.ts 53.84% <0.00%> (ø)
...amplify-cli-core/src/feature-flags/featureFlags.ts 83.70% <ø> (ø)
.../amplify-cli-core/src/state-manager/pathManager.ts 64.10% <ø> (ø)
packages/amplify-cli/src/domain/amplify-toolkit.ts 2.39% <0.00%> (+<0.01%) ⬆️
...transformer/src/graphql-predictions-transformer.ts 97.80% <ø> (-1.62%) ⬇️
...ransformer/src/graphql-many-to-many-transformer.ts 100.00% <ø> (ø)
...fy-graphql-relational-transformer/src/resolvers.ts 97.02% <ø> (+0.25%) ⬆️
... and 98 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 41f7329...0c0828d. Read the comment docs.

@lgtm-com
Copy link

lgtm-com bot commented Oct 27, 2021

This pull request introduces 7 alerts and fixes 3 when merging 0c0828d into 41f7329 - view on LGTM.com

new alerts:

  • 6 for Unused variable, import, function or class
  • 1 for Inefficient regular expression

fixed alerts:

  • 3 for Unused variable, import, function or class

@akshbhu akshbhu merged commit 4049bb9 into aws-amplify:extOverrides Oct 27, 2021
akshbhu added a commit that referenced this pull request Oct 27, 2021
@akshbhu akshbhu mentioned this pull request Oct 27, 2021
akshbhu added a commit that referenced this pull request Oct 27, 2021
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.

None yet