Skip to content

Commit 8c45e34

Browse files
committed
Upgrade testcontainers to v0.38.0 and convert resource_database_test
Upgrades: - testcontainers-go: v0.30.0 → v0.38.0 (latest compatible with Go 1.23) - Includes bug fixes and improvements New test file: - resource_database_testcontainers_test.go: Converted TestAccDatabase and TestAccDatabase_collationChange to use Testcontainers This demonstrates: - Multiple test functions in one file using Testcontainers - Import state testing with Testcontainers - PreConfig hooks work correctly with Testcontainers - CheckDestroy functions work with Testcontainers
1 parent b2829e0 commit 8c45e34

File tree

3 files changed

+221
-106
lines changed

3 files changed

+221
-106
lines changed

go.mod

Lines changed: 43 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,37 +10,40 @@ require (
1010
github.com/hashicorp/go-version v1.7.0
1111
github.com/hashicorp/terraform-plugin-log v0.9.0
1212
github.com/hashicorp/terraform-plugin-sdk/v2 v2.34.0
13-
github.com/testcontainers/testcontainers-go v0.30.0
13+
github.com/testcontainers/testcontainers-go v0.38.0
1414
github.com/testcontainers/testcontainers-go/modules/mysql v0.30.0
1515
github.com/tidwall/gjson v1.17.1
16-
golang.org/x/net v0.26.0
17-
golang.org/x/oauth2 v0.21.0
16+
golang.org/x/net v0.28.0
17+
golang.org/x/oauth2 v0.22.0
1818
google.golang.org/api v0.185.0
1919
)
2020

