Skip to content

Commit 39075fc

Browse files
committed
Update cockroach-go module version
The new cockroach-go module adds a tenant scope argument while generating client certificates for tenant servers within the cockroach go repo. We need this new change in order for the tests with example-orms to work correctly with the upcoming changes for tenant scoped client certificates. Without this change, the tenant tests will fail as the client certificates generated through the cockroach-go modules will be unable to authenticate correctly with the tenant server.
1 parent 14d45d4 commit 39075fc

File tree

3 files changed

+104
-62
lines changed

3 files changed

+104
-62
lines changed

.github/workflows/golangci-lint.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ jobs:
1616
name: lint
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
20+
with:
21+
go-version: 1.17
2022
- name: golangci-lint
21-
uses: golangci/golangci-lint-action@v2
23+
uses: golangci/golangci-lint-action@v3
2224
with:
2325
# Optional: version of golangci-lint to use in form of v1.2 or v1.2.3 or `latest` to use the latest version
24-
version: v1.29
26+
version: v1.46.2

go.mod

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,41 @@
11
module github.com/cockroachdb/examples-orms
22

3-
go 1.13
3+
go 1.17
44

55
require (
6-
github.com/cockroachdb/cockroach-go/v2 v2.2.4
6+
github.com/cockroachdb/cockroach-go/v2 v2.2.12
77
github.com/go-pg/pg/v10 v10.9.0
88
github.com/julienschmidt/httprouter v1.1.0
9-
github.com/lib/pq v1.10.0
9+
github.com/lib/pq v1.10.6
1010
github.com/pkg/errors v0.9.1
11-
gorm.io/driver/postgres v1.0.8
12-
gorm.io/gorm v1.21.6
11+
gorm.io/driver/postgres v1.3.5
12+
gorm.io/gorm v1.23.5
13+
)
14+
15+
require (
16+
github.com/go-pg/zerochecker v0.2.0 // indirect
17+
github.com/gofrs/flock v0.8.1 // indirect
18+
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
19+
github.com/jackc/pgconn v1.12.1 // indirect
20+
github.com/jackc/pgio v1.0.0 // indirect
21+
github.com/jackc/pgpassfile v1.0.0 // indirect
22+
github.com/jackc/pgproto3/v2 v2.3.0 // indirect
23+
github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
24+
github.com/jackc/pgtype v1.11.0 // indirect
25+
github.com/jackc/pgx/v4 v4.16.1 // indirect
26+
github.com/jinzhu/inflection v1.0.0 // indirect
27+
github.com/jinzhu/now v1.1.4 // indirect
28+
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
29+
github.com/vmihailenco/bufpool v0.1.11 // indirect
30+
github.com/vmihailenco/msgpack/v5 v5.3.0 // indirect
31+
github.com/vmihailenco/tagparser v0.1.2 // indirect
32+
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
33+
go.opentelemetry.io/otel v0.19.0 // indirect
34+
go.opentelemetry.io/otel/metric v0.19.0 // indirect
35+
go.opentelemetry.io/otel/trace v0.19.0 // indirect
36+
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167 // indirect
37+
golang.org/x/sys v0.0.0-20220513210249-45d2b4557a2a // indirect
38+
golang.org/x/text v0.3.7 // indirect
39+
gopkg.in/yaml.v2 v2.4.0 // indirect
40+
mellium.im/sasl v0.2.1 // indirect
1341
)

0 commit comments

Comments
 (0)