fix(tool): resolve HTTP gateways in add tool --gateway (#1658 follow-up)#1693
Merged
Merged
Conversation
…llow-up) `agentcore add tool --gateway <name>` only searched `resources.mcp.gateways` for the named gateway, missing HTTP gateways stored under `resources.gateways`. This is the same root cause as aws#1658 (fixed in aws#1663 for PolicyPrimitive), but the fix was not applied to `tool-action.ts`. Replace the manual lookup with the `findDeployedGateway()` helper introduced in aws#1663, which correctly merges both gateway storage locations and searches across all deployment targets. Fixes the scenario where a user deploys an HTTP gateway (e.g. with CUSTOM_JWT auth) and then cannot reference it by name in `add tool`.
Contributor
|
Claude Security Review: no high-confidence findings. (run) |
tejaskash
approved these changes
Jul 8, 2026
tejaskash
left a comment
Contributor
There was a problem hiding this comment.
LGTM, thank you for your contribution.
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
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.
agentcore add tool --gateway <name>only searchedresources.mcp.gatewaysfor the named gateway, missing HTTP gateways stored underresources.gateways. This is the same root cause as #1658 (fixed in #1663 for PolicyPrimitive), but the fix was not applied totool-action.ts.Replace the manual lookup with the
findDeployedGateway()helper introduced in #1663, which correctly merges both gateway storage locations and searches across all deployment targets.Fixes the scenario where a user deploys an HTTP gateway (e.g. with CUSTOM_JWT auth) and then cannot reference it by name in
add tool.Description
In
tool-action.tsimportsfindDeployedGatewayfromprimitives/deployed-gateways, uses it to resolve the gateway (replacing the code that searched deployedState.targets keys). Also adds a unit test tool-action.test.ts since that was missingRelated Issue
Closes #1692
Documentation PR
No PR (no doc changes)
Type of Change
Testing
How have you tested the change?
npm run test:unitandnpm run test:integnpm run typechecknpm run lintsrc/assets/, I rannpm run test:update-snapshotsand committed the updated snapshotsChecklist
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the
terms of your choice.