From 5d4a630e357a23508cb9de8e0838f34d10d90870 Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Fri, 19 Feb 2021 09:27:03 +0900 Subject: [PATCH 1/2] Update aws-sdk-go-2 to v1.2.0 --- go.mod | 8 ++++---- go.sum | 36 ++++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index fca2dcb..f0a67c2 100644 --- a/go.mod +++ b/go.mod @@ -4,9 +4,9 @@ go 1.15 require ( github.com/aws/aws-sdk-go v1.37.14 - 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/service/cloudfront v0.30.0 - github.com/aws/aws-sdk-go-v2/service/ecr v0.30.0 + github.com/aws/aws-sdk-go-v2 v1.2.0 + github.com/aws/aws-sdk-go-v2/config v1.1.1 + github.com/aws/aws-sdk-go-v2/service/cloudfront v1.1.1 + github.com/aws/aws-sdk-go-v2/service/ecr v1.1.1 github.com/seqsense/s3sync v1.8.0 ) diff --git a/go.sum b/go.sum index a667094..36ec802 100644 --- a/go.sum +++ b/go.sum @@ -1,22 +1,26 @@ github.com/aws/aws-sdk-go v1.35.28/go.mod h1:tlPOdRjfxPBpNIwqDj61rmsnA85v9jc0Ps9+muhnW+k= github.com/aws/aws-sdk-go v1.37.14 h1:thuR1hd1doCvsaMDYDMhqCGSmw39bSvZaw+DPGhMm5w= github.com/aws/aws-sdk-go v1.37.14/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= -github.com/aws/aws-sdk-go-v2 v0.30.0 h1:/CjXUnWXnvdgOqHa65UIs2TODa5D5lm3ty7O0wWuYHY= -github.com/aws/aws-sdk-go-v2 v0.30.0/go.mod h1:vEDjzdktTH+FoEOV6BWgYLEzvPti13Onp5/qQrSiLPg= -github.com/aws/aws-sdk-go-v2/config v0.3.0 h1:Vl7ljyGdyZ6AK/WaqHPpweS3xE8OVKQcwU3kt99ofYU= -github.com/aws/aws-sdk-go-v2/config v0.3.0/go.mod h1:grBHx/eKZPbNpGcmntBEu97/nUGCDHfjPhIyJx0e1lc= -github.com/aws/aws-sdk-go-v2/credentials v0.1.5 h1:yPU5tFqRUJoO8RT4vp5O6AINP+W3kN6xHxukDJY0nZY= -github.com/aws/aws-sdk-go-v2/credentials v0.1.5/go.mod h1:DvGY5cZFiPbp++xv8eco5ZF3bO7jp67QuL0OzaChnVQ= -github.com/aws/aws-sdk-go-v2/ec2imds v0.1.5 h1:9vrHx+lXUiFAFHq8n6W/p7XEJ3gGPjFI+CIu243PXbE= -github.com/aws/aws-sdk-go-v2/ec2imds v0.1.5/go.mod h1:DPESW4tlbYYOFLmRThVEKSWsux39VKDIG+5DMKCyoII= -github.com/aws/aws-sdk-go-v2/service/cloudfront v0.30.0 h1:Y8r/Yw/L74+Lz9Joh0pa5irdCjVGw0CbRN3P2IP501w= -github.com/aws/aws-sdk-go-v2/service/cloudfront v0.30.0/go.mod h1:6X4+9GAxgMN2ku3zaDEEvL6vpxFzNPb7GIiv7FQF8O4= -github.com/aws/aws-sdk-go-v2/service/ecr v0.30.0 h1:9enTO/8P3D2fp2VU5I0/UEHzXF8Ld8/G2rUfQ3gxW8Y= -github.com/aws/aws-sdk-go-v2/service/ecr v0.30.0/go.mod h1:dIRMALzuZPsmwD0yVUuZzvKiq3KKOokES+Vgi+Gxp/k= -github.com/aws/aws-sdk-go-v2/service/sts v0.30.0 h1:uLJi5/2SHMRarGhWegpzTLNmLWfQHDh38jJz4My1DZM= -github.com/aws/aws-sdk-go-v2/service/sts v0.30.0/go.mod h1:Lef/s/jQBl/f4DXNdq1UhxmjuLrLK1t1a/cJPbeYo20= -github.com/awslabs/smithy-go v0.4.0 h1:El0KyKn4zdM3pLuWJlgoeitQuu/mjwUPssr7L3xu3vs= -github.com/awslabs/smithy-go v0.4.0/go.mod h1:hPOQwnmBLHsUphH13tVSjQhTAFma0/0XoZGbBcOuABI= +github.com/aws/aws-sdk-go-v2 v1.2.0 h1:BS+UYpbsElC82gB+2E2jiCBg36i8HlubTB/dO/moQ9c= +github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= +github.com/aws/aws-sdk-go-v2/config v1.1.1 h1:ZAoq32boMzcaTW9bcUacBswAmHTbvlvDJICgHFZuECo= +github.com/aws/aws-sdk-go-v2/config v1.1.1/go.mod h1:0XsVy9lBI/BCXm+2Tuvt39YmdHwS5unDQmxZOYe8F5Y= +github.com/aws/aws-sdk-go-v2/credentials v1.1.1 h1:NbvWIM1Mx6sNPTxowHgS2ewXCRp+NGTzUYb/96FZJbY= +github.com/aws/aws-sdk-go-v2/credentials v1.1.1/go.mod h1:mM2iIjwl7LULWtS6JCACyInboHirisUUdkBPoTHMOUo= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2 h1:EtEU7WRaWliitZh2nmuxEXrN0Cb8EgPUFGIoTMeqbzI= +github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.0.2/go.mod h1:3hGg3PpiEjHnrkrlasTfxFqUsZ2GCk/fMUn4CbKgSkM= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.1.1 h1:Qhi6EdWHqYvqKXZBZ55YHNR6RL9JJTi65ndbqPKRdpM= +github.com/aws/aws-sdk-go-v2/service/cloudfront v1.1.1/go.mod h1:xNq//oorX26+SRydd//Rqk3iPLoKzoYmAGDm6p3wpzc= +github.com/aws/aws-sdk-go-v2/service/ecr v1.1.1 h1:idXCsD7Rl3LtE/MFFw81a1C1tVRSP3AOnv96U0TsRUo= +github.com/aws/aws-sdk-go-v2/service/ecr v1.1.1/go.mod h1:NGFCwbEd03lj5kwG8vO5qS5m4CfvHE4ir3pA5ozrlUM= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2 h1:4AH9fFjUlVktQMznF+YN33aWNXaR4VgDXyP28qokJC0= +github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.0.2/go.mod h1:45MfaXZ0cNbeuT0KQ1XJylq8A6+OpVV2E5kvY/Kq+u8= +github.com/aws/aws-sdk-go-v2/service/sso v1.1.1 h1:37QubsarExl5ZuCBlnRP+7l1tNwZPBSTqpTBrPH98RU= +github.com/aws/aws-sdk-go-v2/service/sso v1.1.1/go.mod h1:SuZJxklHxLAXgLTc1iFXbEWkXs7QRTQpCLGaKIprQW0= +github.com/aws/aws-sdk-go-v2/service/sts v1.1.1 h1:TJoIfnIFubCX0ACVeJ0w46HEH5MwjwYN4iFhuYIhfIY= +github.com/aws/aws-sdk-go-v2/service/sts v1.1.1/go.mod h1:Wi0EBZwiz/K44YliU0EKxqTCJGUfYTWXrrBwkq736bM= +github.com/aws/smithy-go v1.1.0 h1:D6CSsM3gdxaGaqXnPgOBCeL6Mophqzu7KJOu7zW78sU= +github.com/aws/smithy-go v1.1.0/go.mod h1:EzMw8dbp/YJL4A5/sbhGddag+NPT7q084agLbB9LgIw= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gabriel-vasile/mimetype v1.1.1 h1:qbN9MPuRf3bstHu9zkI9jDWNfH//9+9kHxr9oRBBBOA= From 283a2ec12f41ac904c492781e7cf8ca03fe6db2e Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Fri, 19 Feb 2021 09:34:09 +0900 Subject: [PATCH 2/2] Update LoadDefaultConfig argument --- cmd/uaws-cloudfront-create-invalidation/main.go | 8 ++++---- cmd/uaws-ecr-get-login-password/main.go | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/uaws-cloudfront-create-invalidation/main.go b/cmd/uaws-cloudfront-create-invalidation/main.go index f069953..7d2e26d 100644 --- a/cmd/uaws-cloudfront-create-invalidation/main.go +++ b/cmd/uaws-cloudfront-create-invalidation/main.go @@ -44,16 +44,16 @@ func main() { os.Exit(1) } - cfg, err := config.LoadDefaultConfig() + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + + cfg, err := config.LoadDefaultConfig(ctx) if err != nil { fmt.Fprintf(os.Stderr, "error: failed to load config: %v\n", err) } svc := cloudfront.NewFromConfig(cfg) - ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) - defer cancel() - res, err := svc.CreateInvalidation(ctx, &cloudfront.CreateInvalidationInput{ DistributionId: aws.String(*distributionID), InvalidationBatch: &cf_types.InvalidationBatch{ diff --git a/cmd/uaws-ecr-get-login-password/main.go b/cmd/uaws-ecr-get-login-password/main.go index aa0b0f1..40ca4b7 100644 --- a/cmd/uaws-ecr-get-login-password/main.go +++ b/cmd/uaws-ecr-get-login-password/main.go @@ -13,16 +13,16 @@ import ( ) func main() { - cfg, err := config.LoadDefaultConfig() + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + defer cancel() + + cfg, err := config.LoadDefaultConfig(ctx) if err != nil { fmt.Fprintf(os.Stderr, "error: failed to load config: %v\n", err) } svc := ecr.NewFromConfig(cfg) - ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) - defer cancel() - res, err := svc.GetAuthorizationToken(ctx, &ecr.GetAuthorizationTokenInput{}) if err != nil { fmt.Fprintf(os.Stderr, "error: failed to get ecr login password: %v\n", err)