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

fix: migration of Admin Queries on override command #9031

Merged

Conversation

jhockett
Copy link
Contributor

@jhockett jhockett commented Nov 22, 2021

Description of changes

Migration prompt was being asked twice, and not properly handled for Admin Queries when running amplify override api.

Added description to deployment match current behavior.

Issue #, if available

Description of how you validated changes

Manual testing, apigw-ext-migration.test.ts passes, api category unit tests pass

Checklist

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

@jhockett jhockett requested a review from a team as a code owner November 22, 2021 21:22
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

Copy link
Contributor

@sachscode sachscode left a comment

Choose a reason for hiding this comment

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

LGTM just few nits

@ammarkarachi ammarkarachi merged commit dcaeeab into aws-amplify:api-ext-rebase-3 Nov 22, 2021
ammarkarachi added a commit that referenced this pull request Nov 23, 2021
* Api ext rebase 3 (#9001)

* feat: extensibility for Amplify API  (#8954)

* feat: REST API extensibility (#8958)

* fix: rebase fixes and bugs (#8960)

* fix: rebase fixes and bugs

* fix: service walkthrough call for appsync

* fix: enable skeleton generation transformerFF is false (#8967)

* feat: add min / max selection to prompter.pick (#8971)

* fix: error handling, various bugs (#8976)

* fix: tsconfig changes and renames (#8975)

* fix: asana bug fixes

* chore: allow js to false

* fix: migration flow and cfn params when user pool groups are present, types (#8981)

* fix: cfn parameters when user pool groups are present

* fix: policy generation for user pool groups

* fix: update types

* test: fix project deletion even if meta validation fails

* fix: rest iam policy roles array, bump ext helper types version (#8983)

* fix: headless api migration (#8992)

* fix: schema path inconsistencies, guest permissions, e2e

* fix: api migration version e2es (#9000)

Co-authored-by: John Hockett <[email protected]>
Co-authored-by: Edward Foyle <[email protected]>
Co-authored-by: jhockett <[email protected]>

* fix: add missing ref call during rest stack generation, path casing (#9002)

* fix: updates schema path on update api (#9005)

* fix: api7 and api-migration tests (#9006)

* fix: updates resource to resources and remove green ticks (#9007)

* fix: overriding multiple userPoolGroups, ext helper type, lambda cfn (#9008)

* fix: multiple userPoolGroups overwriting eachother

* chore: update exported ext helper type

* fix: lambda permissions not being generated

* test: moved migration test and fixed the workflow (#9010)

* test: moved migration test and fixed the workflow

* test: remove jest settimeout

Co-authored-by: AmmarKarachi <[email protected]>

* fix: add missing property on path in cfn (#9011)

* test: fixed integ test walkthrough (#9012)

Co-authored-by: AmmarKarachi <[email protected]>

* test: separate migration test helper from e2e (#9014)

* fix: prediction migration test fix (#9015)

* test: fix api_5.test.ts (#9017)

* fix: single userpoolgroup name is iterated instead of being used (#9020)

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

* test: add missing option to e2e test (#9024)

* fix: bucket parameters fetch logic (#9027)

* fix: bucket parameters fetch logic

* fix: address comments

* fix: bucket parameters fetch logic (#9028)

* fix: multiselect returns array when autoselecting (#9029)

* fix: APIGW overrides package.json (#9032)

* fix: package json dependencies

* chore: new line at end of package.json

* fix: migration of Admin Queries on override command (#9031)

* fix: migration of Admin Queries on override command

* fix: address feedback

* feat: descoped http and functions override (#9035)

* fix: address feedback (#9038)

* fix: addressed comments (#9039)

* fix: addressed comments

* Update packages/amplify-provider-awscloudformation/src/download-api-models.ts

Co-authored-by: Ammar <[email protected]>

Co-authored-by: Ammar <[email protected]>

Co-authored-by: akshbhu <[email protected]>
Co-authored-by: John Hockett <[email protected]>
Co-authored-by: Edward Foyle <[email protected]>
Co-authored-by: jhockett <[email protected]>
Co-authored-by: AmmarKarachi <[email protected]>
Co-authored-by: Sachin Panemangalore <[email protected]>
Co-authored-by: Sachin Panemangalore <[email protected]>
@github-actions
Copy link

👋 Hi, this pull request was referenced in the v7.5.0 release!

Check out the release notes here https://github.com/aws-amplify/amplify-cli/releases/tag/v7.5.0.

@github-actions github-actions bot added the referenced-in-release Issues referenced in a published release changelog label Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
referenced-in-release Issues referenced in a published release changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants