Adding support for custom VPC endpoints when using AWS Bedrock models #3947

kcwhite · 2025-05-25T01:14:02Z

Related GitHub Issue

Closes: #3492

Description

This PR adds support for custom VPC endpoints when using AWS Bedrock models. This feature is particularly important for corporate customers who need to keep all LLM transactions secure inside their firewall.

Implementation details:

Added a new configuration option in the Bedrock provider settings to specify a custom endpoint URL
Updated the AWS Bedrock client initialization to use the custom endpoint when provided
Maintained backward compatibility for users who don't specify a custom endpoint
Added appropriate validation for the endpoint URL format

Test Procedure

Unit Tests: Added tests for the Bedrock provider with custom endpoints
- Tests verify that the client is properly configured with the custom endpoint
- Tests confirm backward compatibility when no endpoint is specified
Manual Testing:
- Configure Roo Code with AWS Bedrock provider
- Add a custom VPC endpoint URL in the settings
- Verify that requests are routed through the specified endpoint
- Verify that error handling works correctly for invalid endpoints
- Verify text box disappears when "Use custom VPC endpoint" checkbox is unchecked
- Verify that requests fail when "Use custom VPC endpoint" option is disabled and other settings are unchanged
- Verify that the previous custom VPC endpoint URL populates the text box when re-enabling the option
- Verify that requests succeed after re-enabling the option
Verification:
- All tests pass as confirmed by running pnpm test
- The feature has been tested with actual AWS VPC endpoints in a corporate environment

Type of Change

🐛 Bug Fix: Non-breaking change that fixes an issue.
✨ New Feature: Non-breaking change that adds functionality.
💥 Breaking Change: Fix or feature that would cause existing functionality to not work as expected.
♻️ Refactor: Code change that neither fixes a bug nor adds a feature.
💅 Style: Changes that do not affect the meaning of the code (white-space, formatting, etc.).
📚 Documentation: Updates to documentation files.
⚙️ Build/CI: Changes to the build process or CI configuration.
🧹 Chore: Other changes that don't modify src or test files.

Pre-Submission Checklist

Screenshots / Videos

I have included 2 screenshots

Documentation Updates

Yes, documentation updates are required. The AWS Bedrock provider documentation should be updated to include information about the new custom VPC endpoint option, including format requirements and use cases.

Additional Notes

This feature has been requested by several enterprise customers who need to use Roo Code with their secure AWS environments. It enables them to comply with their internal security policies while still leveraging the power of AWS Bedrock models through Roo Code.

Get in Touch

Discord: chuck_33620

Important

Adds support for custom VPC endpoints in AWS Bedrock models with UI and backend changes, ensuring backward compatibility and comprehensive test coverage.

Behavior:
- Adds support for custom VPC endpoints in AWS Bedrock models via awsBedrockEndpoint and awsBedrockEndpointEnabled in ProviderSettings.
- Updates AwsBedrockHandler in bedrock.ts to use custom endpoint if enabled.
- Maintains backward compatibility if no custom endpoint is specified.
UI:
- Adds checkbox and text field for VPC endpoint configuration in Bedrock.tsx.
- Updates UI state based on awsBedrockEndpointEnabled.
Tests:
- Adds unit tests in bedrock-vpc-endpoint.test.ts to validate endpoint configuration logic.
- Adds UI tests in Bedrock.test.tsx to verify checkbox and text field behavior.
Types:
- Updates ProviderSettings in roo-code.d.ts and types.ts to include new fields for VPC endpoint configuration.

^{This description was created by}^{for 617e68e. You can customize this summary. It will automatically update as commits are pushed.}

- Changed checkbox label to 'Use custom VPC endpoint' to match Cline - Fixed conditional rendering to show text field when checkbox is checked - Ensured placeholder text appears correctly - Maintained proper styling for consistency

- Added state variable to track checkbox selection - Fixed conditional rendering to show/hide text field based on checkbox state - Maintained proper styling and placeholder text

…ling - Fixed checkbox onChange handler to accept boolean directly instead of event object - Added unit tests to verify the behavior - Maintained proper styling and placeholder text

- Removed left margin from text field to align with checkbox - Maintained proper styling and placeholder text

