Skip to content

Commit 48fdbaf

Browse files
brittandeyoungbrittandeyoung
committed
Merge branch 'main' into f-aws_lightsail_instance_add_on
2 parents 7595981 + e2fdf52 commit 48fdbaf

26 files changed

+812
-207
lines changed

‎.changelog/28585.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:new-resource
2+
aws_lightsail_bucket
3+
```

‎.changelog/28593.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
resource/aws_lightsail_disk_attachment: Resolves a panic when an attachment fails and attempts to display the error returned by AWS.
3+
```

‎.ci/providerlint/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/hashicorp/terraform-provider-aws/ci/providerlint
33
go 1.19
44

55
require (
6-
github.com/aws/aws-sdk-go v1.44.167
6+
github.com/aws/aws-sdk-go v1.44.171
77
github.com/bflad/tfproviderlint v0.28.1
88
github.com/hashicorp/terraform-plugin-sdk/v2 v2.24.1
99
golang.org/x/tools v0.1.12

‎.ci/providerlint/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
6363
github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM=
6464
github.com/aws/aws-sdk-go v1.25.3/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
6565
github.com/aws/aws-sdk-go v1.37.0/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
66-
github.com/aws/aws-sdk-go v1.44.167 h1:kQmBhGdZkQLU7AiHShSkBJ15zr8agy0QeaxXduvyp2E=
67-
github.com/aws/aws-sdk-go v1.44.167/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
66+
github.com/aws/aws-sdk-go v1.44.171 h1:maREiPAmibvuONMOEZIkCH2OTosLRnDelceTtH3SYfo=
67+
github.com/aws/aws-sdk-go v1.44.171/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
6868
github.com/bflad/gopaniccheck v0.1.0 h1:tJftp+bv42ouERmUMWLoUn/5bi/iQZjHPznM00cP/bU=
6969
github.com/bflad/gopaniccheck v0.1.0/go.mod h1:ZCj2vSr7EqVeDaqVsWN4n2MwdROx1YL+LFo47TSWtsA=
7070
github.com/bflad/tfproviderlint v0.28.1 h1:7f54/ynV6/lK5/1EyG7tHtc4sMdjJSEFGjZNRJKwBs8=

‎.ci/providerlint/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go

+15-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.ci/providerlint/vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ github.com/agext/levenshtein
44
# github.com/apparentlymart/go-textseg/v13 v13.0.0
55
## explicit; go 1.16
66
github.com/apparentlymart/go-textseg/v13/textseg
7-
# github.com/aws/aws-sdk-go v1.44.167
7+
# github.com/aws/aws-sdk-go v1.44.171
88
## explicit; go 1.11
99
github.com/aws/aws-sdk-go/aws/awserr
1010
github.com/aws/aws-sdk-go/aws/endpoints

‎.ci/tools/go.mod

+15-15
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/katbyte/terrafmt v0.5.2
1111
github.com/pavius/impi v0.0.3
1212
github.com/rhysd/actionlint v1.6.22
13-
github.com/terraform-linters/tflint v0.43.0
13+
github.com/terraform-linters/tflint v0.44.1
1414
mvdan.cc/gofumpt v0.4.0
1515
)
1616

@@ -28,7 +28,7 @@ require (
2828
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
2929
github.com/Masterminds/goutils v1.1.0 // indirect
3030
github.com/Masterminds/semver v1.5.0 // indirect
31-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
31+
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3232
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
3333
github.com/Microsoft/go-winio v0.4.16 // indirect
3434
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
@@ -107,9 +107,9 @@ require (
107107
github.com/hashicorp/errwrap v1.1.0 // indirect
108108
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
109109
github.com/hashicorp/go-getter v1.6.2 // indirect
110-
github.com/hashicorp/go-hclog v1.3.1 // indirect
110+
github.com/hashicorp/go-hclog v1.4.0 // indirect
111111
github.com/hashicorp/go-multierror v1.1.1 // indirect
112-
github.com/hashicorp/go-plugin v1.4.6 // indirect
112+
github.com/hashicorp/go-plugin v1.4.8 // indirect
113113
github.com/hashicorp/go-safetemp v1.0.0 // indirect
114114
github.com/hashicorp/go-uuid v1.0.3 // indirect
115115
github.com/hashicorp/go-version v1.6.0 // indirect
@@ -119,7 +119,7 @@ require (
119119
github.com/hashicorp/logutils v1.0.0 // indirect
120120
github.com/hashicorp/terraform-exec v0.17.2 // indirect
121121
github.com/hashicorp/terraform-json v0.14.0 // indirect
122-
github.com/hashicorp/terraform-registry-address v0.0.0-20220623143253-7d51757b572c // indirect
122+
github.com/hashicorp/terraform-registry-address v0.1.0 // indirect
123123
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
124124
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
125125
github.com/hexops/gotextdiff v1.0.3 // indirect
@@ -206,7 +206,7 @@ require (
206206
github.com/sourcegraph/go-diff v0.6.1 // indirect
207207
github.com/sourcegraph/go-lsp v0.0.0-20200429204803-219e11d77f5d // indirect
208208
github.com/sourcegraph/jsonrpc2 v0.1.0 // indirect
209-
github.com/spf13/afero v1.9.2 // indirect
209+
github.com/spf13/afero v1.9.3 // indirect
210210
github.com/spf13/cast v1.5.0 // indirect
211211
github.com/spf13/cobra v1.6.0 // indirect
212212
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -218,8 +218,8 @@ require (
218218
github.com/stretchr/testify v1.8.0 // indirect
219219
github.com/subosito/gotenv v1.4.1 // indirect
220220
github.com/tdakkota/asciicheck v0.1.1 // indirect
221-
github.com/terraform-linters/tflint-plugin-sdk v0.14.0 // indirect
222-
github.com/terraform-linters/tflint-ruleset-terraform v0.2.1 // indirect
221+
github.com/terraform-linters/tflint-plugin-sdk v0.15.0 // indirect
222+
github.com/terraform-linters/tflint-ruleset-terraform v0.2.2 // indirect
223223
github.com/tetafro/godot v1.4.11 // indirect
224224
github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect
225225
github.com/timonwong/loggercheck v0.9.3 // indirect
@@ -248,18 +248,18 @@ require (
248248
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
249249
golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
250250
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
251-
golang.org/x/mod v0.6.0 // indirect
252-
golang.org/x/net v0.1.0 // indirect
251+
golang.org/x/mod v0.7.0 // indirect
252+
golang.org/x/net v0.3.0 // indirect
253253
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
254-
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
255-
golang.org/x/sys v0.1.0 // indirect
256-
golang.org/x/text v0.4.0 // indirect
257-
golang.org/x/tools v0.2.0 // indirect
254+
golang.org/x/sync v0.1.0 // indirect
255+
golang.org/x/sys v0.3.0 // indirect
256+
golang.org/x/text v0.5.0 // indirect
257+
golang.org/x/tools v0.4.0 // indirect
258258
golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df // indirect
259259
google.golang.org/api v0.81.0 // indirect
260260
google.golang.org/appengine v1.6.7 // indirect
261261
google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
262-
google.golang.org/grpc v1.50.1 // indirect
262+
google.golang.org/grpc v1.51.0 // indirect
263263
google.golang.org/protobuf v1.28.1 // indirect
264264
gopkg.in/ini.v1 v1.67.0 // indirect
265265
gopkg.in/warnings.v0 v0.1.2 // indirect

0 commit comments

Comments
 (0)