zishuo/golib
1
0
Fork 0
mirror of https://github.com/nabbar/golib.git synced 2025-10-15 12:20:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bump to sdk aws go v2 at release v0.26.0...

Browse Source 
Bump dependancies
Refactor / Fix aws to work with sdk-aws-go-v2 at release v0.26.0...
This commit is contained in:
Nicolas JUHEL
2020-09-30 13:04:47 +02:00
parent 47dc7f34ae
commit 94f90d7e22
38 changed files with 706 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
aws/configCustom/interface.go
View File

@@ -6,9 +6,9 @@ import (
"net/url"
"strings"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/aws/defaults"
aws2 "github.com/nabbar/golib/aws"
sdkaws "github.com/aws/aws-sdk-go-v2/aws"
sdkcrd "github.com/aws/aws-sdk-go-v2/credentials"
libaws "github.com/nabbar/golib/aws"
"github.com/nabbar/golib/errors"
)
@@ -16,7 +16,7 @@ func GetConfigModel() interface{} {
return Model{}
}
func NewConfigJsonUnmashal(p []byte) (aws2.Config, errors.Error) {
func NewConfigJsonUnmashal(p []byte) (libaws.Config, errors.Error) {
c := Model{}
if err := json.Unmarshal(p, &c); err != nil {
return nil, ErrorConfigJsonUnmarshall.ErrorParent(err)
@@ -24,14 +24,12 @@ func NewConfigJsonUnmashal(p []byte) (aws2.Config, errors.Error) {
return &awsModel{
Model: c,
logLevel: 0,
awsLevel: 0,
retryer: nil,
mapRegion: nil,
}, nil
}
func NewConfig(bucket, accessKey, secretKey string, endpoint *url.URL, region string) aws2.Config {
func NewConfig(bucket, accessKey, secretKey string, endpoint *url.URL, region string) libaws.Config {
return &awsModel{
Model: Model{
Region: region,
@@ -41,14 +39,12 @@ func NewConfig(bucket, accessKey, secretKey string, endpoint *url.URL, region st
Bucket: bucket,
},
endpoint: endpoint,
logLevel: 0,
awsLevel: 0,
retryer: nil,
mapRegion: make(map[string]*url.URL),
}
}
func (c *awsModel) Clone() aws2.Config {
func (c *awsModel) Clone() libaws.Config {
m := make(map[string]*url.URL)
for r, e := range c.mapRegion {
@@ -63,23 +59,19 @@ func (c *awsModel) Clone() aws2.Config {
SecretKey: c.SecretKey,
Bucket: c.Bucket,
},
logLevel: c.logLevel,
awsLevel: c.awsLevel,
retryer: c.retryer,
endpoint: c.endpoint,
mapRegion: m,
}
}
func (c *awsModel) GetConfig(cli *http.Client) (aws.Config, errors.Error) {
cfg := defaults.Config()
cfg.Credentials = aws.NewStaticCredentialsProvider(c.AccessKey, c.SecretKey, "")
cfg.Logger = &awsLogger{c.logLevel}
cfg.LogLevel = c.awsLevel
func (c *awsModel) GetConfig(cli *http.Client) (*sdkaws.Config, errors.Error) {
cfg := sdkaws.NewConfig()
cfg.Credentials = sdkcrd.NewStaticCredentialsProvider(c.AccessKey, c.SecretKey, "")
cfg.Retryer = c.retryer
cfg.EnableEndpointDiscovery = false
cfg.DisableEndpointHostPrefix = true
cfg.EndpointResolver = aws.EndpointResolverFunc(c.ResolveEndpoint)
cfg.EndpointResolver = sdkaws.EndpointResolverFunc(c.ResolveEndpoint)
cfg.Region = c.Region
if cli != nil {