From 8f8f5c6df7fbcd08ee48d91a4f2e011a3e69e4ac Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Fri, 22 Mar 2024 10:19:11 +0000 Subject: [PATCH] =?UTF-8?q?chore:=20allows=20an=20environmental=20override?= =?UTF-8?q?=20of=20the=20default=20AWS=20region=20and=E2=80=A6=20(#1025)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: allows an environmental override of the default AWS region and using it for bedrock Signed-off-by: Alex Jones * chore: missing provider region Signed-off-by: Alex Jones --------- Signed-off-by: Alex Jones --- cmd/auth/add.go | 3 +++ pkg/ai/amazonbedrock.go | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/cmd/auth/add.go b/cmd/auth/add.go index ae9735b425..ed455d9add 100644 --- a/cmd/auth/add.go +++ b/cmd/auth/add.go @@ -45,6 +45,9 @@ var addCmd = &cobra.Command{ _ = cmd.MarkFlagRequired("endpointname") _ = cmd.MarkFlagRequired("providerRegion") } + if strings.ToLower(backend) == "amazonbedrock" { + _ = cmd.MarkFlagRequired("providerRegion") + } }, Run: func(cmd *cobra.Command, args []string) { diff --git a/pkg/ai/amazonbedrock.go b/pkg/ai/amazonbedrock.go index 8f3ecdbfaf..f9cd80fa61 100644 --- a/pkg/ai/amazonbedrock.go +++ b/pkg/ai/amazonbedrock.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "os" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" @@ -76,6 +77,9 @@ func GetModelOrDefault(model string) string { // GetModelOrDefault check config region func GetRegionOrDefault(region string) string { + if os.Getenv("AWS_DEFAULT_REGION") != "" { + region = os.Getenv("AWS_DEFAULT_REGION") + } // Check if the provided model is in the list for _, m := range BEDROCKER_SUPPORTED_REGION { if m == region {