-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
enhance: Support aliyun as oss source (#301)
Aliyun OSS was banned for minio adaptation issue. This PR add it back after verification. --------- Signed-off-by: Congqi Xia <[email protected]>
- Loading branch information
Showing
6 changed files
with
190 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package oss | ||
|
|
||
| import ( | ||
| "github.com/aliyun/credentials-go/credentials" // >= v1.2.6 | ||
| "github.com/cockroachdb/errors" | ||
| "github.com/minio/minio-go/v7" | ||
| minioCred "github.com/minio/minio-go/v7/pkg/credentials" | ||
| ) | ||
|
|
||
| type Credential interface { | ||
| credentials.Credential | ||
| } | ||
|
|
||
| func processMinioAliyunOptions(p MinioClientParam, opts *minio.Options) error { | ||
| if p.UseIAM { | ||
| credProvider, err := NewAliyunCredentialProvider() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| opts.Creds = minioCred.New(credProvider) | ||
| } else { | ||
| opts.Creds = minioCred.NewStaticV4(p.AK, p.SK, "") | ||
| } | ||
| opts.BucketLookup = minio.BucketLookupDNS | ||
| return nil | ||
| } | ||
|
|
||
| // CredentialProvider implements "github.com/minio/minio-go/v7/pkg/credentials".Provider | ||
| // also implements transport | ||
| type CredentialProvider struct { | ||
| // aliyunCreds doesn't provide a way to get the expire time, so we use the cache to check if it's expired | ||
| // when aliyunCreds.GetAccessKeyId is different from the cache, we know it's expired | ||
| akCache string | ||
| aliyunCreds Credential | ||
| } | ||
|
|
||
| func NewAliyunCredentialProvider() (minioCred.Provider, error) { | ||
| aliyunCreds, err := credentials.NewCredential(nil) | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to create aliyun credential") | ||
| } | ||
| // backend, err := minio.DefaultTransport(true) | ||
| // if err != nil { | ||
| // return nil, errors.Wrap(err, "failed to create default transport") | ||
| // } | ||
| // credentials.GetCredential() | ||
| return &CredentialProvider{aliyunCreds: aliyunCreds}, nil | ||
| } | ||
|
|
||
| // Retrieve returns nil if it successfully retrieved the value. | ||
| // Error is returned if the value were not obtainable, or empty. | ||
| // according to the caller minioCred.Credentials.Get(), | ||
| // it already has a lock, so we don't need to worry about concurrency | ||
| func (c *CredentialProvider) Retrieve() (minioCred.Value, error) { | ||
| ret := minioCred.Value{} | ||
| ak, err := c.aliyunCreds.GetAccessKeyId() | ||
| if err != nil { | ||
| return ret, errors.Wrap(err, "failed to get access key id from aliyun credential") | ||
| } | ||
| ret.AccessKeyID = *ak | ||
| sk, err := c.aliyunCreds.GetAccessKeySecret() | ||
| if err != nil { | ||
| return minioCred.Value{}, errors.Wrap(err, "failed to get access key secret from aliyun credential") | ||
| } | ||
| securityToken, err := c.aliyunCreds.GetSecurityToken() | ||
| if err != nil { | ||
| return minioCred.Value{}, errors.Wrap(err, "failed to get security token from aliyun credential") | ||
| } | ||
| ret.SecretAccessKey = *sk | ||
| c.akCache = *ak | ||
| ret.SessionToken = *securityToken | ||
| return ret, nil | ||
| } | ||
|
|
||
| // IsExpired returns if the credentials are no longer valid, and need | ||
| // to be retrieved. | ||
| // according to the caller minioCred.Credentials.IsExpired(), | ||
| // it already has a lock, so we don't need to worry about concurrency | ||
| func (c CredentialProvider) IsExpired() bool { | ||
| ak, err := c.aliyunCreds.GetAccessKeyId() | ||
| if err != nil { | ||
| return true | ||
| } | ||
| return *ak != c.akCache | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| package oss | ||
|
|
||
| import ( | ||
| "github.com/cockroachdb/errors" | ||
| "github.com/minio/minio-go/v7" | ||
| minioCred "github.com/minio/minio-go/v7/pkg/credentials" | ||
| "github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common" | ||
| ) | ||
|
|
||
| func processMinioTencentOptions(p MinioClientParam, opts *minio.Options) error { | ||
| if p.UseIAM { | ||
| credProvider, err := NewTencentCredentialProvider() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| opts.Creds = minioCred.New(credProvider) | ||
| } else { | ||
| opts.Creds = minioCred.NewStaticV4(p.AK, p.SK, "") | ||
| } | ||
| opts.BucketLookup = minio.BucketLookupDNS | ||
| return nil | ||
| } | ||
|
|
||
| // TencentCredentialProvider implements "github.com/minio/minio-go/v7/pkg/credentials".Provider | ||
| // also implements transport | ||
| type TencentCredentialProvider struct { | ||
| // tencentCreds doesn't provide a way to get the expired time, so we use the cache to check if it's expired | ||
| // when tencentCreds.GetSecretId is different from the cache, we know it's expired | ||
| akCache string | ||
| tencentCreds common.CredentialIface | ||
| } | ||
|
|
||
| func NewTencentCredentialProvider() (minioCred.Provider, error) { | ||
| provider, err := common.DefaultTkeOIDCRoleArnProvider() | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to create tencent credential provider") | ||
| } | ||
|
|
||
| cred, err := provider.GetCredential() | ||
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to get tencent credential") | ||
| } | ||
| return &TencentCredentialProvider{tencentCreds: cred}, nil | ||
| } | ||
|
|
||
| // Retrieve returns nil if it successfully retrieved the value. | ||
| // Error is returned if the value were not obtainable, or empty. | ||
| // according to the caller minioCred.Credentials.Get(), | ||
| // it already has a lock, so we don't need to worry about concurrency | ||
| func (c *TencentCredentialProvider) Retrieve() (minioCred.Value, error) { | ||
| ret := minioCred.Value{} | ||
| ak := c.tencentCreds.GetSecretId() | ||
| ret.AccessKeyID = ak | ||
| c.akCache = ak | ||
|
|
||
| sk := c.tencentCreds.GetSecretKey() | ||
| ret.SecretAccessKey = sk | ||
|
|
||
| securityToken := c.tencentCreds.GetToken() | ||
| ret.SessionToken = securityToken | ||
| return ret, nil | ||
| } | ||
|
|
||
| // IsExpired returns if the credentials are no longer valid, and need | ||
| // to be retrieved. | ||
| // according to the caller minioCred.Credentials.IsExpired(), | ||
| // it already has a lock, so we don't need to worry about concurrency | ||
| func (c TencentCredentialProvider) IsExpired() bool { | ||
| ak := c.tencentCreds.GetSecretId() | ||
| return ak != c.akCache | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters