Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

Backport: Client Compatible Bedrock ARN handling (#62720)#62793

Merged
craigfurman merged 1 commit into
5.4.0from
backport-62720-to-5.4.0
May 20, 2024
Merged

Backport: Client Compatible Bedrock ARN handling (#62720)#62793
craigfurman merged 1 commit into
5.4.0from
backport-62720-to-5.4.0

Conversation

@RXminuS

@RXminuS RXminuS commented May 20, 2024

Copy link
Copy Markdown
Contributor
  • Improve Bedrock ARN handling

  • Fix up PR comments

(cherry picked from commit 6a7666c)

This PR ensures that the Bedrock Provisioned Capacity ARN model IDs are handled correctly.

Test plan

  • added unit tests
  • tested in sandbox environment

* Improve Bedrock ARN handling

* Fix up PR comments

(cherry picked from commit 6a7666c)
@RXminuS RXminuS requested a review from a team May 20, 2024 13:01
// Bedrock Model IDs can be in one of two forms:
// - A static model ID, e.g. "anthropic.claude-v2".
// - A model ID and ARN for provisioned capacity, e.g.
// "anthropic.claude-v2/arn:aws:bedrock:us-west-2:012345678901:provisioned-model/xxxxxxxx"

Check warning

Code scanning / Semgrep OSS

Semgrep Finding: security-semgrep-rules.semgrep-rules.secret.match-aws-arn

An AWS ARN has been detected. Please investigate to ensure it belongs to the appropriate customer and verify its validity.
Model string
// If the configuration is using provisioned capacity, this will
// contain the ARN of the model to use for making API calls.
// e.g. "anthropic.claude-v2/arn:aws:bedrock:us-west-2:012345678901:provisioned-model/xxxxxxxx"

Check warning

Code scanning / Semgrep OSS

Semgrep Finding: security-semgrep-rules.semgrep-rules.secret.match-aws-arn

An AWS ARN has been detected. Please investigate to ensure it belongs to the appropriate customer and verify its validity.

// Check for bedrock Provisioned Capacity ARNs which should instead be
// formatted like:
// "anthropic.claude-v2/arn:aws:bedrock:us-west-2:012345678901:provisioned-model/xxxxxxxx"

Check warning

Code scanning / Semgrep OSS

Semgrep Finding: security-semgrep-rules.semgrep-rules.secret.match-aws-arn

An AWS ARN has been detected. Please investigate to ensure it belongs to the appropriate customer and verify its validity.
@cla-bot cla-bot Bot added the cla-signed label May 20, 2024
@RXminuS RXminuS added the release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases label May 20, 2024
@craigfurman craigfurman merged commit c06fd8d into 5.4.0 May 20, 2024
@craigfurman craigfurman deleted the backport-62720-to-5.4.0 branch May 20, 2024 13:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

cla-signed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants