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

Ext overrides2 storage-headless and predictions #8622

Merged

Conversation

sachscode
Copy link
Contributor

@sachscode sachscode commented Nov 1, 2021

Description of changes

  1. [feat-fix] storage-headless api
  2. [feat-fix] predictions-storage integration (pending bug fixes detailed below).
  3. [bug-fix] transformGraphQLSchema directly accesses S3 params.json and crashes in amplify push
  4. [chores] PR comments and LGTM bot.

Issue #, if available

https://app.asana.com/0/1201180241378567/1201248844053114/f

Description of how you validated changes

Manually tested identity walkthrough
[passing tests]

  1. create s3 + trigger -works in prefix folders( /private/$region, /protected/$region, /public/$region)
  2. create s3 + trigger + create predictions + admin-trigger
  3. create s3 + create predictions + admin-trigger + new function
  4. no s3 + create predictions + admin-trigger

[pending fixes]

  1. create s3 + create predictions + admin-trigger + s3-trigger ( reuse predictions admin-trigger ) - fails
    [pending fix] block s3 from mutating admin-lambda in s3 update walkthrough.
    2.create predictions + use advanced identity walkthrough + admin-lambda ( fails during function creation since add walkthrough has not completed) .
    [pending fix] update current logic to create predictions category cloudformation prior to generating admin-trigger.
  2. delete predictions - fails
    [pending fix] call s3-api from remove.

[pending tests]

  1. migration scenario - ( create predictions, update predictions + storage migrate ).

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.

@sachscode sachscode requested a review from a team as a code owner November 1, 2021 22:49
@sachscode sachscode force-pushed the extOverrides2-fix-predictions branch from 3529069 to d997ab9 Compare November 1, 2021 22:57
@lgtm-com
Copy link

lgtm-com bot commented Nov 1, 2021

This pull request introduces 8 alerts and fixes 1 when merging d997ab9 into a34101e - view on LGTM.com

new alerts:

  • 8 for Unused variable, import, function or class

fixed alerts:

  • 1 for Useless conditional

@lgtm-com
Copy link

lgtm-com bot commented Nov 3, 2021

This pull request introduces 11 alerts and fixes 1 when merging 74a78c0 into 67ecb2d - view on LGTM.com

new alerts:

  • 11 for Unused variable, import, function or class

fixed alerts:

  • 1 for Useless conditional

@codecov-commenter
Copy link

codecov-commenter commented Nov 3, 2021

Codecov Report

Merging #8622 (8944f27) into extOverrides2 (67ecb2d) will decrease coverage by 0.06%.
The diff coverage is 18.52%.

Impacted file tree graph

@@                Coverage Diff                @@
##           extOverrides2    #8622      +/-   ##
=================================================
- Coverage          56.65%   56.59%   -0.07%     
=================================================
  Files                801      803       +2     
  Lines              45670    45811     +141     
  Branches            9143     9180      +37     
=================================================
+ Hits               25874    25926      +52     
- Misses             18988    19077      +89     
  Partials             808      808              
Impacted Files Coverage Δ
...dformation/cdk-stack-builder/s3-stack-transform.ts 9.44% <0.00%> (-0.16%) ⬇️
...utils/awscloudformation/cdk-stack-builder/types.ts 15.62% <ø> (ø)
...rage/src/provider-utils/awscloudformation/index.ts 14.10% <ø> (ø)
...loudformation/service-walkthroughs/s3-questions.ts 91.41% <ø> (ø)
...mation/service-walkthroughs/s3-user-input-state.ts 8.73% <0.96%> (-2.20%) ⬇️
...oudformation/cdk-stack-builder/s3-stack-builder.ts 4.04% <2.17%> (-0.81%) ⬇️
...-awscloudformation/src/transform-graphql-schema.ts 14.37% <8.33%> (+0.04%) ⬆️
...der-utils/awscloudformation/s3-headless-adapter.ts 17.24% <17.24%> (ø)
...awscloudformation/storage-configuration-helpers.ts 10.95% <20.00%> (-1.23%) ⬇️
...dformation/service-walkthroughs/s3-resource-api.ts 31.03% <31.03%> (ø)
... and 6 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 67ecb2d...8944f27. Read the comment docs.

