Skip to content
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

Removed credential provider chain for pod identity #145

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Removed credential provider chain for pod identity #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 22 additions & 43 deletions pkg/blob/blob.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,7 @@ import (
"strings"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/credentials/stscreds"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sts"
"gocloud.dev/blob"
_ "gocloud.dev/blob/azureblob"
_ "gocloud.dev/blob/fileblob"
Expand Down Expand Up @@ -63,8 +58,6 @@ const (
caCertData = "CA_CERT_DATA"
awsAccessKeyId = "AWS_ACCESS_KEY_ID"
awsSecretAccessKey = "AWS_SECRET_ACCESS_KEY"
awsRoleArn = "AWS_ROLE_ARN"
awsWebIdentityTokenFile = "AWS_WEB_IDENTITY_TOKEN_FILE"
)

type Blob struct {
Expand Down Expand Up @@ -203,6 +196,25 @@ func setAzureCredentialsToEnv(secret *v1.Secret) error {
return nil
}

func setS3CredentialsToEnv(secret *v1.Secret) error {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it be set from s3Blob?

if val, ok := secret.Data[awsAccessKeyId]; !ok {
return fmt.Errorf("storage secret missing %s key", awsAccessKeyId)
} else {
if err := os.Setenv(awsAccessKeyId, string(val)); err != nil {
return err
}
}

if val, ok := secret.Data[awsSecretAccessKey]; !ok {
return fmt.Errorf("storage secret missing %s key", awsSecretAccessKey)
} else {
if err := os.Setenv(awsSecretAccessKey, string(val)); err != nil {
return err
}
}
return nil
}

func writeDataIntoFile(filePath string, val []byte) error {
dir, _ := path.Split(filePath)
if _, err := os.Stat(dir); os.IsNotExist(err) {
Expand Down Expand Up @@ -422,51 +434,18 @@ func closeBucket(ctx context.Context, bucket *blob.Bucket) {
}

func (b *Blob) getS3Session() (*session.Session, error) {
var providers []credentials.Provider

// if static credential is provided, use that
if b.backupStorage.Spec.Storage.S3.SecretName != "" {
id, ok := b.s3Secret.Data[awsAccessKeyId]
if !ok {
return nil, fmt.Errorf("storage secret %s/%s missing %s key", b.s3Secret.Namespace, b.s3Secret.Name, awsAccessKeyId)
}
key, ok := b.s3Secret.Data[awsSecretAccessKey]
if !ok {
return nil, fmt.Errorf("storage Secret %s/%s missing %s key", b.s3Secret.Namespace, b.s3Secret.Name, awsSecretAccessKey)
}
providers = []credentials.Provider{&credentials.StaticProvider{Value: credentials.Value{
AccessKeyID: string(id),
SecretAccessKey: string(key),
SessionToken: "",
}}}
} else {
providers = []credentials.Provider{
&credentials.EnvProvider{},
&credentials.SharedCredentialsProvider{
Filename: "",
Profile: "",
},
// Required for IRSA
stscreds.NewWebIdentityRoleProviderWithOptions(
sts.New(session.Must(session.NewSession(aws.NewConfig().
WithRegion("us-east-1")))),
os.Getenv(awsRoleArn),
"",
stscreds.FetchTokenPath(os.Getenv(awsWebIdentityTokenFile)),
),
&ec2rolecreds.EC2RoleProvider{
Client: ec2metadata.New(session.Must(session.NewSession(aws.NewConfig().
WithRegion("us-east-1")))),
},
if err := setS3CredentialsToEnv(b.s3Secret); err != nil {
return nil, err
}
}

config := aws.NewConfig().
WithRegion(b.backupStorage.Spec.Storage.S3.Region).
WithCredentialsChainVerboseErrors(true).
WithEndpoint(b.backupStorage.Spec.Storage.S3.Endpoint).
WithS3ForcePathStyle(true).
WithCredentials(credentials.NewChainCredentials(providers))
WithS3ForcePathStyle(true)

if b.backupStorage.Spec.Storage.S3.SecretName != "" {
if caCert := b.s3Secret.Data[caCertData]; len(caCert) > 0 || b.backupStorage.Spec.Storage.S3.InsecureTLS {
Expand Down
Loading