fix(cli): generate admin queries auth wiring - #14909
Merged
sharonyajain merged 2 commits intoSep 7, 2026
Merged
Conversation
2 tasks
Require canonical AdminQueries dependencies before generating auth. Generate IAM policies only for verified metadata. Build Gen1 user pool ARNs with CDK's partition-aware formatter. Warn when the referenced pool is unavailable. Cover prefix collisions, absent auth, missing pool IDs, and full output snapshots. Validate with the cli-internal build and full unit suite. --- Prompt: do it. make sure you verify and test if its all working by reproducing the error and the patch before pushing and then comment and reply whatever is necessary you have my approval
sharonyajain
self-requested a review
September 7, 2026 12:15
sharonyajain
approved these changes
Sep 7, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Fixes #14757.
When Gen1 AdminQueries REST APIs are generated for Gen2 migration, the generated REST API resource needs to preserve the Cognito behavior that AdminQueries depends on. This updates the REST API generator to detect AdminQueries APIs and emit the missing pieces:
OPTIONSAuthorizationheaderaws.cognito.signin.user.adminscopeANYmethods on the root/proxy resources using the Cognito method optionsRegular REST API generation is left unchanged unless the API is
AdminQueriesor uses anAdminQueries*backing function.Description of how you validated changes
PATH="$PWD/node_modules/.bin:$PATH" corepack yarn workspace @aws-amplify/cli-internal test src/__tests__/commands/gen2-migration/generate/amplify/rest-api/rest-api.generator.test.ts --runInBand --no-coveragePATH="$PWD/node_modules/.bin:$PATH" corepack yarn prettier --check packages/amplify-cli/src/commands/gen2-migration/generate/amplify/rest-api/rest-api.generator.ts packages/amplify-cli/src/commands/gen2-migration/generate/amplify/rest-api/rest-api.renderer.ts packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/rest-api/rest-api.generator.test.tsPATH="$PWD/node_modules/.bin:$PATH" corepack yarn eslint packages/amplify-cli/src/commands/gen2-migration/generate/amplify/rest-api/rest-api.generator.ts packages/amplify-cli/src/commands/gen2-migration/generate/amplify/rest-api/rest-api.renderer.ts packages/amplify-cli/src/__tests__/commands/gen2-migration/generate/amplify/rest-api/rest-api.generator.test.ts --max-warnings=1500git diff --checkPATH="$PWD/node_modules/.bin:$PATH" corepack yarn sanitize-migration-appsPATH="$PWD/node_modules/.bin:$PATH" corepack yarn build-tests-changedNote: the first
build-tests-changedrun hit an NX daemon restart message; rerunning the same command succeeded. Local git hooks call a plainyarnbinary directly, while this environment exposes Yarn through Corepack, so commit/push hooks were bypassed after running the hook commands above manually.Checklist
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.