Skip to content

Commit b3e58b4

Browse files
joschijoschi
authored
Merge branch 'master' into tests-fix
2 parents e856498 + d477553 commit b3e58b4

File tree

6 files changed

+34
-51
lines changed

6 files changed

+34
-51
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ jobs:
99
name: lint
1010
runs-on: ubuntu-latest
1111
steps:
12+
- uses: actions/checkout@v4
1213
- uses: actions/setup-go@v5
1314
with:
1415
go-version: "1.23.x"
15-
- uses: actions/checkout@v4
1616
- name: golangci-lint
1717
uses: golangci/golangci-lint-action@v6
1818
with:
19-
version: latest
19+
version: v1.63.4
2020

2121
test:
2222
runs-on: ubuntu-latest

‎database/cockroachdb/cockroachdb_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ const defaultPort = 26257
2727

2828
var (
2929
opts = dktest.Options{Cmd: []string{"start-single-node", "--insecure"}, PortRequired: true, ReadyFunc: isReady}
30-
// Released versions: https://www.cockroachlabs.com/docs/releases/
30+
// Supported versions: https://www.cockroachlabs.com/docs/releases/release-support-policy#supported-versions
3131
specs = []dktesting.ContainerSpec{
32-
{ImageName: "cockroachdb/cockroach:latest-v23.2", Options: opts},
33-
{ImageName: "cockroachdb/cockroach:latest-v24.1", Options: opts},
34-
{ImageName: "cockroachdb/cockroach:latest-v24.2", Options: opts},
3532
{ImageName: "cockroachdb/cockroach:latest-v24.3", Options: opts},
33+
{ImageName: "cockroachdb/cockroach:latest-v24.1", Options: opts},
34+
{ImageName: "cockroachdb/cockroach:latest-v23.2", Options: opts},
35+
{ImageName: "cockroachdb/cockroach:latest-v23.1", Options: opts},
3636
}
3737
)
3838

