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

Bump dependancies

Browse Source 
- AWS SDK to release v1.0.0
  - other dependancies
Fix Packages :
  - AWS : fix validator function, rules, config model
  - Certificates : fix func NewFrom
  - HTTPServer: fix IsRunning
Fix other :
  - Fix CI/CD job to prevent alert on files modified
  - Fix missing licence comment header
This commit is contained in:
Nicolas JUHEL
2020-12-31 16:47:19 +01:00
committed by Nicolas JUHEL
parent d46a10bb82
commit 1249f319bc
38 changed files with 681 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
aws/interface.go
View File

@@ -58,9 +58,9 @@ type Config interface {
IsHTTPs() bool
ResolveEndpoint(service, region string) (sdkaws.Endpoint, error)
SetRetryer(retryer sdkaws.Retryer)
SetRetryer(retryer func() sdkaws.Retryer)
GetConfig(cli *http.Client) (*sdkaws.Config, errors.Error)
GetConfig(ctx context.Context, cli *http.Client) (*sdkaws.Config, errors.Error)
JSON() ([]byte, error)
Clone() Config
@@ -76,9 +76,9 @@ type AWS interface {
Role() role.Role
User() user.User
Clone() (AWS, errors.Error)
Clone(ctx context.Context) (AWS, errors.Error)
Config() Config
ForcePathStyle(enabled bool) errors.Error
ForcePathStyle(ctx context.Context, enabled bool) errors.Error
GetBucketName() string
SetBucketName(bucket string)
@@ -111,13 +111,13 @@ func New(ctx context.Context, cfg Config, httpClient *http.Client) (AWS, errors.
h: httpClient,
}
if i, e := cli.newClientIAM(httpClient); e != nil {
if i, e := cli.newClientIAM(ctx, httpClient); e != nil {
return nil, e
} else {
cli.i = i
}
if s, e := cli.newClientS3(httpClient); e != nil {
if s, e := cli.newClientS3(ctx, httpClient); e != nil {
return nil, e
} else {
cli.s = s
@@ -126,62 +126,72 @@ func New(ctx context.Context, cfg Config, httpClient *http.Client) (AWS, errors.
return cli, nil
}
func (cli *client) newClientIAM(httpClient *http.Client) (*sdkiam.Client, errors.Error) {
func (cli *client) newClientIAM(ctx context.Context, httpClient *http.Client) (*sdkiam.Client, errors.Error) {
var (
c *sdkaws.Config
i *sdkiam.Client
e errors.Error
r sdkaws.Retryer
)
if httpClient == nil {
httpClient = cli.h
}
if c, e = cli.c.GetConfig(httpClient); e != nil {
if c, e = cli.c.GetConfig(ctx, httpClient); e != nil {
return nil, e
}
if c.Retryer != nil {
r = c.Retryer()
}
i = sdkiam.New(sdkiam.Options{
APIOptions: c.APIOptions,
Credentials: c.Credentials,
EndpointOptions: sdkiam.EndpointResolverOptions{
DisableHTTPS: !cli.c.IsHTTPs(),
},
EndpointResolver: sdkiam.WithEndpointResolver(c.EndpointResolver, nil),
EndpointResolver: cli.newIAMResolver(c),
HTTPSignerV4: sdksv4.NewSigner(),
Region: c.Region,
Retryer: c.Retryer,
Retryer: r,
HTTPClient: httpClient,
})
return i, nil
}
func (cli *client) newClientS3(httpClient *http.Client) (*sdksss.Client, errors.Error) {
func (cli *client) newClientS3(ctx context.Context, httpClient *http.Client) (*sdksss.Client, errors.Error) {
var (
c *sdkaws.Config
s *sdksss.Client
e errors.Error
r sdkaws.Retryer
)
if httpClient == nil {
httpClient = cli.h
}
if c, e = cli.c.GetConfig(httpClient); e != nil {
if c, e = cli.c.GetConfig(ctx, httpClient); e != nil {
return nil, e
}
if c.Retryer != nil {
r = c.Retryer()
}
s = sdksss.New(sdksss.Options{
APIOptions: c.APIOptions,
Credentials: c.Credentials,
EndpointOptions: sdksss.EndpointResolverOptions{
DisableHTTPS: !cli.c.IsHTTPs(),
},
EndpointResolver: sdksss.WithEndpointResolver(c.EndpointResolver, nil),
EndpointResolver: cli.newS3Resolver(c),
HTTPSignerV4: sdksv4.NewSigner(),
Region: c.Region,
Retryer: c.Retryer,
Retryer: r,
HTTPClient: httpClient,
UsePathStyle: cli.p,
})
@@ -189,7 +199,7 @@ func (cli *client) newClientS3(httpClient *http.Client) (*sdksss.Client, errors.
return s, nil
}
func (c *client) Clone() (AWS, errors.Error) {
func (c *client) Clone(ctx context.Context) (AWS, errors.Error) {
cli := &client{
p: false,
x: c.x,
@@ -199,13 +209,13 @@ func (c *client) Clone() (AWS, errors.Error) {
h: c.h,
}
if i, e := cli.newClientIAM(c.h); e != nil {
if i, e := cli.newClientIAM(ctx, c.h); e != nil {
return nil, e
} else {
cli.i = i
}
if s, e := cli.newClientS3(c.h); e != nil {
if s, e := cli.newClientS3(ctx, c.h); e != nil {
return nil, e
} else {
cli.s = s