diff options
| author | chrislu <chris.lu@gmail.com> | 2022-03-21 23:00:50 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-03-21 23:00:50 -0700 |
| commit | 6c7f7d68876ffbde656d491cceea8f5574930924 (patch) | |
| tree | 8df7bc6539e1db95ab1d818e36bc21c9b01a298b /weed/remote_storage/s3 | |
| parent | afb93cd19f7f4999a1802b5dc7f62cc93a872d57 (diff) | |
| download | seaweedfs-6c7f7d68876ffbde656d491cceea8f5574930924.tar.xz seaweedfs-6c7f7d68876ffbde656d491cceea8f5574930924.zip | |
Revert "Merge pull request #2782 from SadmiB/upstream"
This reverts commit a644b7236a49bacff74b601ec1adc8015dd9af59, reversing
changes made to 349257f8225565cab323090f390b6b62f02e94ac.
Diffstat (limited to 'weed/remote_storage/s3')
| -rw-r--r-- | weed/remote_storage/s3/contabo.go | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/weed/remote_storage/s3/contabo.go b/weed/remote_storage/s3/contabo.go deleted file mode 100644 index 4d8528407..000000000 --- a/weed/remote_storage/s3/contabo.go +++ /dev/null @@ -1,50 +0,0 @@ -package s3 - -import ( - "fmt" - "os" - - "github.com/aws/aws-sdk-go/aws" - "github.com/aws/aws-sdk-go/aws/credentials" - "github.com/aws/aws-sdk-go/aws/session" - "github.com/aws/aws-sdk-go/service/s3" - "github.com/chrislusf/seaweedfs/weed/pb/remote_pb" - "github.com/chrislusf/seaweedfs/weed/remote_storage" - "github.com/chrislusf/seaweedfs/weed/util" -) - -func init() { - remote_storage.RemoteStorageClientMakers["contabo"] = new(ContaboRemoteStorageMaker) -} - -type ContaboRemoteStorageMaker struct{} - -func (s ContaboRemoteStorageMaker) HasBucket() bool { - return true -} - -func (s ContaboRemoteStorageMaker) Make(conf *remote_pb.RemoteConf) (remote_storage.RemoteStorageClient, error) { - client := &s3RemoteStorageClient{ - conf: conf, - } - accessKey := util.Nvl(conf.ContaboAccessKey, os.Getenv("ACCESS_KEY")) - secretKey := util.Nvl(conf.ContaboSecretKey, os.Getenv("SECRET_KEY")) - - config := &aws.Config{ - Endpoint: aws.String(conf.ContaboEndpoint), - Region: aws.String(conf.ContaboRegion), - S3ForcePathStyle: aws.Bool(true), - S3DisableContentMD5Validation: aws.Bool(true), - } - if accessKey != "" && secretKey != "" { - config.Credentials = credentials.NewStaticCredentials(accessKey, secretKey, "") - } - - sess, err := session.NewSession(config) - if err != nil { - return nil, fmt.Errorf("create contabo session: %v", err) - } - sess.Handlers.Build.PushFront(skipSha256PayloadSigning) - client.conn = s3.New(sess) - return client, nil -} |
