opensource/coder
3
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2026-09-24 15:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify aws-bedrock-region configuration (#26717)

Browse Source 
We currently have two possible sources of truth for the Bedrock region:

* `cfg.Region`, when explicitly provided (this also covers the case
where the UI parses the base URL and populates `cfg.Region`)
* the region resolved from the AWS environment

An explicitly configured region should always take precedence over the
environment-derived region.

I suggest implementing this resolution policy in the `NewAnthropic`
constructor so that, after initialization, there is a single source of
truth for the resolved region.
This commit is contained in:
Yevhenii Shcherbina
2026-06-26 08:53:15 -04:00
committed by GitHub
parent 98e1ce133c
commit e6c14203a4
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
aibridge/intercept/messages/base.go
+1 -12
View File
@@ -69,11 +69,6 @@ var bedrockSupportedBetaFlags = map[string]bool{
type BedrockRuntime struct {
Cfg aibconfig.AWSBedrock
Creds aws.CredentialsProvider
// ResolvedRegion is the region the AWS SDK resolved at construction (from
// the environment, shared config, or IMDS). It is used for request signing
// when Cfg.Region is empty, e.g. a custom base URL with the region supplied
// via AWS_REGION.
ResolvedRegion string
}
type interceptionBase struct {
@@ -298,14 +293,8 @@ func (i *interceptionBase) withAWSBedrockOptions(ctx context.Context) ([]option.
return nil, xerrors.Errorf("resolve AWS credentials: %w", err)
}
// Fall back to the SDK-resolved region (e.g. from AWS_REGION) when no
// explicit region is configured.
region := cfg.Region
if region == "" {
region = i.bedrock.ResolvedRegion
}
awsCfg := aws.Config{
Region: region,
Region: cfg.Region,
Credentials: i.bedrock.Creds,
}
aibridge/provider/anthropic.go
+8 -2
View File
@@ -63,11 +63,17 @@ func NewAnthropic(ctx context.Context, cfg config.Anthropic, bedrockCfg *config.
// so it is cheap to run at construction.
var bedrock *messages.BedrockRuntime
if bedrockCfg != nil {
creds, region, err := buildBedrockCredentials(ctx, *bedrockCfg)
creds, resolvedRegion, err := buildBedrockCredentials(ctx, *bedrockCfg)
if err != nil {
return nil, xerrors.Errorf("build bedrock credentials: %w", err)
}
bedrock = &messages.BedrockRuntime{Cfg: *bedrockCfg, Creds: creds, ResolvedRegion: region}
runtimeCfg := *bedrockCfg
// resolvedRegion is bedrockCfg.Region if provided;
// otherwise, it is resolved from the environment via awsconfig.LoadDefaultConfig
if runtimeCfg.Region == "" {
runtimeCfg.Region = resolvedRegion
}
bedrock = &messages.BedrockRuntime{Cfg: runtimeCfg, Creds: creds}
}
return &Anthropic{