@sachscode sachscode force-pushed the extOverrides2-fix-predictions branch from 883ffb9 to fb1fae3 Compare November 3, 2021 05:21
@sachscode sachscode changed the title Ext overrides2 fix predictions Ext overrides2 storage-headless and predictions Nov 3, 2021
@lgtm-com
Copy link

lgtm-com bot commented Nov 3, 2021

This pull request introduces 11 alerts and fixes 1 when merging fb1fae3 into 67ecb2d - view on LGTM.com

new alerts:

  • 11 for Unused variable, import, function or class

fixed alerts:

  • 1 for Useless conditional

@lgtm-com
Copy link

lgtm-com bot commented Nov 3, 2021

This pull request introduces 7 alerts and fixes 1 when merging 8c1d71a into 67ecb2d - view on LGTM.com

new alerts:

  • 7 for Unused variable, import, function or class

fixed alerts:

  • 1 for Useless conditional

@@ -85,26 +89,43 @@ async function updateWalkthrough(context) {
resourceObj = resourceAnswer.resource;
}

return await configure(context, resourceObj);
return await configure(context, resourceObj, PREDICTIONS_WALKTHROUGH_MODE.ADD );
Copy link
Contributor

@akshbhu akshbhu Nov 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be update right?

Suggested change
return await configure(context, resourceObj, PREDICTIONS_WALKTHROUGH_MODE.ADD );
return await configure(context, resourceObj, PREDICTIONS_WALKTHROUGH_MODE.UPDATE );

