Skip to content

Commit 42b67dc

Browse files
ewbankkitewbankkit
committed
Merge branch 'main' into f-aws-sdk-go-v1-compatible-retry.MaxBackoff
2 parents 01548ac + 4a8595f commit 42b67dc

File tree

8 files changed

+91
-77
lines changed

8 files changed

+91
-77
lines changed

‎GNUmakefile‎

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,28 @@ TIMEOUT ?= 30s
22

33
default: test lint
44

5+
cleantidy:
6+
@echo "make: tidying Go mods..."
7+
@cd tools && go mod tidy && cd ..
8+
@cd v2/awsv1shim && go mod tidy && cd ../..
9+
@go mod tidy
10+
@echo "make: Go mods tidied"
11+
512
fmt:
613
gofmt -s -w ./
714

8-
lint: golangci-lint importlint
9-
1015
golangci-lint:
1116
@golangci-lint run ./...
1217
@cd v2/awsv1shim && golangci-lint run ./...
1318

1419
importlint:
1520
@impi --local . --scheme stdThirdPartyLocal ./...
1621

22+
lint: golangci-lint importlint
23+
24+
semgrep:
25+
@docker run --rm --volume "${PWD}:/src" returntocorp/semgrep semgrep --config .semgrep --no-rewrite-rule-ids
26+
1727
test:
1828
go test -timeout=$(TIMEOUT) -parallel=4 ./...
1929
cd v2/awsv1shim && go test -timeout=$(TIMEOUT) -parallel=4 ./...
@@ -22,7 +32,13 @@ tools:
2232
cd tools && go install github.com/golangci/golangci-lint/cmd/golangci-lint
2333
cd tools && go install github.com/pavius/impi/cmd/impi
2434

25-
semgrep:
26-
@docker run --rm --volume "${PWD}:/src" returntocorp/semgrep semgrep --config .semgrep --no-rewrite-rule-ids
27-
28-
.PHONY: lint test tools
35+
# Please keep targets in alphabetical order
36+
.PHONY: \
37+
cleantidy \
38+
fmt \
39+
golangci-lint \
40+
importlint \
41+
lint \
42+
test \
43+
test \
44+
tools \

