From 964586fa47a19b64668b526ab71324fa8082a932 Mon Sep 17 00:00:00 2001 From: Nicolas JUHEL Date: Wed, 9 Dec 2020 04:28:03 +0100 Subject: [PATCH] Bump dependancies --- aws/bucket/bucket.go | 8 ++++---- aws/bucket/interface.go | 2 +- aws/helper/partSize.go | 6 +++--- aws/object/interface.go | 2 +- aws/object/multipart.go | 4 ++-- aws/object/object.go | 10 +++++----- aws/policy/policies.go | 6 +++--- aws/role/interface.go | 4 ++-- aws/role/policy.go | 2 +- aws/role/role.go | 2 +- aws/user/login.go | 2 +- context/ginTonic.go | 1 + go.mod | 31 ++++++++++++++++--------------- 13 files changed, 41 insertions(+), 39 deletions(-) create mode 100644 context/ginTonic.go diff --git a/aws/bucket/bucket.go b/aws/bucket/bucket.go index 2405d3f..270f2d5 100644 --- a/aws/bucket/bucket.go +++ b/aws/bucket/bucket.go @@ -79,13 +79,13 @@ func (cli *client) Delete() liberr.Error { return cli.GetError(err) } -func (cli *client) List() ([]*sdkstp.Bucket, liberr.Error) { +func (cli *client) List() ([]sdkstp.Bucket, liberr.Error) { out, err := cli.s3.ListBuckets(cli.GetContext(), nil) if err != nil { - return make([]*sdkstp.Bucket, 0), cli.GetError(err) + return make([]sdkstp.Bucket, 0), cli.GetError(err) } else if out == nil || out.Buckets == nil { - return make([]*sdkstp.Bucket, 0), libhlp.ErrorAwsEmpty.Error(nil) + return make([]sdkstp.Bucket, 0), libhlp.ErrorAwsEmpty.Error(nil) } return out.Buckets, nil @@ -129,7 +129,7 @@ func (cli *client) EnableReplication(srcRoleARN, dstRoleARN, dstBucketName strin Bucket: cli.GetBucketAws(), ReplicationConfiguration: &sdkstp.ReplicationConfiguration{ Role: sdkaws.String(srcRoleARN + "," + dstRoleARN), - Rules: []*sdkstp.ReplicationRule{ + Rules: []sdkstp.ReplicationRule{ { Destination: &sdkstp.Destination{ Bucket: sdkaws.String("arn:aws:s3:::" + dstBucketName), diff --git a/aws/bucket/interface.go b/aws/bucket/interface.go index 866b4e0..b376ae2 100644 --- a/aws/bucket/interface.go +++ b/aws/bucket/interface.go @@ -44,7 +44,7 @@ type client struct { type Bucket interface { Check() ligerr.Error - List() ([]*sdkstp.Bucket, ligerr.Error) + List() ([]sdkstp.Bucket, ligerr.Error) Create(RegionConstraint string) ligerr.Error Delete() ligerr.Error diff --git a/aws/helper/partSize.go b/aws/helper/partSize.go index ec5f52b..9f89507 100644 --- a/aws/helper/partSize.go +++ b/aws/helper/partSize.go @@ -122,12 +122,12 @@ func (r *readerPartSize) NextPart(eTag *string) { } if r.c.Parts == nil { - r.c.Parts = make([]*sdktps.CompletedPart, 0) + r.c.Parts = make([]sdktps.CompletedPart, 0) } - r.c.Parts = append(r.c.Parts, &sdktps.CompletedPart{ + r.c.Parts = append(r.c.Parts, sdktps.CompletedPart{ ETag: sdkaws.String(strings.Replace(*eTag, "\"", "", -1)), - PartNumber: sdkaws.Int32(int32(r.i)), + PartNumber: int32(r.i), }) r.i++ diff --git a/aws/object/interface.go b/aws/object/interface.go index e34229d..f0190a2 100644 --- a/aws/object/interface.go +++ b/aws/object/interface.go @@ -47,7 +47,7 @@ type Object interface { Find(pattern string) ([]string, errors.Error) Size(object string) (size int64, err errors.Error) - List(continuationToken string) ([]*sdktps.Object, string, int64, errors.Error) + List(continuationToken string) ([]sdktps.Object, string, int64, errors.Error) Head(object string) (*sdksss.HeadObjectOutput, errors.Error) Get(object string) (*sdksss.GetObjectOutput, errors.Error) Put(object string, body *bytes.Reader) errors.Error diff --git a/aws/object/multipart.go b/aws/object/multipart.go index d7ff1b9..7a1e0e8 100644 --- a/aws/object/multipart.go +++ b/aws/object/multipart.go @@ -111,10 +111,10 @@ func (cli *client) MultipartPutCustom(partSize libhlp.PartSize, object string, b prt, err = cli.s3.UploadPart(cli.GetContext(), &sdksss.UploadPartInput{ Bucket: sdkaws.String(cli.GetBucketName()), Body: tmp, - PartNumber: sdkaws.Int32(rio.CurrPart()), + PartNumber: rio.CurrPart(), UploadId: upl.UploadId, Key: sdkaws.String(object), - ContentLength: sdkaws.Int64(inf.Size()), + ContentLength: inf.Size(), RequestPayer: sdktyp.RequestPayerRequester, ContentMD5: sdkaws.String(base64.StdEncoding.EncodeToString(h.Sum(nil))), }) diff --git a/aws/object/object.go b/aws/object/object.go index be429c1..282ec43 100644 --- a/aws/object/object.go +++ b/aws/object/object.go @@ -35,7 +35,7 @@ import ( "github.com/nabbar/golib/errors" ) -func (cli *client) List(continuationToken string) ([]*sdktps.Object, string, int64, errors.Error) { +func (cli *client) List(continuationToken string) ([]sdktps.Object, string, int64, errors.Error) { in := sdksss.ListObjectsV2Input{ Bucket: cli.GetBucketAws(), } @@ -48,10 +48,10 @@ func (cli *client) List(continuationToken string) ([]*sdktps.Object, string, int if err != nil { return nil, "", 0, cli.GetError(err) - } else if *out.IsTruncated { - return out.Contents, *out.NextContinuationToken, int64(*out.KeyCount), nil + } else if out.IsTruncated { + return out.Contents, *out.NextContinuationToken, int64(out.KeyCount), nil } else { - return out.Contents, "", int64(*out.KeyCount), nil + return out.Contents, "", int64(out.KeyCount), nil } } @@ -98,7 +98,7 @@ func (cli *client) Size(object string) (size int64, err errors.Error) { if h, err = cli.Head(object); err != nil { return } else { - return *h.ContentLength, nil + return h.ContentLength, nil } } diff --git a/aws/policy/policies.go b/aws/policy/policies.go index 498b138..57b99f0 100644 --- a/aws/policy/policies.go +++ b/aws/policy/policies.go @@ -74,7 +74,7 @@ func (cli *client) Update(polArn, polContents string) errors.Error { return nil } - if !*v.IsDefaultVersion { + if !v.IsDefaultVersion { _, _ = cli.iam.DeletePolicyVersion(cli.GetContext(), &iam.DeletePolicyVersionInput{ PolicyArn: aws.String(polArn), VersionId: v.VersionId, @@ -90,7 +90,7 @@ func (cli *client) Update(polArn, polContents string) errors.Error { _, err = cli.iam.CreatePolicyVersion(cli.GetContext(), &iam.CreatePolicyVersionInput{ PolicyArn: aws.String(polArn), PolicyDocument: aws.String(polContents), - SetAsDefault: aws.Bool(true), + SetAsDefault: true, }) return cli.GetError(err) @@ -109,7 +109,7 @@ func (cli *client) Delete(polArn string) errors.Error { return nil } - if !*v.IsDefaultVersion { + if !v.IsDefaultVersion { _, _ = cli.iam.DeletePolicyVersion(cli.GetContext(), &iam.DeletePolicyVersionInput{ PolicyArn: aws.String(polArn), VersionId: v.VersionId, diff --git a/aws/role/interface.go b/aws/role/interface.go index 0312853..0bdd555 100644 --- a/aws/role/interface.go +++ b/aws/role/interface.go @@ -42,7 +42,7 @@ type client struct { } type Role interface { - List() ([]*types.Role, errors.Error) + List() ([]types.Role, errors.Error) Check(name string) (string, errors.Error) Add(name, role string) (string, errors.Error) Delete(roleName string) errors.Error @@ -50,7 +50,7 @@ type Role interface { PolicyAttach(policyARN, roleName string) errors.Error PolicyDetach(policyARN, roleName string) errors.Error - PolicyListAttached(roleName string) ([]*types.AttachedPolicy, errors.Error) + PolicyListAttached(roleName string) ([]types.AttachedPolicy, errors.Error) } func New(ctx context.Context, bucket string, iam *iam.Client, s3 *s3.Client) Role { diff --git a/aws/role/policy.go b/aws/role/policy.go index b87b17c..c8bcac8 100644 --- a/aws/role/policy.go +++ b/aws/role/policy.go @@ -32,7 +32,7 @@ import ( "github.com/nabbar/golib/errors" ) -func (cli *client) PolicyListAttached(roleName string) ([]*types.AttachedPolicy, errors.Error) { +func (cli *client) PolicyListAttached(roleName string) ([]types.AttachedPolicy, errors.Error) { out, err := cli.iam.ListAttachedRolePolicies(cli.GetContext(), &iam.ListAttachedRolePoliciesInput{ RoleName: aws.String(roleName), }) diff --git a/aws/role/role.go b/aws/role/role.go index 3b44f03..e5f1acd 100644 --- a/aws/role/role.go +++ b/aws/role/role.go @@ -32,7 +32,7 @@ import ( "github.com/nabbar/golib/errors" ) -func (cli *client) List() ([]*types.Role, errors.Error) { +func (cli *client) List() ([]types.Role, errors.Error) { out, err := cli.iam.ListRoles(cli.GetContext(), &iam.ListRolesInput{}) if err != nil { diff --git a/aws/user/login.go b/aws/user/login.go index 44b63b9..a22c958 100644 --- a/aws/user/login.go +++ b/aws/user/login.go @@ -44,7 +44,7 @@ func (cli *client) LoginCreate(username, password string) errors.Error { out, err := cli.iam.CreateLoginProfile(cli.GetContext(), &iam.CreateLoginProfileInput{ UserName: aws.String(username), Password: aws.String(password), - PasswordResetRequired: aws.Bool(false), + PasswordResetRequired: false, }) if err != nil { diff --git a/context/ginTonic.go b/context/ginTonic.go new file mode 100644 index 0000000..a03e1d1 --- /dev/null +++ b/context/ginTonic.go @@ -0,0 +1 @@ +package context diff --git a/go.mod b/go.mod index 3f6faf5..7295fb2 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,11 @@ go 1.15 require ( github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect - github.com/aws/aws-sdk-go-v2 v0.29.0 - github.com/aws/aws-sdk-go-v2/config v0.2.2 - github.com/aws/aws-sdk-go-v2/credentials v0.1.4 - github.com/aws/aws-sdk-go-v2/service/iam v0.29.0 - github.com/aws/aws-sdk-go-v2/service/s3 v0.29.0 + github.com/aws/aws-sdk-go-v2 v0.30.0 + github.com/aws/aws-sdk-go-v2/config v0.3.0 + github.com/aws/aws-sdk-go-v2/credentials v0.1.5 + github.com/aws/aws-sdk-go-v2/service/iam v0.30.0 + github.com/aws/aws-sdk-go-v2/service/s3 v0.30.0 github.com/fatih/color v1.10.0 github.com/gin-gonic/gin v1.6.3 github.com/go-ldap/ldap/v3 v3.2.4 @@ -34,21 +34,22 @@ require ( github.com/onsi/ginkgo v1.14.1 github.com/onsi/gomega v1.10.2 github.com/rogpeppe/go-internal v1.6.2 // indirect - github.com/shirou/gopsutil v3.20.10+incompatible + github.com/shirou/gopsutil v3.20.11+incompatible github.com/sirupsen/logrus v1.7.0 github.com/spf13/jwalterweatherman v1.1.0 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect github.com/stretchr/testify v1.5.1 // indirect - github.com/ugorji/go v1.2.0 // indirect + github.com/ugorji/go v1.2.1 // indirect github.com/vbauerster/mpb/v5 v5.3.0 - github.com/xanzy/go-gitlab v0.39.0 - golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9 - golang.org/x/net v0.0.0-20201110031124-69a78807bb2b - golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58 - golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect + github.com/xanzy/go-gitlab v0.40.1 + golang.org/x/crypto v0.0.0-20201208171446-5f87f3452ae9 + golang.org/x/net v0.0.0-20201207224615-747e23833adb + golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5 + golang.org/x/sync v0.0.0-20201207232520-09787c993a3a + golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d // indirect + golang.org/x/term v0.0.0-20201207232118-ee85cb95a76b // indirect golang.org/x/text v0.3.4 // indirect - golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect google.golang.org/appengine v1.6.7 // indirect - gopkg.in/yaml.v2 v2.3.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect )