zishuo/golib
1
0
Fork 0
mirror of https://github.com/nabbar/golib.git synced 2025-10-16 12:51:21 +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

106
aws/object/object.go
View File

@@ -2,121 +2,88 @@ package object
import (
"bytes"
"io"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/s3"
sdkaws "github.com/aws/aws-sdk-go-v2/aws"
sdksss "github.com/aws/aws-sdk-go-v2/service/s3"
sdktps "github.com/aws/aws-sdk-go-v2/service/s3/types"
"github.com/nabbar/golib/aws/helper"
"github.com/nabbar/golib/errors"
)
func (cli *client) List(continuationToken string) ([]s3.Object, string, int64, errors.Error) {
in := s3.ListObjectsV2Input{
func (cli *client) List(continuationToken string) ([]*sdktps.Object, string, int64, errors.Error) {
in := sdksss.ListObjectsV2Input{
Bucket: cli.GetBucketAws(),
}
if continuationToken != "" {
in.ContinuationToken = aws.String(continuationToken)
in.ContinuationToken = sdkaws.String(continuationToken)
}
req := cli.s3.ListObjectsV2Request(&in)
out, err := req.Send(cli.GetContext())
defer cli.Close(req.HTTPRequest, req.HTTPResponse)
out, err := cli.s3.ListObjectsV2(cli.GetContext(), &in)
if err != nil {
return nil, "", 0, cli.GetError(err)
} else if *out.IsTruncated {
return out.Contents, *out.NextContinuationToken, *out.KeyCount, nil
return out.Contents, *out.NextContinuationToken, int64(*out.KeyCount), nil
} else {
return out.Contents, "", *out.KeyCount, nil
return out.Contents, "", int64(*out.KeyCount), nil
}
}
func (cli *client) Get(object string) (io.ReadCloser, []io.Closer, errors.Error) {
req := cli.s3.GetObjectRequest(&s3.GetObjectInput{
func (cli *client) Get(object string) (*sdksss.GetObjectOutput, errors.Error) {
out, err := cli.s3.GetObject(cli.GetContext(), &sdksss.GetObjectInput{
Bucket: cli.GetBucketAws(),
Key: aws.String(object),
Key: sdkaws.String(object),
})
out, err := req.Send(cli.GetContext())
defer cli.Close(nil, nil)
if err != nil {
cli.Close(req.HTTPRequest, req.HTTPResponse)
return nil, nil, cli.GetError(err)
defer func() {
if out != nil && out.Body != nil {
_ = out.Body.Close()
}
}()
return nil, cli.GetError(err)
} else if out.Body == nil {
cli.Close(req.HTTPRequest, req.HTTPResponse)
return nil, nil, helper.ErrorResponse.Error(nil)
return nil, helper.ErrorResponse.Error(nil)
} else {
return out.Body, cli.GetCloser(req.HTTPRequest, req.HTTPResponse), nil
return out, nil
}
}
func (cli *client) Head(object string) (head map[string]interface{}, meta map[string]string, err errors.Error) {
req := cli.s3.HeadObjectRequest(&s3.HeadObjectInput{
func (cli *client) Head(object string) (*sdksss.HeadObjectOutput, errors.Error) {
out, e := cli.s3.HeadObject(cli.GetContext(), &sdksss.HeadObjectInput{
Bucket: cli.GetBucketAws(),
Key: aws.String(object),
Key: sdkaws.String(object),
})
out, e := req.Send(cli.GetContext())
defer cli.Close(req.HTTPRequest, req.HTTPResponse)
if e != nil {
return nil, nil, cli.GetError(e)
} else if out.Metadata == nil {
return nil, nil, helper.ErrorResponse.Error(nil)
return nil, cli.GetError(e)
} else if out.ETag == nil {
return nil, helper.ErrorResponse.Error(nil)
} else {
res := make(map[string]interface{})
if out.ContentType != nil {
res["ContentType"] = *out.ContentType
}
if out.ContentDisposition != nil {
res["ContentDisposition"] = *out.ContentDisposition
}
if out.ContentEncoding != nil {
res["ContentEncoding"] = *out.ContentEncoding
}
if out.ContentLanguage != nil {
res["ContentLanguage"] = *out.ContentLanguage
}
if out.ContentLength != nil {
res["ContentLength"] = *out.ContentLength
}
return res, out.Metadata, nil
return out, nil
}
}
func (cli *client) Size(object string) (size int64, err errors.Error) {
var (
h map[string]interface{}
i interface{}
j int64
o bool
h *sdksss.HeadObjectOutput
)
if h, _, err = cli.Head(object); err != nil {
if h, err = cli.Head(object); err != nil {
return
} else if i, o = h["ContentLength"]; !o {
return 0, nil
} else if j, o = i.(int64); !o {
return 0, nil
} else {
return j, nil
return *h.ContentLength, nil
}
}
func (cli *client) Put(object string, body *bytes.Reader) errors.Error {
req := cli.s3.PutObjectRequest(&s3.PutObjectInput{
out, err := cli.s3.PutObject(cli.GetContext(), &sdksss.PutObjectInput{
Bucket: cli.GetBucketAws(),
Key: aws.String(object),
Key: sdkaws.String(object),
Body: body,
})
out, err := req.Send(cli.GetContext())
defer cli.Close(req.HTTPRequest, req.HTTPResponse)
if err != nil {
return cli.GetError(err)
} else if out.ETag == nil {
@@ -127,17 +94,14 @@ func (cli *client) Put(object string, body *bytes.Reader) errors.Error {
}
func (cli *client) Delete(object string) errors.Error {
if _, _, err := cli.Head(object); err != nil {
if _, err := cli.Head(object); err != nil {
return err
}
req := cli.s3.DeleteObjectRequest(&s3.DeleteObjectInput{
_, err := cli.s3.DeleteObject(cli.GetContext(), &sdksss.DeleteObjectInput{
Bucket: cli.GetBucketAws(),
Key: aws.String(object),
Key: sdkaws.String(object),
})
_, err := req.Send(cli.GetContext())
defer cli.Close(req.HTTPRequest, req.HTTPResponse)
return cli.GetError(err)
}