2121
require (
2222
cloud.google.com/go/auth v0.5.1 // indirect
2323
cloud.google.com/go/auth/oauth2adapt v0.2.2 // indirect
24-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
25-
dario.cat/mergo v1.0.0 // indirect
24+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
25+
dario.cat/mergo v1.0.1 // indirect
2626
filippo.io/edwards25519 v1.1.0 // indirect
2727
github.com/Azure/azure-sdk-for-go/sdk/internal v1.9.0 // indirect
2828
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
2929
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
30-
github.com/Microsoft/go-winio v0.6.1 // indirect
31-
github.com/Microsoft/hcsshim v0.11.4 // indirect
30+
github.com/Microsoft/go-winio v0.6.2 // indirect
3231
github.com/ProtonMail/go-crypto v1.1.0-alpha.2-proton // indirect
3332
github.com/agext/levenshtein v1.2.3 // indirect
3433
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
3534
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3635
github.com/cloudflare/circl v1.3.8 // indirect
37-
github.com/containerd/containerd v1.7.12 // indirect
36+
github.com/containerd/errdefs v1.0.0 // indirect
37+
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3838
github.com/containerd/log v0.1.0 // indirect
39-
github.com/cpuguy83/dockercfg v0.3.1 // indirect
40-
github.com/distribution/reference v0.5.0 // indirect
41-
github.com/docker/docker v25.0.5+incompatible // indirect
39+
github.com/containerd/platforms v0.2.1 // indirect
40+
github.com/cpuguy83/dockercfg v0.3.2 // indirect
41+
github.com/davecgh/go-spew v1.1.1 // indirect
42+
github.com/distribution/reference v0.6.0 // indirect
43+
github.com/docker/docker v28.2.2+incompatible // indirect
4244
github.com/docker/go-connections v0.5.0 // indirect
4345
github.com/docker/go-units v0.5.0 // indirect
46+
github.com/ebitengine/purego v0.8.4 // indirect
4447
github.com/fatih/color v1.17.0 // indirect
4548
github.com/felixge/httpsnoop v1.0.4 // indirect
4649
github.com/go-logr/logr v1.4.2 // indirect
@@ -50,7 +53,7 @@ require (
5053
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
5154
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5255
github.com/golang/protobuf v1.5.4 // indirect
53-
github.com/google/go-cmp v0.6.0 // indirect
56+
github.com/google/go-cmp v0.7.0 // indirect
5457
github.com/google/s2a-go v0.1.7 // indirect
5558
github.com/google/uuid v1.6.0 // indirect
5659
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
@@ -72,57 +75,66 @@ require (
7275
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
7376
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
7477
github.com/hashicorp/yamux v0.1.1 // indirect
75-
github.com/klauspost/compress v1.16.0 // indirect
78+
github.com/klauspost/compress v1.18.0 // indirect
7679
github.com/kylelemons/godebug v1.1.0 // indirect
7780
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
78-
github.com/magiconair/properties v1.8.7 // indirect
81+
github.com/magiconair/properties v1.8.10 // indirect
7982
github.com/mattn/go-colorable v0.1.13 // indirect
8083
github.com/mattn/go-isatty v0.0.20 // indirect
8184
github.com/mitchellh/copystructure v1.2.0 // indirect
8285
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
8386
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
8487
github.com/mitchellh/mapstructure v1.5.0 // indirect
8588
github.com/mitchellh/reflectwalk v1.0.2 // indirect
89+
github.com/moby/docker-image-spec v1.3.1 // indirect
90+
github.com/moby/go-archive v0.1.0 // indirect
8691
github.com/moby/patternmatcher v0.6.0 // indirect
87-
github.com/moby/sys/sequential v0.5.0 // indirect
88-
github.com/moby/sys/user v0.1.0 // indirect
92+
github.com/moby/sys/sequential v0.6.0 // indirect
93+
github.com/moby/sys/user v0.4.0 // indirect
94+
github.com/moby/sys/userns v0.1.0 // indirect
8995
github.com/moby/term v0.5.0 // indirect
9096
github.com/morikuni/aec v1.0.0 // indirect
9197
github.com/oklog/run v1.1.0 // indirect
9298
github.com/opencontainers/go-digest v1.0.0 // indirect
93-
github.com/opencontainers/image-spec v1.1.0 // indirect
99+
github.com/opencontainers/image-spec v1.1.1 // indirect
94100
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
95101
github.com/pkg/errors v0.9.1 // indirect
102+
github.com/pmezard/go-difflib v1.0.0 // indirect
96103
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
97-
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
98-
github.com/shoenig/go-m1cpu v0.1.6 // indirect
104+
github.com/shirou/gopsutil/v4 v4.25.5 // indirect
99105
github.com/sirupsen/logrus v1.9.3 // indirect
106+
github.com/stretchr/testify v1.10.0 // indirect
100107
github.com/tidwall/match v1.1.1 // indirect
101108
github.com/tidwall/pretty v1.2.1 // indirect
102109
github.com/tklauser/go-sysconf v0.3.12 // indirect
103110
github.com/tklauser/numcpus v0.6.1 // indirect
104111
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
105112
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
106113
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
107-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
114+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
108115
github.com/zclconf/go-cty v1.14.4 // indirect
109116
go.opencensus.io v0.24.0 // indirect
117+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
110118
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
111-
go.opentelemetry.io/otel v1.27.0 // indirect
112-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
113-
go.opentelemetry.io/otel/trace v1.27.0 // indirect
114-
golang.org/x/crypto v0.24.0 // indirect
115-
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
119+
go.opentelemetry.io/otel v1.35.0 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
121+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
122+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
123+
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
124+
golang.org/x/crypto v0.37.0 // indirect
116125
golang.org/x/mod v0.18.0 // indirect
117-
golang.org/x/sync v0.7.0 // indirect
118-
golang.org/x/sys v0.21.0 // indirect
119-
golang.org/x/text v0.16.0 // indirect
126+
golang.org/x/sync v0.13.0 // indirect
127+
golang.org/x/sys v0.32.0 // indirect
128+
golang.org/x/text v0.24.0 // indirect
120129
golang.org/x/time v0.5.0 // indirect
121130
golang.org/x/tools v0.22.0 // indirect
122131
google.golang.org/appengine v1.6.8 // indirect
123-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect
124-
google.golang.org/grpc v1.64.0 // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
133+
google.golang.org/grpc v1.67.0 // indirect
125134
google.golang.org/protobuf v1.34.2 // indirect
135+
gopkg.in/yaml.v3 v3.0.1 // indirect
126136
)
127137

128-
go 1.21.11
138+
go 1.23.0
139+
140+
toolchain go1.23.4

0 commit comments

Comments
 (0)