Skip to content

fix(s3): wrap credentials with NewCredentialsCache #1335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Slach merged 3 commits into from
Mar 28, 2026
+7 −1
Merged

fix(s3): wrap credentials with NewCredentialsCache #1335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
90321a9
fix: wrap S3 credentials with NewCredentialsCache to avoid redundant …
kakao-tars-case Mar 24, 2026
f839c2e
Merge branch 'master' of github.com:Altinity/clickhouse-backup into f…
Slach Mar 28, 2026
a8aeaf2
improve restart via SYSTEM SHUTDOWN handler in TestKeeperTLS
Slach Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions pkg/storage/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ func (s *S3) Connect(ctx context.Context) error {
)
// inherit IRSA and try assume role https://github.com/Altinity/clickhouse-backup/issues/1191
if s.Config.AssumeRoleARN != "" && s.Config.AssumeRoleARN != awsRoleARN {
awsConfig.Credentials = aws.NewCredentialsCache(awsConfig.Credentials)
stsClient = sts.NewFromConfig(awsConfig)
awsConfig.Credentials = stscreds.NewAssumeRoleProvider(stsClient, s.Config.AssumeRoleARN)
}
Expand All @@ -157,6 +158,10 @@ func (s *S3) Connect(ctx context.Context) error {
}
}

if awsConfig.Credentials != nil {
awsConfig.Credentials = aws.NewCredentialsCache(awsConfig.Credentials)
}

if s.Config.Debug {
awsConfig.Logger = newS3Logger(log.Logger)
awsConfig.ClientLogMode = aws.LogRetries | aws.LogRequest | aws.LogResponse
Expand Down
3 changes: 2 additions & 1 deletion test/integration/keeperTLS_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ func TestKeeperTLS(t *testing.T) {
// clean and restore
r.NoError(env.dropDatabase(dbName, false))
env.queryWithNoError(r, fmt.Sprintf("DROP USER IF EXISTS %s %s", rbacUser, onCluster))
env.ch.Close()
env.DockerExecNoError(r, "clickhouse-backup", "clickhouse-backup", "-c", "/etc/clickhouse-backup/config-s3.yml", "restore", "--rbac", backupName)

// wait for restart after RBAC restore and check
env.connectWithWait(t, r, 500*time.Millisecond, 1*time.Second, 2*time.Minute)
env.connectWithWait(t, r, 5*time.Second, 1*time.Second, 2*time.Minute)
var rowCount, userCount uint64
r.NoError(env.ch.SelectSingleRowNoCtx(&rowCount, fmt.Sprintf("SELECT count() FROM %s.%s", dbName, tableName)))
r.Equal(uint64(100), rowCount)
Expand Down
Loading