- Added awsBedrockEndpointEnabled field to schema - Modified Bedrock provider to check both endpoint URL and enabled flag - Updated UI to preserve endpoint URL when checkbox is toggled - Maintained proper alignment with checkbox

… regenerate types

…Bedrock tests

daniel-lxs · 2025-05-31T00:23:19Z

LGTM!

Thank you!

mrubens · 2025-05-31T00:29:20Z

webview-ui/src/components/settings/providers/Bedrock.tsx

+					setAwsEndpointSelected(isChecked)
+					setApiConfigurationField("awsBedrockEndpointEnabled", isChecked)
+				}}>
+				Use custom VPC endpoint


Can you internationalize this string please?

mrubens · 2025-05-31T00:29:49Z

webview-ui/src/components/settings/providers/Bedrock.tsx

+						style={{ width: "100%", marginTop: 3, marginBottom: 5 }}
+						type="url"
+						onInput={handleInputChange("awsBedrockEndpoint")}
+						placeholder="Enter VPC Endpoint URL (optional)"


mrubens · 2025-05-31T00:30:02Z

webview-ui/src/components/settings/providers/Bedrock.tsx

+						data-testid="vpc-endpoint-input"
+					/>
+					<div className="text-sm text-vscode-descriptionForeground ml-6 mt-1 mb-3">
+						Examples:


And this

Sorry Matt, bit of a noob contributor. Are you asking me or Daniel to internationalize the strings?

@kcwhite I can handle this if you want, sorry for not noticing the missing translations, I'll be more careful

Sounds good, thx

@kcwhite I can handle this if you want, sorry for not noticing the missing translations, I'll be more careful

No problem, I'll see if I can configure Ellipsis to try to catch this as well.

…e UI

kcwhite · 2025-05-31T00:49:36Z

Ok, I’m just fixing s failing UI test right now, will push soon Get Outlook for iOS<https://aka.ms/o0ukef>