‎database/mysql/mysql_test.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,11 @@ var (
4040
}
4141
// Supported versions: https://www.mysql.com/support/supportedplatforms/database.html
4242
specs = []dktesting.ContainerSpec{
43-
{ImageName: "mysql:5.5", Options: opts},
44-
{ImageName: "mysql:5.6", Options: opts},
45-
{ImageName: "mysql:5.7", Options: opts},
4643
{ImageName: "mysql:8.0", Options: opts},
4744
{ImageName: "mysql:8.4", Options: opts},
4845
{ImageName: "mysql:9.0", Options: opts},
4946
}
5047
specsAnsiQuotes = []dktesting.ContainerSpec{
51-
{ImageName: "mysql:5.5", Options: optsAnsiQuotes},
52-
{ImageName: "mysql:5.6", Options: optsAnsiQuotes},
53-
{ImageName: "mysql:5.7", Options: optsAnsiQuotes},
5448
{ImageName: "mysql:8.0", Options: optsAnsiQuotes},
5549
{ImageName: "mysql:8.4", Options: optsAnsiQuotes},
5650
{ImageName: "mysql:9.0", Options: optsAnsiQuotes},

‎database/sqlserver/sqlserver_test.go‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import (
1212
"time"
1313

1414
"github.com/dhui/dktest"
15-
"github.com/docker/go-connections/nat"
1615
"github.com/golang-migrate/migrate/v4"
1716

1817
dt "github.com/golang-migrate/migrate/v4/database/testing"
@@ -25,27 +24,16 @@ const defaultPort = 1433
2524
const saPassword = "Root1234"
2625

2726
var (
28-
sqlEdgeOpts = dktest.Options{
29-
Env: map[string]string{"ACCEPT_EULA": "Y", "MSSQL_SA_PASSWORD": saPassword},
30-
PortBindings: map[nat.Port][]nat.PortBinding{
31-
nat.Port(fmt.Sprintf("%d/tcp", defaultPort)): {
32-
nat.PortBinding{
33-
HostIP: "0.0.0.0",
34-
HostPort: "0/tcp",
35-
},
36-
},
37-
},
38-
PortRequired: true, ReadyFunc: isReady, PullTimeout: 2 * time.Minute,
39-
}
4027
sqlServerOpts = dktest.Options{
4128
Env: map[string]string{"ACCEPT_EULA": "Y", "MSSQL_SA_PASSWORD": saPassword, "MSSQL_PID": "Express"},
4229
PortRequired: true, ReadyFunc: isReady, PullTimeout: 2 * time.Minute,
4330
}
4431
// Container versions: https://mcr.microsoft.com/v2/mssql/server/tags/list
4532
specs = []dktesting.ContainerSpec{
46-
{ImageName: "mcr.microsoft.com/azure-sql-edge:latest", Options: sqlEdgeOpts},
47-
{ImageName: "mcr.microsoft.com/mssql/server:2017-latest", Options: sqlServerOpts},
33+
{ImageName: "mcr.microsoft.com/mssql/server:2022-latest", Options: sqlServerOpts},
4834
{ImageName: "mcr.microsoft.com/mssql/server:2019-latest", Options: sqlServerOpts},
35+
// Add back support for 2017 version once the image is fixed: https://github.com/microsoft/mssql-docker/issues/899
36+
// {ImageName: "mcr.microsoft.com/mssql/server:2017-latest", Options: sqlServerOpts},
4937
}
5038
)
5139

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ require (
1212
github.com/aws/aws-sdk-go v1.49.6
1313
github.com/cenkalti/backoff/v4 v4.1.2
1414
github.com/cockroachdb/cockroach-go/v2 v2.1.1
15-
github.com/dhui/dktest v0.4.3
15+
github.com/dhui/dktest v0.4.4
1616
github.com/docker/docker v27.2.0+incompatible
17-
github.com/docker/go-connections v0.5.0
1817
github.com/fsouza/fake-gcs-server v1.17.0
1918
github.com/go-sql-driver/mysql v1.5.0
2019
github.com/gobuffalo/here v0.6.0
@@ -47,6 +46,7 @@ require (
4746

4847
require (
4948
github.com/distribution/reference v0.6.0 // indirect
49+
github.com/docker/go-connections v0.5.0 // indirect
5050
github.com/felixge/httpsnoop v1.0.4 // indirect
5151
github.com/go-logr/logr v1.4.2 // indirect
5252
github.com/go-logr/stdr v1.2.2 // indirect
@@ -119,7 +119,7 @@ require (
119119
github.com/goccy/go-json v0.9.11 // indirect
120120
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
121121
github.com/gogo/protobuf v1.3.2 // indirect
122-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
122+
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
123123
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect
124124
github.com/golang-sql/sqlexp v0.1.0 // indirect
125125
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -176,14 +176,14 @@ require (
176176
github.com/zeebo/xxh3 v1.0.2 // indirect
177177
gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b // indirect
178178
go.opencensus.io v0.24.0 // indirect
179-
golang.org/x/crypto v0.27.0 // indirect
179+
golang.org/x/crypto v0.31.0 // indirect
180180
golang.org/x/exp v0.0.0-20230315142452-642cacee5cc0 // indirect
181181
golang.org/x/mod v0.21.0 // indirect
182-
golang.org/x/net v0.29.0 // indirect
183-
golang.org/x/sync v0.8.0 // indirect
184-
golang.org/x/sys v0.25.0 // indirect
185-
golang.org/x/term v0.24.0 // indirect
186-
golang.org/x/text v0.18.0 // indirect
182+
golang.org/x/net v0.33.0 // indirect
183+
golang.org/x/sync v0.10.0 // indirect
184+
golang.org/x/sys v0.28.0 // indirect
185+
golang.org/x/term v0.27.0 // indirect
186+
golang.org/x/text v0.21.0 // indirect
187187
golang.org/x/time v0.5.0 // indirect
188188
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
189189
google.golang.org/appengine v1.6.8 // indirect

‎go.sum‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,8 @@ github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnG
153153
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
154154
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
155155
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
156-
github.com/dhui/dktest v0.4.3 h1:wquqUxAFdcUgabAVLvSCOKOlag5cIZuaOjYIBOWdsR0=
157-
github.com/dhui/dktest v0.4.3/go.mod h1:zNK8IwktWzQRm6I/l2Wjp7MakiyaFWv4G1hjmodmMTs=
156+
github.com/dhui/dktest v0.4.4 h1:+I4s6JRE1yGuqflzwqG+aIaMdgXIorCf5P98JnaAWa8=
157+
github.com/dhui/dktest v0.4.4/go.mod h1:4+22R4lgsdAXrDyaH4Nqx2JEz2hLp49MqQmm9HLCQhM=
158158
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
159159
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
160160
github.com/dnaeon/go-vcr v1.1.0/go.mod h1:M7tiix8f0r6mKKJ3Yq/kqU1OYf3MnfmBWVbPx/yU9ko=
@@ -220,8 +220,9 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx
220220
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
221221
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
222222
github.com/golang-jwt/jwt/v4 v4.0.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
223-
github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs=
224223
github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
224+
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
225+
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
225226
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
226227
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
227228
github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A=
@@ -648,8 +649,8 @@ golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5y
648649
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
649650
golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
650651
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
651-
golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
652-
golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
652+
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
653+
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
653654
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
654655
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
655656
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -708,8 +709,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx
708709
golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
709710
golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
710711
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
711-
golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
712-
golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
712+
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
713+
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
713714
golang.org/x/oauth2 v0.0.0-20180227000427-d7d64896b5ff/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
714715
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
715716
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -726,8 +727,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
726727
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
727728
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
728729
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
729-
golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
730-
golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
730+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
731+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
731732
golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
732733
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
733734
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -769,13 +770,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
769770
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
770771
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
771772
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
772-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
773-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
773+
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
774+
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
774775
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
775776
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
776777
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
777-
golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM=
778-
golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8=
778+
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
779+
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
779780
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
780781
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
781782
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -786,8 +787,8 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
786787
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
787788
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
788789
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
789-
golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
790-
golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
790+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
791+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
791792
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
792793
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
793794
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=

0 commit comments

Comments
 (0)