From 60f77ec7443d9f84d776e2b3f4d4680697e18617 Mon Sep 17 00:00:00 2001 From: Daniel Deluiggi Date: Fri, 29 Mar 2024 09:55:23 -0700 Subject: [PATCH 1/3] Send ddb region as awsCfg Signed-off-by: Daniel Deluiggi --- pkg/ring/kv/dynamodb/dynamodb.go | 7 +++---- pkg/ring/kv/dynamodb/dynamodb_test.go | 7 +++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/pkg/ring/kv/dynamodb/dynamodb.go b/pkg/ring/kv/dynamodb/dynamodb.go index 154bc031b9e..1e783189a5b 100644 --- a/pkg/ring/kv/dynamodb/dynamodb.go +++ b/pkg/ring/kv/dynamodb/dynamodb.go @@ -57,13 +57,12 @@ func newDynamodbKV(cfg Config, logger log.Logger) (dynamodbKV, error) { return dynamodbKV{}, err } + awsCfg := aws.NewConfig() if len(cfg.Region) > 0 { - sess.Config = &aws.Config{ - Region: aws.String(cfg.Region), - } + awsCfg = awsCfg.WithRegion(cfg.Region) } - dynamoDB := dynamodb.New(sess) + dynamoDB := dynamodb.New(sess, awsCfg) ddbKV := &dynamodbKV{ ddbClient: dynamoDB, diff --git a/pkg/ring/kv/dynamodb/dynamodb_test.go b/pkg/ring/kv/dynamodb/dynamodb_test.go index d69ef5707de..bfb3e2c50a7 100644 --- a/pkg/ring/kv/dynamodb/dynamodb_test.go +++ b/pkg/ring/kv/dynamodb/dynamodb_test.go @@ -3,6 +3,7 @@ package dynamodb import ( "context" "fmt" + util_log "github.com/cortexproject/cortex/pkg/util/log" "strconv" "testing" "time" @@ -28,6 +29,12 @@ func Test_TTLDisabled(t *testing.T) { } +func Test_newDynamodbKV(t *testing.T) { + _, err := newDynamodbKV(Config{Region: "us-west-2", TableName: "TEST"}, util_log.Logger) + + require.NoError(t, err) +} + func Test_TTL(t *testing.T) { ddbClientMock := &mockDynamodb{ putItem: func(input *dynamodb.PutItemInput) *dynamodb.PutItemOutput { From a9fcce75fa38397b05a4a82053d728bd2f0d46ab Mon Sep 17 00:00:00 2001 From: Daniel Deluiggi Date: Fri, 29 Mar 2024 09:57:37 -0700 Subject: [PATCH 2/3] Add changelog Signed-off-by: Daniel Deluiggi --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41f58ee0419..9bb95a55820 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,7 @@ * [BUGFIX] Distributor: Shuffle-Sharding with IngestionTenantShardSize == 0, default sharding strategy should be used #5189 * [BUGFIX] Cortex: Fix GRPC stream clients not honoring overrides for call options. #5797 * [BUGFIX] Ring DDB: Fix lifecycle for ring counting unhealthy pods as healthy. #5838 +* [BUGFIX] Ring DDB: Fix region assignment. #5842 ## 1.16.0 2023-11-20 From b1a1602a673ca59af165d656c51617dcac0bbcc3 Mon Sep 17 00:00:00 2001 From: Daniel Deluiggi Date: Fri, 29 Mar 2024 12:04:53 -0700 Subject: [PATCH 3/3] Fix lint Signed-off-by: Daniel Deluiggi --- pkg/ring/kv/dynamodb/dynamodb_test.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/ring/kv/dynamodb/dynamodb_test.go b/pkg/ring/kv/dynamodb/dynamodb_test.go index bfb3e2c50a7..7e253716d12 100644 --- a/pkg/ring/kv/dynamodb/dynamodb_test.go +++ b/pkg/ring/kv/dynamodb/dynamodb_test.go @@ -3,7 +3,6 @@ package dynamodb import ( "context" "fmt" - util_log "github.com/cortexproject/cortex/pkg/util/log" "strconv" "testing" "time" @@ -30,7 +29,7 @@ func Test_TTLDisabled(t *testing.T) { } func Test_newDynamodbKV(t *testing.T) { - _, err := newDynamodbKV(Config{Region: "us-west-2", TableName: "TEST"}, util_log.Logger) + _, err := newDynamodbKV(Config{Region: "us-west-2", TableName: "TEST"}, TestLogger{}) require.NoError(t, err) }