Rebase ext 2 #8558

akshbhu · 2021-10-26T19:03:55Z

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.

…plify#8284)

…irements (aws-amplify#8309)

…lify#8312)

- @aws-amplify/[email protected] - [email protected] - [email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected]

…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 <[email protected]>

…nup (aws-amplify#8340)

… and v2 transformers (aws-amplify#8354)

…ws-amplify#8371) * fix: opensearch warning, add optional chaining to get api category * fix: opensearch warning, add test with existing categories

…t property (aws-amplify#8374)

* 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

…#8298)

* 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 <[email protected]>

* chore: overrides ddb and walthrough refactor tests * chore: address pr comments Co-authored-by: Ghosh <[email protected]>

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 <[email protected]>

) * 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 <[email protected]>

* 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 <[email protected]>

Co-authored-by: Sachin Panemangalore <[email protected]>

…amplify#8556) Co-authored-by: Sachin Panemangalore <[email protected]>

lgtm-com · 2021-10-27T07:38:46Z

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 · 2021-10-27T07:46:17Z

Codecov Report

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

@@               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 · 2021-10-27T11:04:52Z

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

This reverts commit 4049bb9.

aws-amplify-bot and others added 30 commits September 27, 2021 18:50

ci: improve parallelism, add windows for e2e tests (aws-amplify#8282)

540f4a5

chore: add additional instance types to @searchable directive (aws-am…

bd74bfb

…plify#8284)

ci: support multi-account e2e cleanup (aws-amplify#8082)

7f04962

test: update pinpoint test region mapping (aws-amplify#8295)

93a28df

ci: improve parallelization (aws-amplify#8292)

f1a8342

test: fix cci pipeline flow (aws-amplify#8296)

07dce3e

test: remove aws cli win install step (aws-amplify#8299)

569c16c

fix: logic to display searchable instance warning (aws-amplify#8297)

1fc7a9a

test: dont run geo e2e tests on windows (aws-amplify#8300)

5c9e216

test: revert test timeout change (aws-amplify#8301)

b122947

Automatically retry CircleCi e2e tasks (aws-amplify#8306)

eaee9e5

test: fix gql e2e split test logic, remove unnecessary inter-job requ…

6e33684

…irements (aws-amplify#8309)

ci: remove retry wrapper on windows tests to prevent hanging (aws-amp…

67503f6

…lify#8312)

ci: use powershell to run windows tests (aws-amplify#8314)

5e0457c

ci: skip rate limited windows tests (aws-amplify#8319)

23bb7b5

chore(release): Publish [ci skip]

51e7242

- @aws-amplify/[email protected] - [email protected] - [email protected] - [email protected] - @aws-amplify/[email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected] - [email protected]

chore: add cloud-e2e script (aws-amplify#8334)

e410421

ci: add automatic retry of failed tasks (aws-amplify#8338)

ca20fd3

test: update snapshot file to match renamed test file (aws-amplify#8333)

b870948

build: run circleci validator on split-e2e-tests (aws-amplify#8313)

a14383a

ci: fix retry function (aws-amplify#8343)

42a32a9

ci: track flaky tests in cloudwatch (aws-amplify#8339)

9781223

ci: fix cleanup script context (aws-amplify#8344)

3168885

ci: split some migration tests, fix retry issues, remove per-job clea…

c936570

…nup (aws-amplify#8340)

fix(graphql-model-transformer): fix open search instance check for v1…

d7d9476

… and v2 transformers (aws-amplify#8354)

fix: opensearch warning, add optional chaining to get api category (a…

2bdae3a

…ws-amplify#8371) * fix: opensearch warning, add optional chaining to get api category * fix: opensearch warning, add test with existing categories

chore(graphql-model-transformer): use lodash for accessing deep objec…

829a6fb

…t property (aws-amplify#8374)

akshbhu and others added 17 commits October 26, 2021 10:30

feat: root stack override (aws-amplify#8276)

4842ee7

* 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: adding rootstack types to overrides helper package (aws-amplify…

387c83e

…#8298)

feat: ddb overrides and flow refactor

8bc68b1

* 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 <[email protected]>

chore: ddb walkthrough refactor and override tests (aws-amplify#8364)

2720e71

* chore: overrides ddb and walthrough refactor tests * chore: address pr comments Co-authored-by: Ghosh <[email protected]>

(feat) Override for S3 - ( includues refactor s3-walkthrough and migr…

c2442cd

…ate) (aws-amplify#8383) Co-authored-by: Sachin Panemangalore <[email protected]>

fix: fixes dependsOn parameter and auth migration test (aws-amplify#8480

6006cc8

) * fix: dependsOn fix * chore: address comments * chore: remove JSON parsing * fix: default migration set to true

fix: added public access to scoped packages (aws-amplify#8485)

26e1062

fix: adds typescript json dependency (aws-amplify#8487)

39e1ff7

fix: enable scoped packages in plugin platform (aws-amplify#8492)

a968d3f

fix: adds userPool resourceName instead of authResource (aws-amplify#…

8408a53

…8497) * fix: adds userPool resourceName instead of authResource * fix: roleName in userPool groups

(bug-fix/reconcile-headless) remove groupList from userInputs, fix si…

00c7f69

…ngle-group, deploy errors (aws-amplify#8501) Co-authored-by: Sachin Panemangalore <[email protected]>

fix: userPool group template fixes (aws-amplify#8515)

cadf003

* fix: template and naming fixed * fix: addressed comments

(fix) s3 add with no-auth resource should succeed (aws-amplify#8520)

274fe93

Co-authored-by: Sachin Panemangalore <[email protected]>

(fix) amplify override storage fails with missing tsconfig.json (aws-…

7078a8c

…amplify#8556) Co-authored-by: Sachin Panemangalore <[email protected]>

fix: rebase extOverrides with master

5759f88

akshbhu requested a review from a team as a code owner October 26, 2021 19:03

akshbhu added 2 commits October 26, 2021 20:35

fix: getSupportedServices function

4d27db8

fix: merge conflicts

ae5f43d

fix: rebase leftovers

0c0828d

jhockett approved these changes Oct 27, 2021

View reviewed changes

sachscode approved these changes Oct 27, 2021

View reviewed changes

akshbhu merged commit 4049bb9 into aws-amplify:extOverrides Oct 27, 2021

akshbhu added a commit that referenced this pull request Oct 27, 2021

Revert "Rebase ext 2 (#8558)"

958462f

This reverts commit 4049bb9.

akshbhu mentioned this pull request Oct 27, 2021

Revert "Rebase ext 2" #8578

Merged

akshbhu added a commit that referenced this pull request Oct 27, 2021

Revert "Rebase ext 2 (#8558)" (#8578)

d0f451e

This reverts commit 4049bb9.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rebase ext 2 #8558

Rebase ext 2 #8558

akshbhu commented Oct 26, 2021 •

edited

Loading

lgtm-com bot commented Oct 27, 2021

codecov-commenter commented Oct 27, 2021 •

edited

Loading

lgtm-com bot commented Oct 27, 2021

Rebase ext 2 #8558

Rebase ext 2 #8558

Conversation

akshbhu commented Oct 26, 2021 • edited Loading

Description of changes

Description of how you validated changes

Checklist

lgtm-com bot commented Oct 27, 2021

codecov-commenter commented Oct 27, 2021 • edited Loading

Codecov Report

lgtm-com bot commented Oct 27, 2021

akshbhu commented Oct 26, 2021 •

edited

Loading

codecov-commenter commented Oct 27, 2021 •

edited

Loading