try {
parameters = amplify.readJsonFile(parametersFilePath);
parameters = amplify.readJsonFile(predictionsParametersFilePath);
Copy link
Contributor

@akshbhu akshbhu Nov 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: JSONUtilities or StateManager to fetch parameters since its updated to include build/parameters.json as well

let identifyCFNFile = context.amplify.readJsonFile(identifyCFNFilePath);
let identifyCFNFile;
try {
identifyCFNFile = context.amplify.readJsonFile(identifyCFNFilePath);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

JSONUtilities here

try {
identifyCFNFile = context.amplify.readJsonFile(identifyCFNFilePath);
} catch (fileNotFoundError ){
//generate template and switch to update mode ?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anything to do here if file not found?

if (storageResourceName) {
throw new Error('Add Storage Failed.. already exists');
}
await s3APIHelperTransformAndSaveState(context, storageInput, CLISubCommandType.ADD);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove CFN transformer dependency on add/update commands?

const s3Resource = s3ResourceAlreadyExists(context);
const storageConfig = s3Resource ? getBucketName(context, s3Resource, backEndDir) : undefined;
const s3ResourceName = await invokeS3GetResourceName(context);
const storageConfig = s3ResourceName ? await getBucketName(context, s3ResourceName ) : undefined;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have also done these change in my gql PR, I can take up your changes since this uses S3 category APIs

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is also similar file for V2 transformers
here: packages/amplify-provider-awscloudformation/src/graphql-transformer/transform-graphql-schema.ts

Make sure this file also has similar chanages

@lgtm-com
Copy link

lgtm-com bot commented Nov 3, 2021

This pull request introduces 7 alerts and fixes 1 when merging d98f51e into 67ecb2d - view on LGTM.com

new alerts:

  • 7 for Unused variable, import, function or class

fixed alerts:

  • 1 for Useless conditional

Copy link
Contributor

@akshbhu akshbhu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM , Some nits to address if you want

@lgtm-com
Copy link

lgtm-com bot commented Nov 3, 2021

This pull request introduces 7 alerts and fixes 1 when merging 8944f27 into 67ecb2d - view on LGTM.com

new alerts:

  • 7 for Unused variable, import, function or class

fixed alerts:

  • 1 for Useless conditional

@jhockett jhockett merged commit c73baf2 into aws-amplify:extOverrides2 Nov 3, 2021
jhockett pushed a commit to jhockett/amplify-cli that referenced this pull request Nov 3, 2021
jhockett pushed a commit to jhockett/amplify-cli that referenced this pull request Nov 3, 2021
akshbhu pushed a commit to akshbhu/amplify-cli that referenced this pull request Nov 8, 2021
sachscode added a commit to sachscode/amplify-cli that referenced this pull request Nov 10, 2021
sachscode added a commit that referenced this pull request Nov 10, 2021
* feat: FF for override stacks (#8228)

* feat: root stack override (#8276)

* 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 (#8298)

* feat: ddb overrides and flow refactor

* 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: ddb walkthrough refactor and override tests (#8364)

* chore: overrides ddb and walthrough refactor tests

* chore: address pr comments

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* feat: Auth refactor to  use cdk, eliminate EJS, overrides functionality (#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

* (feat) Override for S3 - ( includues refactor s3-walkthrough and migrate) (#8383)

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

* fix: fixes dependsOn parameter and auth migration test (#8480)

* fix: dependsOn fix

* chore: address comments

* chore: remove JSON parsing

* fix: default migration set to true

* fix: added public access to scoped packages (#8485)

* fix: adds typescript json dependency (#8487)

* fix: enable scoped packages in plugin platform (#8492)

* fix: adds userPool resourceName instead of authResource (#8497)

* fix: adds userPool resourceName instead of authResource

* fix: roleName in userPool groups

* (bug-fix/reconcile-headless) remove groupList from userInputs, fix single-group, deploy errors (#8501)

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

* fix: userPool group template fixes (#8515)

* fix: template and naming fixed

* fix: addressed comments

* (fix) Call Auth migration from S3 migration for all auth resources in S3 (#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>

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

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

* (fix) amplify override storage fails with missing tsconfig.json (#8556)

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

* fix: parameters file path and updates cloud backend with build (#8564)

* fix: latest changes

* feat: define custom resources with CDK or CFN (#8590)

* feat: define custom resources with CDK or CFN

* chore: fix lint errors

* chore: address API review and PR feedback

* chore: fix unit test

* fix: update skeleton CDK sample app based on API-Review

* chore: fix build errors

* chore: fix unit tests

* chore: addressed PR review comments

* chore: update uuid package version

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* chore: add public access for custom package

* fix: add npmignore to custom resource package and update archiver (#8596)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: alias attr bug and use enabled mfa

* fix: tsc global install error

* fix: broken unit tests

* fix: bug fixes in external auth enable

* test: unit tests + e2e tests for custom resources (#8602)

* test: unit tests for custom resources

* chore: remove empty unit test file

* fix: add all required types in override-helper package

* chore: update override helper dependencies

* test: unit test for dependency management utils

* test: add coverage data and add more unit tests for cfn dependency management

* test: add E2E tests for custom resources

* chore: address PR review comments

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: admin UI test

* feat: add get project info helper to overrides helper package (#8620)

* feat: add get project info helper to overrides helper package

* chore: address PR feedback

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* chore: update skeleton package json override dependencies (#8641)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* feat: amplify export

* Refactor/packaging (#8547)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* Feat: export pull front end (#8488)

* feat: export (#8486)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* feat: wip export pull

* feat: amplify export pull to genereate front end config files

* fix: merge fixes from export

* refactor: removed unused

* fix: some language fixes and bug fix with notification

* test: e2e tests

* test: codecov and test fix

* Refactor/packaging (#8547)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* Feat: export pull front end (#8488)

* feat: export (#8486)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* feat: wip export pull

* feat: amplify export pull to genereate front end config files

* fix: merge fixes from export

* refactor: removed unused

* fix: some language fixes and bug fix with notification

* test: e2e tests

* test: codecov and test fix

* feat: export + override reconciled

* test: fixed test because of bad merge

* fix: added back conditional conditional rebuild

* refactor(amplify-provider-awscloudformation): renamed the files to fit

* test: fixed idp add storage test

* test: fixes type import

* feat: extensibility for REST APIs (#8598)

* fix: ext overrides2 storage-headless and predictions (#8622)

* fix: broken path on build-override

* fix: pushing multiple APIs at a time (#8663)

* fix: capitalization for filter, e2e test (#8667)

* fix: capitalization for filter

* test: fix prompt wait text

* fix: test fixes (#8647)

* (fix) add predictions + advanced mode + identifyEntity fails because … (#8658)

* (fix) add predictions + advanced mode + identifyEntity fails because predictions cfn is not created

* (fix) fixed regression for pred update + storage

* (fix) plugininfo integ tests

* (fix) storage e2e tests 'Auth' to 'Authenticated'

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

* fix: stack generation logic when multiple paths ref same Lambda (#8673)

* Apigw revert (#8690)

* Revert "fix: stack generation logic when multiple paths ref same Lambda (#8673)"

This reverts commit fdbab02.

* Revert "fix: capitalization for filter, e2e test (#8667)"

This reverts commit e4f83fc.

* Revert "fix: pushing multiple APIs at a time (#8663)"

This reverts commit 4ff68bb.

* Revert "fix: broken path on build-override"

This reverts commit 712c043.

* Revert "feat: extensibility for REST APIs (#8598)"

This reverts commit 9822117.

* (fix) [storage-1.test]init a project and add S3 bucket with user pool groups and then update S3 bucket to add trigger (#8691)

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

* (fix) storage unit-tests for prompter function change (#8693)

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

* fix: asana bug fixes (#8692)

* fix: asana bug fixes

* chore: removes commmented code

* feat: overrides uniformity accross all the categories (#8695)

* feat: overrides uniformity accross all the categories

* chore: remove unneeded dependency

* fix: apply override unformity to root-stack

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* Ext overrides3 storage headless migrate (#8696)

* (fix) s3 cli-ux loop until permission selected

* (fix) storage unit-tests for prompter function change

* (fix) auto-migrate on headless s3 storage api

* (fix) enable migration in headless only if required

* (fix) unit-test failing because of path incorrect

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

* Ext overrides3 fix auth import s3 add (#8704)

* (fix) add missing logic to validate auth requirements in storage

* (fix) check for import auth

* (fix) auth unit-tests couldnt find getImportedAuthProperties

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

* fix: fix configure project and custom policies api containers (#8703)

* feat: add default descriptions to cfn templates for metrics tracking (#8702)

* feat: add default descriptions to cfn temppaltes for metrics tracking

* test: fix unit tests

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: does not create build for ll (#8706)

* test: fixing DDB E2E tests (#8707)

* test: fixing DDB E2E tests

* test: fix ddb import e2e test

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: auth e2e tests (#8708)

Co-authored-by: Ammar <56042290+ammarkarachi@users.noreply.github.com>

* Consolidate types headless (#8698)

* fix: consolidate types and auto migrate

* fix: changed package name to extensiblity

* fix: address comments

* feat: consolidate dependent resource types in backend/ (#8709)

* feat: consolidate dependent resource types in backend/

* chore: fix build.test.ts unit test

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* test: fix ddb import e2e tests (#8711)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* Ext overrides3 fix storagee2es (#8715)

* (fix) validate bucket name for headless

* (fix) s3 e2e tests blocking because of singleSelect and multiSelect failure

* (fix) s3 e2e tests blocking because of extraneous function selection prompt

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

* feat: change override.ts file to override.ts.sample in resources/ for pkg CLI to work (#8716)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: auth issue in export tests (#8710)

* fix: auth issue in export tests

* fix: address comments

* Root stack fix (#8717)

* fix: disable root stack update check

* fix: root stack hash and helper package versions

* (fix) graphql-schema predictions migration failure because of missing… (#8718)

* (fix) graphql-schema predictions migration failure because of missing storage

* (fix/cleanup) changed default for storage trigger to N, removed extraneous keydown

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

* fix: remove depending on conditional output variables from stacks (#8719)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: rebase conflicts

* fix: auth e2e fixes

* feat(amplify-cli-core): allow * in account and region in arn for custom policies (#8722)

* fix(cli): fixed export pull command line (#8725)

* fix: headless migrate auth (#8735)

* Ext overrides4 storage e2e (#8740)

* (fix) timeout in add lambda when lambda exists

* (fix) override DDB StreamSpecification fails because of missing CFN

* (fix) storage-5 build-overrides hang fix

* (fix) storage-5.ts

* (fix) help missing for storage overrides

* (fix) storage_migration_update hangs

* (fix) remove unintended ignoring of tests

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

* fix: migration test fixes (#8742)

* fix: hooks + hosting e2e (#8743)

* fix: hooks + hosting e2e

* fix: address comments

* test: update ignore pattern for build-tests, fix import ddb tests (#8744)

* test(amplify-migration-tests): path fix for override-root file (#8745)

* fix: update custom cdk seleton templates + format override skeleton file (#8752)

* fix: update custom cdk seleton tempaltes + format override skeleton file

* chore: revert package version chnge for cli-core

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* (fix) storage add walkthrough hanging in integ test (#8746)

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

* fix(amplify-category-auth): fixed the openId Connect proovider auth (#8753)

* fix: fixed import_auth test (#8755)

* fix: fixes auth migration e2e (#8756)

* fix: fixes auth migration e2e

* fix: signIn SignOut test

* fix: remove no-override check for category transformations (#8765)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: init override test fix (#8768)

* fix: amplify meta output for imported ddb, type fixes (#8767)

* (fix) amplify status crashes when auth is legacy (#8769)

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

* fix: build resources on pull even with no override flag passed + update skeleton package.json (#8771)

* fix: build resources on pull even with no override flag passed

* chore: update package versions of ext helper in skeleton package.json + ci/cd fix

* fix: build resource during initialzing an env

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: generate dynamic amplify resource types before building cdk code (#8778)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: hosting fix and changelog added (#8780)

* feat: FF for override stacks (#8228)

* feat: root stack override (#8276)

* 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 (#8298)

* feat: ddb overrides and flow refactor

* 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: ddb walkthrough refactor and override tests (#8364)

* chore: overrides ddb and walthrough refactor tests

* chore: address pr comments

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* feat: Auth refactor to  use cdk, eliminate EJS, overrides functionality (#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

* (feat) Override for S3 - ( includues refactor s3-walkthrough and migrate) (#8383)

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

* fix: fixes dependsOn parameter and auth migration test (#8480)

* fix: dependsOn fix

* chore: address comments

* chore: remove JSON parsing

* fix: default migration set to true

* fix: added public access to scoped packages (#8485)

* fix: adds typescript json dependency (#8487)

* fix: enable scoped packages in plugin platform (#8492)

* fix: adds userPool resourceName instead of authResource (#8497)

* fix: adds userPool resourceName instead of authResource

* fix: roleName in userPool groups

* (bug-fix/reconcile-headless) remove groupList from userInputs, fix single-group, deploy errors (#8501)

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

* fix: userPool group template fixes (#8515)

* fix: template and naming fixed

* fix: addressed comments

* (fix) Call Auth migration from S3 migration for all auth resources in S3 (#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>

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

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

* (fix) amplify override storage fails with missing tsconfig.json (#8556)

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

* fix: parameters file path and updates cloud backend with build (#8564)

* fix: latest changes

* feat: define custom resources with CDK or CFN (#8590)

* feat: define custom resources with CDK or CFN

* chore: fix lint errors

* chore: address API review and PR feedback

* chore: fix unit test

* fix: update skeleton CDK sample app based on API-Review

* chore: fix build errors

* chore: fix unit tests

* chore: addressed PR review comments

* chore: update uuid package version

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* chore: add public access for custom package

* fix: add npmignore to custom resource package and update archiver (#8596)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: alias attr bug and use enabled mfa

* fix: tsc global install error

* fix: broken unit tests

* fix: bug fixes in external auth enable

* test: unit tests + e2e tests for custom resources (#8602)

* test: unit tests for custom resources

* chore: remove empty unit test file

* fix: add all required types in override-helper package

* chore: update override helper dependencies

* test: unit test for dependency management utils

* test: add coverage data and add more unit tests for cfn dependency management

* test: add E2E tests for custom resources

* chore: address PR review comments

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: admin UI test

* feat: add get project info helper to overrides helper package (#8620)

* feat: add get project info helper to overrides helper package

* chore: address PR feedback

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* chore: update skeleton package json override dependencies (#8641)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* feat: amplify export

* Refactor/packaging (#8547)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* Feat: export pull front end (#8488)

* feat: export (#8486)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* feat: wip export pull

* feat: amplify export pull to genereate front end config files

* fix: merge fixes from export

* refactor: removed unused

* fix: some language fixes and bug fix with notification

* test: e2e tests

* test: codecov and test fix

* Refactor/packaging (#8547)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* Feat: export pull front end (#8488)

* feat: export (#8486)

* feat(amplify-provider-awscloudformation): refactor of the exporting resources

* feat(amplify-provider-awscloudformation): refactored export to write files to external path

* refactor: clean up

* refactor: remove unused

* fix: mispelled url

* feat: fall back on push globing and template url

* feat: export

* feat: modify generation of lambda layer version content

* fix(amplify-category-function): lambda layers filter stacks

* feat: added command line for export

* test(amplify-provider-awscloudformation): added tests for export resources

* perf: removed unused

* refactor: removed unused

* fix: make the tags file pascal case

* docs(amplify-provider-awscloudformation): added some documentation

* feat(amplify-provider-awscloudformation): added warning and folder perms

* fix: check in constants change

* refactor: addressing PR feedback

* refactor: es6 export

* feat: minor changes for integration testing

* refactor: pr comments

* fix: cleared commented out code removed backup

* ci: revert config file to main

* feat: wip export pull

* feat: amplify export pull to genereate front end config files

* fix: merge fixes from export

* refactor: removed unused

* fix: some language fixes and bug fix with notification

* test: e2e tests

* test: codecov and test fix

* feat: export + override reconciled

* test: fixed test because of bad merge

* fix: added back conditional conditional rebuild

* refactor(amplify-provider-awscloudformation): renamed the files to fit

* test: fixed idp add storage test

* test: fixes type import

* feat: extensibility for REST APIs (#8598)

* fix: ext overrides2 storage-headless and predictions (#8622)

* fix: broken path on build-override

* fix: pushing multiple APIs at a time (#8663)

* fix: capitalization for filter, e2e test (#8667)

* fix: capitalization for filter

* test: fix prompt wait text

* fix: test fixes (#8647)

* (fix) add predictions + advanced mode + identifyEntity fails because … (#8658)

* (fix) add predictions + advanced mode + identifyEntity fails because predictions cfn is not created

* (fix) fixed regression for pred update + storage

* (fix) plugininfo integ tests

* (fix) storage e2e tests 'Auth' to 'Authenticated'

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

* fix: stack generation logic when multiple paths ref same Lambda (#8673)

* Apigw revert (#8690)

* Revert "fix: stack generation logic when multiple paths ref same Lambda (#8673)"

This reverts commit fdbab02.

* Revert "fix: capitalization for filter, e2e test (#8667)"

This reverts commit e4f83fc.

* Revert "fix: pushing multiple APIs at a time (#8663)"

This reverts commit 4ff68bb.

* Revert "fix: broken path on build-override"

This reverts commit 712c043.

* Revert "feat: extensibility for REST APIs (#8598)"

This reverts commit 9822117.

* (fix) [storage-1.test]init a project and add S3 bucket with user pool groups and then update S3 bucket to add trigger (#8691)

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

* (fix) storage unit-tests for prompter function change (#8693)

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

* fix: asana bug fixes (#8692)

* fix: asana bug fixes

* chore: removes commmented code

* feat: overrides uniformity accross all the categories (#8695)

* feat: overrides uniformity accross all the categories

* chore: remove unneeded dependency

* fix: apply override unformity to root-stack

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* Ext overrides3 storage headless migrate (#8696)

* (fix) s3 cli-ux loop until permission selected

* (fix) storage unit-tests for prompter function change

* (fix) auto-migrate on headless s3 storage api

* (fix) enable migration in headless only if required

* (fix) unit-test failing because of path incorrect

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

* Ext overrides3 fix auth import s3 add (#8704)

* (fix) add missing logic to validate auth requirements in storage

* (fix) check for import auth

* (fix) auth unit-tests couldnt find getImportedAuthProperties

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

* fix: fix configure project and custom policies api containers (#8703)

* feat: add default descriptions to cfn templates for metrics tracking (#8702)

* feat: add default descriptions to cfn temppaltes for metrics tracking

* test: fix unit tests

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: does not create build for ll (#8706)

* test: fixing DDB E2E tests (#8707)

* test: fixing DDB E2E tests

* test: fix ddb import e2e test

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: auth e2e tests (#8708)

Co-authored-by: Ammar <56042290+ammarkarachi@users.noreply.github.com>

* Consolidate types headless (#8698)

* fix: consolidate types and auto migrate

* fix: changed package name to extensiblity

* fix: address comments

* feat: consolidate dependent resource types in backend/ (#8709)

* feat: consolidate dependent resource types in backend/

* chore: fix build.test.ts unit test

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* test: fix ddb import e2e tests (#8711)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* Ext overrides3 fix storagee2es (#8715)

* (fix) validate bucket name for headless

* (fix) s3 e2e tests blocking because of singleSelect and multiSelect failure

* (fix) s3 e2e tests blocking because of extraneous function selection prompt

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

* feat: change override.ts file to override.ts.sample in resources/ for pkg CLI to work (#8716)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: auth issue in export tests (#8710)

* fix: auth issue in export tests

* fix: address comments

* Root stack fix (#8717)

* fix: disable root stack update check

* fix: root stack hash and helper package versions

* (fix) graphql-schema predictions migration failure because of missing… (#8718)

* (fix) graphql-schema predictions migration failure because of missing storage

* (fix/cleanup) changed default for storage trigger to N, removed extraneous keydown

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

* fix: remove depending on conditional output variables from stacks (#8719)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: rebase conflicts

* fix: auth e2e fixes

* feat(amplify-cli-core): allow * in account and region in arn for custom policies (#8722)

* fix(cli): fixed export pull command line (#8725)

* fix: headless migrate auth (#8735)

* Ext overrides4 storage e2e (#8740)

* (fix) timeout in add lambda when lambda exists

* (fix) override DDB StreamSpecification fails because of missing CFN

* (fix) storage-5 build-overrides hang fix

* (fix) storage-5.ts

* (fix) help missing for storage overrides

* (fix) storage_migration_update hangs

* (fix) remove unintended ignoring of tests

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

* fix: migration test fixes (#8742)

* fix: hooks + hosting e2e (#8743)

* fix: hooks + hosting e2e

* fix: address comments

* test: update ignore pattern for build-tests, fix import ddb tests (#8744)

* test(amplify-migration-tests): path fix for override-root file (#8745)

* fix: update custom cdk seleton templates + format override skeleton file (#8752)

* fix: update custom cdk seleton tempaltes + format override skeleton file

* chore: revert package version chnge for cli-core

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* (fix) storage add walkthrough hanging in integ test (#8746)

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

* fix(amplify-category-auth): fixed the openId Connect proovider auth (#8753)

* fix: fixed import_auth test (#8755)

* fix: fixes auth migration e2e (#8756)

* fix: fixes auth migration e2e

* fix: signIn SignOut test

* fix: remove no-override check for category transformations (#8765)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: init override test fix (#8768)

* fix: amplify meta output for imported ddb, type fixes (#8767)

* (fix) amplify status crashes when auth is legacy (#8769)

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

* fix: build resources on pull even with no override flag passed + update skeleton package.json (#8771)

* fix: build resources on pull even with no override flag passed

* chore: update package versions of ext helper in skeleton package.json + ci/cd fix

* fix: build resource during initialzing an env

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: generate dynamic amplify resource types before building cdk code (#8778)

Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>

* fix: hosting fix and changelog added (#8780)

* Fix/export pull e2e 2 (#8785)

* test(amplify-e2e-tests): adding a setting

* test(amplify-e2e-core): testlambda with latest codebase

Co-authored-by: akshbhu <39866697+akshbhu@users.noreply.github.com>
Co-authored-by: Kaustav Ghosh <kaustav.ghosh19@gmail.com>
Co-authored-by: Ghosh <kaustavg@3c22fb229ff6.ant.amazon.com>
Co-authored-by: Sachin Panemangalore <sachinrp@amazon.com>
Co-authored-by: Akshay <akshayupadhyay3@gmail.com>
Co-authored-by: Ammar <56042290+ammarkarachi@users.noreply.github.com>
Co-authored-by: John Hockett <jhockett@users.noreply.github.com>
Co-authored-by: jhockett <johocke@amazon.com>
sachscode added a commit to sachscode/amplify-cli that referenced this pull request Nov 10, 2021
sachscode added a commit to sachscode/amplify-cli that referenced this pull request Nov 11, 2021
akshbhu pushed a commit to akshbhu/amplify-cli that referenced this pull request Nov 11, 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.

4 participants