‎aws_config.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,6 @@ func resolveRetryer(ctx context.Context, tokenBucketRateLimiterCapacity int, aws
203203
var standardOptions []func(*retry.StandardOptions)
204204
standardOptions = append(standardOptions, func(so *retry.StandardOptions) {
205205
// AWS SDK for Go v1 DefaultRetryerMaxRetryDelay: https://github.com/aws/aws-sdk-go/blob/9f6e3bb9f523aef97fa1cd5c5f8ba8ecf212e44e/aws/client/default_retryer.go#L48-L49.
206-
// Note that certain EC2 operations have a lower value: https://github.com/aws/aws-sdk-go/blob/9f6e3bb9f523aef97fa1cd5c5f8ba8ecf212e44e/service/ec2/customizations.go#L34-L46
207206
so.MaxBackoff = 300 * time.Second
208207
})
209208

‎go.mod‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,24 @@ go 1.21
44

55
require (
66
github.com/aws/aws-sdk-go-v2 v1.26.1
7-
github.com/aws/aws-sdk-go-v2/config v1.27.10
8-
github.com/aws/aws-sdk-go-v2/credentials v1.17.10
7+
github.com/aws/aws-sdk-go-v2/config v1.27.11
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11
99
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1
1010
github.com/aws/aws-sdk-go-v2/service/dynamodb v1.31.1
1111
github.com/aws/aws-sdk-go-v2/service/iam v1.31.4
1212
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1
1313
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.4
14-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.4
14+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5
1515
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6
1616
github.com/aws/smithy-go v1.20.2
1717
github.com/google/go-cmp v0.6.0
18-
github.com/hashicorp/go-hclog v1.6.2
18+
github.com/hashicorp/go-hclog v1.6.3
1919
github.com/hashicorp/go-multierror v1.1.1
2020
github.com/hashicorp/terraform-plugin-log v0.9.0
2121
github.com/mitchellh/go-homedir v1.1.0
22-
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.49.0
23-
go.opentelemetry.io/otel v1.24.0
24-
golang.org/x/net v0.23.0
22+
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.50.0
23+
go.opentelemetry.io/otel v1.25.0
24+
golang.org/x/net v0.24.0
2525
golang.org/x/text v0.14.0
2626
)
2727

@@ -45,9 +45,8 @@ require (
4545
github.com/mattn/go-colorable v0.1.13 // indirect
4646
github.com/mattn/go-isatty v0.0.20 // indirect
4747
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
48-
github.com/stretchr/testify v1.9.0 // indirect
49-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
50-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
51-
golang.org/x/sys v0.18.0 // indirect
48+
go.opentelemetry.io/otel/metric v1.25.0 // indirect
49+
go.opentelemetry.io/otel/trace v1.25.0 // indirect
50+
golang.org/x/sys v0.19.0 // indirect
5251
gopkg.in/yaml.v2 v2.4.0 // indirect
5352
)

‎go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+
22
github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM=
33
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 h1:x6xsQXGSmW6frevwDA+vi/wqhp1ct18mVXYN08/93to=
44
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2/go.mod h1:lPprDr1e6cJdyYeGXnRaJoP4Md+cDBvi2eOj00BlGmg=
5-
github.com/aws/aws-sdk-go-v2/config v1.27.10 h1:PS+65jThT0T/snC5WjyfHHyUgG+eBoupSDV+f838cro=
6-
github.com/aws/aws-sdk-go-v2/config v1.27.10/go.mod h1:BePM7Vo4OBpHreKRUMuDXX+/+JWP38FLkzl5m27/Jjs=
7-
github.com/aws/aws-sdk-go-v2/credentials v1.17.10 h1:qDZ3EA2lv1KangvQB6y258OssCHD0xvaGiEDkG4X/10=
8-
github.com/aws/aws-sdk-go-v2/credentials v1.17.10/go.mod h1:6t3sucOaYDwDssHQa0ojH1RpmVmF5/jArkye1b2FKMI=
5+
github.com/aws/aws-sdk-go-v2/config v1.27.11 h1:f47rANd2LQEYHda2ddSCKYId18/8BhSRM4BULGmfgNA=
6+
github.com/aws/aws-sdk-go-v2/config v1.27.11/go.mod h1:SMsV78RIOYdve1vf36z8LmnszlRWkwMQtomCAI0/mIE=
7+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 h1:YuIB1dJNf1Re822rriUOTxopaHHvIq0l/pX3fwO+Tzs=
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11/go.mod h1:AQtFPsDH9bI2O+71anW6EKL+NcD7LG3dpKGMV4SShgo=
99
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1 h1:FVJ0r5XTHSmIHJV6KuDmdYhEpvlHpiSd38RQWhut5J4=
1010
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1/go.mod h1:zusuAeqezXzAB24LGuzuekqMAEgWkVYukBec3kr3jUg=
1111
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 h1:aw39xVGeRWlWx9EzGVnhOR4yOjQDHPQ6o6NmBlscyQg=
@@ -34,8 +34,8 @@ github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 h1:6cnno47Me9bRykw9AEv9zkXE+5or7
3434
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1/go.mod h1:qmdkIIAC+GCLASF7R2whgNrJADz0QZPX+Seiw/i4S3o=
3535
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.4 h1:mE2ysZMEeQ3ulHWs4mmc4fZEhOfeY1o6QXAfDqjbSgw=
3636
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.4/go.mod h1:lCN2yKnj+Sp9F6UzpoPPTir+tSaC9Jwf6LcmTqnXFZw=
37-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.4 h1:WzFol5Cd+yDxPAdnzTA5LmpHYSWinhmSj4rQChV0ee8=
38-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.4/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM=
37+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 h1:vN8hEbpRnL7+Hopy9dzmRle1xmDc7o8tmY0klsr175w=
38+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5/go.mod h1:qGzynb/msuZIE8I75DVRCUXw3o3ZyBmUvMwQ2t/BrGM=
3939
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 h1:Jux+gDDyi1Lruk+KHF91tK2KCuY61kzoCpvtvJJBtOE=
4040
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4/go.mod h1:mUYPBhaF2lGiukDEjJX2BLRRKTmoUSitGDUgM4tRxak=
4141
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6 h1:cwIxeBttqPN3qkaAjcEcsh8NYr8n2HZPkcKgPAi1phU=
@@ -58,8 +58,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
5858
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
5959
github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
6060
github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
61-
github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I=
62-
github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
61+
github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
62+
github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
6363
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
6464
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
6565
github.com/hashicorp/terraform-plugin-log v0.9.0 h1:i7hOA+vdAItN1/7UrfBqBwvYPQ9TFvymaRGZED3FCV0=
@@ -87,25 +87,25 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
8787
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
8888
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
8989
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
90-
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.49.0 h1:2P+w3GiH9Esh8f5mEa8lTB+8Ruh7XCsCuQah0tLEmE4=
91-
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.49.0/go.mod h1:P9cJwfcWVLOHu/8swW4Jfl8AX/a4eXTptW9rp0Uv/co=
92-
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
93-
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
94-
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
95-
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
96-
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
97-
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
98-
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
99-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
90+
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.50.0 h1:0zXBsTKPsly2MlyLYyra1GuL23fsY5RMsi6E2ZOe988=
91+
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.50.0/go.mod h1:Tztzncf+ezyOCjXz8zRjVL2agqyBxhymGnK6rqgoY5c=
92+
go.opentelemetry.io/otel v1.25.0 h1:gldB5FfhRl7OJQbUHt/8s0a7cE8fbsPAtdpRaApKy4k=
93+
go.opentelemetry.io/otel v1.25.0/go.mod h1:Wa2ds5NOXEMkCmUou1WA7ZBfLTHWIsp034OVD7AO+Vg=
94+
go.opentelemetry.io/otel/metric v1.25.0 h1:LUKbS7ArpFL/I2jJHdJcqMGxkRdxpPHE0VU/D4NuEwA=
95+
go.opentelemetry.io/otel/metric v1.25.0/go.mod h1:rkDLUSd2lC5lq2dFNrX9LGAbINP5B7WBkC78RXCpH5s=
96+
go.opentelemetry.io/otel/trace v1.25.0 h1:tqukZGLwQYRIFtSQM2u2+yfMVTgGVeqRLPUYx1Dq6RM=
97+
go.opentelemetry.io/otel/trace v1.25.0/go.mod h1:hCCs70XM/ljO+BeQkyFnbK28SBIJ/Emuha+ccrCRT7I=
98+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
99+
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
100100
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
101101
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
102102
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
103103
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
104104
golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
105105
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
106106
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
107-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
108-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
107+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
108+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
109109
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
110110
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
111111
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎tools/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ require (
176176
golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect
177177
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
178178
golang.org/x/mod v0.16.0 // indirect
179-
golang.org/x/net v0.23.0 // indirect
179+
golang.org/x/net v0.24.0 // indirect
180180
golang.org/x/sync v0.6.0 // indirect
181-
golang.org/x/sys v0.18.0 // indirect
181+
golang.org/x/sys v0.19.0 // indirect
182182
golang.org/x/text v0.14.0 // indirect
183183
golang.org/x/tools v0.19.0 // indirect
184184
google.golang.org/protobuf v1.33.0 // indirect

‎tools/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,8 @@ golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
670670
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
671671
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
672672
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
673-
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
674-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
673+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
674+
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
675675
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
676676
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
677677
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -747,8 +747,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
747747
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
748748
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
749749
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
750-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
751-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
750+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
751+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
752752
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
753753
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
754754
golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

‎v2/awsv1shim/go.mod‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@ module github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2
33
go 1.21
44

55
require (
6-
github.com/aws/aws-sdk-go v1.51.14
6+
github.com/aws/aws-sdk-go v1.51.19
77
github.com/aws/aws-sdk-go-v2 v1.26.1
8-
github.com/aws/aws-sdk-go-v2/config v1.27.10
9-
github.com/aws/aws-sdk-go-v2/credentials v1.17.10
8+
github.com/aws/aws-sdk-go-v2/config v1.27.11
9+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11
1010
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1
1111
github.com/aws/aws-sdk-go-v2/service/sts v1.28.6
1212
github.com/google/go-cmp v0.6.0
1313
github.com/hashicorp/aws-sdk-go-base/v2 v2.0.0-beta.51
1414
github.com/hashicorp/go-cleanhttp v0.5.2
1515
github.com/hashicorp/terraform-plugin-log v0.9.0
16-
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.49.0
17-
go.opentelemetry.io/otel v1.24.0
16+
go.opentelemetry.io/contrib/instrumentation/github.com/aws/aws-sdk-go-v2/otelaws v0.50.0
17+
go.opentelemetry.io/otel v1.25.0
1818
)
1919

2020
require (
@@ -32,24 +32,24 @@ require (
3232
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
3333
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
3434
github.com/aws/aws-sdk-go-v2/service/sqs v1.31.4 // indirect
35-
github.com/aws/aws-sdk-go-v2/service/sso v1.20.4 // indirect
35+
github.com/aws/aws-sdk-go-v2/service/sso v1.20.5 // indirect
3636
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.23.4 // indirect
3737
github.com/aws/smithy-go v1.20.2 // indirect
3838
github.com/fatih/color v1.16.0 // indirect
3939
github.com/go-logr/logr v1.4.1 // indirect
4040
github.com/go-logr/stdr v1.2.2 // indirect
4141
github.com/hashicorp/errwrap v1.1.0 // indirect
42-
github.com/hashicorp/go-hclog v1.6.2 // indirect
42+
github.com/hashicorp/go-hclog v1.6.3 // indirect
4343
github.com/hashicorp/go-multierror v1.1.1 // indirect
4444
github.com/jmespath/go-jmespath v0.4.0 // indirect
4545
github.com/mattn/go-colorable v0.1.13 // indirect
4646
github.com/mattn/go-isatty v0.0.20 // indirect
4747
github.com/mitchellh/go-homedir v1.1.0 // indirect
4848
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
49-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
50-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
51-
golang.org/x/net v0.23.0 // indirect
52-
golang.org/x/sys v0.18.0 // indirect
49+
go.opentelemetry.io/otel/metric v1.25.0 // indirect
50+
go.opentelemetry.io/otel/trace v1.25.0 // indirect
51+
golang.org/x/net v0.24.0 // indirect
52+
golang.org/x/sys v0.19.0 // indirect
5353
golang.org/x/text v0.14.0 // indirect
5454
)
5555

0 commit comments

Comments
 (0)