________________________________ From: Daniel ***@***.***> Sent: Friday, May 30, 2025 6:42:23 PM To: RooCodeInc/Roo-Code ***@***.***> Cc: kcwhite ***@***.***>; Mention ***@***.***> Subject: Re: [RooCodeInc/Roo-Code] Adding support for custom VPC endpoints when using AWS Bedrock models (PR #3947) @daniel-lxs commented on this pull request.

________________________________ In webview-ui/src/components/settings/providers/Bedrock.tsx<#3947 (comment)>:

+ setApiConfigurationField("awsBedrockEndpointEnabled", isChecked)

+ }}> + Use custom VPC endpoint + </Checkbox> + {awsEndpointSelected && ( + <> + <VSCodeTextField + value={apiConfiguration?.awsBedrockEndpoint || ""} + style={{ width: "100%", marginTop: 3, marginBottom: 5 }} + type="url" + onInput={handleInputChange("awsBedrockEndpoint")} + placeholder="Enter VPC Endpoint URL (optional)" + data-testid="vpc-endpoint-input" + /> + <div className="text-sm text-vscode-descriptionForeground ml-6 mt-1 mb-3"> + Examples: @kcwhite<https://github.com/kcwhite> I can handle this if you want — Reply to this email directly, view it on GitHub<#3947 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AA5C3QOCGKIAQUSUVHV6G733BD3G7AVCNFSM6AAAAAB53EY77SVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMZDQOBSHE2TQOBQGM>. You are receiving this because you were mentioned.Message ID: ***@***.***>

… handling

…webview-ui (RooCodeInc#3947) * Fix linter warnings in the webview (part 2) Replace protobus calls using object literals to use Message.create({...}) Fix incorrect property name detected after this change in webview-ui/src/components/settings/SettingsView.tsx Optimised imports in vscode. * formatting * feat(lint): Add custom ESLint rules for protobuf type checking Add two custom ESLint rules to enforce proper usage patterns when creating protobuf objects. Using .create() to build protobufs ensures that the protobuf is type checked when it is created. Protobufs created using object literals are not type checked, which can lead to subtle bugs and type mismatches. The linter rules detect when protobufs are created without using .create() or .fromPartial(). - no-protobuf-object-literals: Enforces the use of `.create()` or `.fromPartial()` methods instead of object literals when creating protobuf types. ``` /Users/sjf/cline/src/shared/proto-conversions/state/chat-settings-conversion.ts 9:9 warning Use ChatSettings.create() or ChatSettings.fromPartial() instead of object literal for protobuf type Found: return { mode: chatSettings.mode === "plan" ? PlanActMode.PLAN : PlanActMode.ACT, preferredLanguage: chatSettings.preferredLanguage, openAiReasoningEffort: chatSettings.openAIReasoningEffort, } Suggestion: ChatSettings.create({ mode: chatSettings.mode === "plan" ? PlanActMode.PLAN : PlanActMode.ACT, preferredLanguage: chatSettings.preferredLanguage, openAiReasoningEffort: chatSettings.openAIReasoningEffort, }) ``` - no-grpc-client-object-literals: Enforces proper protobuf creation for gRPC service client parameters. This needs a separate rule because the type signatures of the ServiceClients methods are too generic to be detected by the previous rule. ``` /Users/sjf/cline/webview-ui/src/components/mcp/configuration/tabs/add-server/AddRemoteServerForm.tsx 41:62 warning Use the appropriate protobuf .create() or .fromPartial() method instead of object literal for gRPC client parameters. Found: McpServiceClient.addRemoteMcpServer({ serverName: serverName.trim(), serverUrl: serverUrl.trim(), }) ``` These rules help maintain code quality by enforcing consistent patterns for working with protocol buffers throughout the codebase, reducing potential runtime errors from improper message construction. * Update test * Add custom eslint rules to new webview-ui config * Only include webview grpc ServiceClient check * Fix lint errors * formatting * Update package.json * Make the no-grpc-client-object-literals linter rule an error for the webview-ui Fix the last occurrence of this issue. * formatting

Kevin White and others added 23 commits May 11, 2025 03:11

feat: Add custom VPC endpoint support for AWS Bedrock

cc01dd1

fix: Fix TypeScript error in Bedrock.tsx

91b5557

fix: Update VPC endpoint UI to match Cline's implementation

3d3433b

Fix AWS Bedrock VPC endpoint UI implementation

019f2c6

- Changed checkbox label to 'Use custom VPC endpoint' to match Cline - Fixed conditional rendering to show text field when checkbox is checked - Ensured placeholder text appears correctly - Maintained proper styling for consistency

Fix AWS Bedrock VPC endpoint UI implementation to match Cline exactly

941dcdf

- Added state variable to track checkbox selection - Fixed conditional rendering to show/hide text field based on checkbox state - Maintained proper styling and placeholder text

Fix AWS Bedrock VPC endpoint UI implementation with proper event hand…

5fcef88

…ling - Fixed checkbox onChange handler to accept boolean directly instead of event object - Added unit tests to verify the behavior - Maintained proper styling and placeholder text

Update Bedrock VPC endpoint tests with proper test IDs

cae91f2

Improve AWS Bedrock VPC endpoint text field alignment

8e9c4fa

- Removed left margin from text field to align with checkbox - Maintained proper styling and placeholder text

Implement AWS Bedrock Custom VPC Endpoint functionality

1b16465

Merge remote-tracking branch 'origin/main' into bedrock-custom-vpc

06e28fa

Merge branch 'main' into bedrock-custom-vpc

8f4d7c3

Merge remote-tracking branch 'my-fork/bedrock-custom-vpc'

c5763b2

fix: update ApiConfiguration to ProviderSettings in Bedrock tests and…

c9f7980

… regenerate types

fix: update all instances of ApiConfiguration to ProviderSettings in …

eb42c37

…Bedrock tests

Merge branch 'refs/heads/main' into my-main

77328cf

Merge branch 'RooCodeInc:main' into main

e00780a

Merge branch 'main' into my-main

5cae994

Merge remote-tracking branch 'my-fork/main' into my-main

03d5c03

Fixed broken unit test

a74b6fd

Merge branch 'RooCodeInc:main' into main

0b0ea16

Merge remote-tracking branch 'my-fork/main' into my-main

8bd3701

Add changeset for Bedrock VPC endpoint support

617e68e

kcwhite requested review from cte and mrubens as code owners May 25, 2025 01:14

github-project-automation bot added this to Roo Code Roadmap and Roo Code Roadmap May 25, 2025

github-project-automation bot moved this to New in Roo Code Roadmap May 25, 2025

Merge branch 'RooCodeInc:main' into main

57a6fdf

Kevin White added 2 commits May 30, 2025 17:08

Bug fixes

fae7a6e

Fixed failing tests

42be6dc

daniel-lxs moved this from PR [Changes Requested] to PR [Needs Prelim Review] in Roo Code Roadmap May 31, 2025

daniel-lxs added PR - Needs Preliminary Review and removed PR - Changes Requested labels May 31, 2025

Add example URLs to Bedrock VPC endpoint section and update tests

f32f146

daniel-lxs moved this from PR [Needs Prelim Review] to PR [Needs Review] in Roo Code Roadmap May 31, 2025

daniel-lxs added the PR - Needs Review label May 31, 2025

mrubens reviewed May 31, 2025

View reviewed changes

Fix truncated test assertion in Bedrock.test.tsx that was breaking th…

01c7d2f

…e UI

daniel-lxs moved this from PR [Needs Review] to PR [Changes Requested] in Roo Code Roadmap May 31, 2025

daniel-lxs added PR - Changes Requested and removed PR - Needs Preliminary Review PR - Needs Review labels May 31, 2025

Refactor mock components in Bedrock.test.tsx for improved data-testid…

c5d2bf4

… handling

kcwhite requested review from daniel-lxs and mrubens May 31, 2025 01:35

kcwhite and others added 3 commits May 30, 2025 19:41

Merge branch 'RooCodeInc:main' into main

1ad74a4

feat(i18n): add VPC endpoint translations for AWS Bedrock settings

e2f12af

test: update Bedrock component tests for internationalized strings

afb7663

mrubens approved these changes May 31, 2025

View reviewed changes

dosubot bot added the lgtm This PR has been approved by a maintainer label May 31, 2025

mrubens merged commit a4c91c6 into RooCodeInc:main May 31, 2025
11 checks passed

github-project-automation bot moved this from PR [Changes Requested] to Done in Roo Code Roadmap May 31, 2025

github-project-automation bot moved this from New to Done in Roo Code Roadmap May 31, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Adding support for custom VPC endpoints when using AWS Bedrock models #3947

Adding support for custom VPC endpoints when using AWS Bedrock models #3947

Uh oh!

kcwhite commented May 25, 2025 •

edited by ellipsis-dev bot

Loading

Uh oh!

daniel-lxs commented May 31, 2025

Uh oh!

mrubens May 31, 2025

Uh oh!

mrubens May 31, 2025

Uh oh!

mrubens May 31, 2025

Uh oh!

kcwhite May 31, 2025

Uh oh!

daniel-lxs May 31, 2025 •

edited

Loading

Uh oh!

kcwhite May 31, 2025

Uh oh!

mrubens May 31, 2025

Uh oh!

kcwhite commented May 31, 2025 via email

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Adding support for custom VPC endpoints when using AWS Bedrock models #3947

Adding support for custom VPC endpoints when using AWS Bedrock models #3947

Uh oh!

Conversation

kcwhite commented May 25, 2025 • edited by ellipsis-dev bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Related GitHub Issue

Description

Test Procedure

Type of Change

Pre-Submission Checklist

Screenshots / Videos

Documentation Updates

Additional Notes

Get in Touch

Uh oh!

daniel-lxs commented May 31, 2025

Uh oh!

mrubens May 31, 2025

Choose a reason for hiding this comment

Uh oh!

mrubens May 31, 2025

Choose a reason for hiding this comment

Uh oh!

mrubens May 31, 2025

Choose a reason for hiding this comment

Uh oh!

kcwhite May 31, 2025

Choose a reason for hiding this comment

Uh oh!

daniel-lxs May 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kcwhite May 31, 2025

Choose a reason for hiding this comment

Uh oh!

mrubens May 31, 2025

Choose a reason for hiding this comment

Uh oh!

kcwhite commented May 31, 2025 via email

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

kcwhite commented May 25, 2025 •

edited by ellipsis-dev bot

Loading

daniel-lxs May 31, 2025 •

edited

Loading