Skip to content

feat: [CI-16855]: Fix S3 authentication to properly handle combined credential methods and role assumption #195

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
Ompragash merged 2 commits into from
Apr 10, 2025
Merged

feat: [CI-16855]: Fix S3 authentication to properly handle combined credential methods and role assumption #195

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1390d9f
Updated plugin.go
Ompragash Apr 7, 2025
80013eb
Updated plugin.go
Ompragash Apr 8, 2025
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
30 changes: 16 additions & 14 deletions plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,7 @@ func (p *Plugin) createS3Client() *s3.S3 {
S3ForcePathStyle: aws.Bool(p.PathStyle),
}

// Create initial session
sess, err := session.NewSession(conf)
if err != nil {
log.Fatalf("failed to create AWS session: %v", err)
Expand All @@ -465,29 +466,30 @@ func (p *Plugin) createS3Client() *s3.S3 {
log.Warn("AWS Key and/or Secret not provided (falling back to ec2 instance profile)")
}

client := s3.New(sess, conf)

// Create session with primary credentials
sess, err = session.NewSession(conf)
if err != nil {
log.Fatalf("failed to create AWS session: %v", err)
}

// Initialize client with the session
client := s3.New(sess)

// Handle secondary role assumption if UserRoleArn is provided
if len(p.UserRoleArn) > 0 {
log.WithField("UserRoleArn", p.UserRoleArn).Info("Using user role ARN")
// Create new credentials by assuming the UserRoleArn (with ExternalID when provided)

// Create credentials using the existing session for role assumption
// by assuming the UserRoleArn (with ExternalID when provided)
creds := stscreds.NewCredentials(sess, p.UserRoleArn, func(provider *stscreds.AssumeRoleProvider) {
if p.UserRoleExternalID != "" {
provider.ExternalID = aws.String(p.UserRoleExternalID)
}
})

// Create a new session with the new credentials
confWithUserRole := &aws.Config{
Region: aws.String(p.Region),
Credentials: creds,
}

sessWithUserRole, err := session.NewSession(confWithUserRole)
if err != nil {
log.Fatalf("failed to create AWS session with user role: %v", err)
}

client = s3.New(sessWithUserRole)
// Create new client with same config but updated credentials
client = s3.New(sess, &aws.Config{Credentials: creds})
}

return client
Expand Down