Chore: Rebase with Master Branch #8444

akshbhu · 2021-10-14T17:32:23Z

Description of changes

Rebase with master

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

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)

… v2 transformer (aws-amplify#8332)

* feat(cli): add post env add plugin event * chore(cli): run post env add hook on amplify init

* Revert "fix: fixes e2e bug (aws-amplify#7067)" This reverts commit 18c9a31. * Update packages/amplify-cli/src/context-manager.ts added ? for type checking

…oyment bucket (aws-amplify#8145) * fix(amplify-category-api): fixed api to reference stack name and deployment bucket * fix: addressed pr comments

…y#8401)

…y#8406)

* Revert "feat(amplify-provider-awscloudformation): enable custom resolvers for v2 transformer (aws-amplify#8332)" This reverts commit 1c73042. * Revert "feat(amplify-provider-awscloudformation): merge user config with transform generated resolvers (aws-amplify#8262)" This reverts commit f25abbf.

* fix: api containers on repushing does not fail

…fy#8373) * feat(amplify-category-geo): use custom resource constructs * fix(amplify-category-geo): remove pre-push hook * fix(amplify-category-geo): move lambdas to separate files * fix(amplify-category-geo): update stack test snapshots

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

* 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

lgtm-com · 2021-10-14T17:49:05Z

This pull request introduces 4 alerts when merging 447d002 into 5a2a702 - view on LGTM.com

new alerts:

3 for Unused variable, import, function or class
1 for Polynomial regular expression used on uncontrolled data

jhockett

Hold off merging until we figure out where the DDB overrides changes are

jhockett

Nevermind, the changes are present. My mistake.

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)

danielleadams and others added 22 commits October 8, 2021 13:16

feat(amplify-provider-awscloudformation): enable custom resolvers for…

1c73042

… v2 transformer (aws-amplify#8332)

feat(cli): add post env add plugin event (aws-amplify#8220)

d400a37

* feat(cli): add post env add plugin event * chore(cli): run post env add hook on amplify init

chore: conditionally print update auth warning (aws-amplify#8207)

4698601

Revert "fix: fixes e2e bug" (aws-amplify#8397)

1c42200

* Revert "fix: fixes e2e bug (aws-amplify#7067)" This reverts commit 18c9a31. * Update packages/amplify-cli/src/context-manager.ts added ? for type checking

fix(amplify-category-api): fixed api to reference stack name and depl…

4c7493a

…oyment bucket (aws-amplify#8145) * fix(amplify-category-api): fixed api to reference stack name and deployment bucket * fix: addressed pr comments

revert: temporarily setup new apps with old pluralization (aws-amplif…

7bb57d0

…y#8401)

test(graphql-model-transformer): fixed plurality e2e test (aws-amplif…

1057fc9

…y#8406)

chore(amplify-e2e-tests): fix config.yml file (aws-amplify#8411)

bd435e2

fix: api containers on repushing does not fail (aws-amplify#8416)

eb64172

* fix: api containers on repushing does not fail

fix: null check (aws-amplify#8429)

e190292

chore(release): Publish [ci skip]

385c395

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

feat: FF for override stacks (aws-amplify#8228)

468d279

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

b68df92

* 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…

4d5dbce

…#8298)

feat: ddb overrides and flow refactor

db7c66e

* 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)

cf5e7f5

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

fix: version mismatch

e585614

fix: remove duplicate key in config.yml

447d002

akshbhu requested a review from a team as a code owner October 14, 2021 17:32

akshbhu changed the title ~~OvExt rebase~~ Chore: Rebase with Master Branch Oct 14, 2021

jhockett approved these changes Oct 14, 2021

View reviewed changes

jhockett suggested changes Oct 14, 2021

View reviewed changes

jhockett self-requested a review October 14, 2021 18:29

jhockett approved these changes Oct 14, 2021

View reviewed changes

akshbhu merged commit e2d3c3b into aws-amplify:extOverrides Oct 14, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Chore: Rebase with Master Branch #8444

Chore: Rebase with Master Branch #8444

akshbhu commented Oct 14, 2021 •

edited

Loading

lgtm-com bot commented Oct 14, 2021

jhockett left a comment

jhockett left a comment

Chore: Rebase with Master Branch #8444

Chore: Rebase with Master Branch #8444

Conversation

akshbhu commented Oct 14, 2021 • edited Loading

Description of changes

Issue #, if available

Description of how you validated changes

Checklist

lgtm-com bot commented Oct 14, 2021

jhockett left a comment

Choose a reason for hiding this comment

jhockett left a comment

Choose a reason for hiding this comment

akshbhu commented Oct 14, 2021 •

edited

Loading