Skip to content

Commit 805be71

Browse files
ybelMekktommytroen
andcommitted
fix: tests
* update makefile * add better logging * update deps Co-authored-by: Tommy Trøen <[email protected]>
1 parent 9863259 commit 805be71

File tree

5 files changed

+221
-558
lines changed

5 files changed

+221
-558
lines changed

Makefile

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ fmt:
99
go fmt $(GO_PACKAGES)
1010

1111
test:
12-
go test -cover --race ./...
12+
go test -cover ./...
1313

1414
check: vulncheck deadcode gosec staticcheck
1515

@@ -64,6 +64,4 @@ generate-mocks:
6464

6565

6666
refresh-db:
67-
docker compose down
68-
docker volume rm v13s_pgdata
69-
docker compose up -d
67+
docker compose down -v

go.mod

+62-55
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ module github.com/nais/v13s
33
go 1.23.5
44

55
require (
6-
github.com/exaring/otelpgx v0.8.0
6+
github.com/exaring/otelpgx v0.9.0
7+
github.com/google/uuid v1.6.0
78
github.com/jackc/pgx/v5 v5.7.2
89
github.com/joho/godotenv v1.5.1
910
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
@@ -12,134 +13,140 @@ require (
1213
github.com/sqlc-dev/sqlc v1.28.0
1314
github.com/stretchr/testify v1.10.0
1415
github.com/testcontainers/testcontainers-go/modules/postgres v0.35.0
15-
github.com/vektra/mockery/v2 v2.51.1
16+
github.com/vektra/mockery/v2 v2.52.1
1617
google.golang.org/grpc v1.70.0
1718
google.golang.org/protobuf v1.36.4
1819
)
1920

2021
require (
21-
cel.dev/expr v0.19.0 // indirect
22-
dario.cat/mergo v1.0.0 // indirect
22+
cel.dev/expr v0.19.2 // indirect
23+
dario.cat/mergo v1.0.1 // indirect
2324
filippo.io/edwards25519 v1.1.0 // indirect
24-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
25+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
26+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2527
github.com/Microsoft/go-winio v0.6.2 // indirect
2628
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
27-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
29+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
2830
github.com/chigopher/pathlib v0.19.1 // indirect
29-
github.com/containerd/containerd v1.7.18 // indirect
3031
github.com/containerd/log v0.1.0 // indirect
3132
github.com/containerd/platforms v0.2.1 // indirect
3233
github.com/cpuguy83/dockercfg v0.3.2 // indirect
3334
github.com/cubicdaiya/gonp v1.0.4 // indirect
34-
github.com/davecgh/go-spew v1.1.1 // indirect
35+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3536
github.com/distribution/reference v0.6.0 // indirect
36-
github.com/docker/docker v27.1.1+incompatible // indirect
37+
github.com/docker/docker v27.5.1+incompatible // indirect
3738
github.com/docker/go-connections v0.5.0 // indirect
3839
github.com/docker/go-units v0.5.0 // indirect
39-
github.com/dprotaso/go-yit v0.0.0-20220510233725-9ba8df137936 // indirect
40+
github.com/dprotaso/go-yit v0.0.0-20240618133044-5a0af90af097 // indirect
4041
github.com/dustin/go-humanize v1.0.1 // indirect
4142
github.com/fatih/structtag v1.2.0 // indirect
4243
github.com/felixge/httpsnoop v1.0.4 // indirect
43-
github.com/fsnotify/fsnotify v1.6.0 // indirect
44-
github.com/getkin/kin-openapi v0.127.0 // indirect
44+
github.com/fsnotify/fsnotify v1.8.0 // indirect
45+
github.com/getkin/kin-openapi v0.129.0 // indirect
4546
github.com/go-logr/logr v1.4.2 // indirect
4647
github.com/go-logr/stdr v1.2.2 // indirect
47-
github.com/go-ole/go-ole v1.2.6 // indirect
48+
github.com/go-ole/go-ole v1.3.0 // indirect
4849
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4950
github.com/go-openapi/swag v0.23.0 // indirect
5051
github.com/go-sql-driver/mysql v1.8.1 // indirect
5152
github.com/gogo/protobuf v1.3.2 // indirect
52-
github.com/google/cel-go v0.22.1 // indirect
53-
github.com/google/uuid v1.6.0 // indirect
53+
github.com/google/cel-go v0.23.2 // indirect
5454
github.com/hashicorp/hcl v1.0.0 // indirect
55-
github.com/huandu/xstrings v1.4.0 // indirect
56-
github.com/iancoleman/strcase v0.2.0 // indirect
55+
github.com/huandu/xstrings v1.5.0 // indirect
56+
github.com/iancoleman/strcase v0.3.0 // indirect
5757
github.com/inconshreveable/mousetrap v1.1.0 // indirect
58-
github.com/invopop/yaml v0.3.1 // indirect
5958
github.com/jackc/pgpassfile v1.0.0 // indirect
6059
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
6160
github.com/jackc/puddle/v2 v2.2.2 // indirect
62-
github.com/jinzhu/copier v0.3.5 // indirect
61+
github.com/jinzhu/copier v0.4.0 // indirect
6362
github.com/jinzhu/inflection v1.0.0 // indirect
6463
github.com/josharian/intern v1.0.0 // indirect
65-
github.com/klauspost/compress v1.17.7 // indirect
66-
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
67-
github.com/magiconair/properties v1.8.7 // indirect
68-
github.com/mailru/easyjson v0.7.7 // indirect
69-
github.com/mattn/go-colorable v0.1.13 // indirect
64+
github.com/klauspost/compress v1.17.11 // indirect
65+
github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect
66+
github.com/magiconair/properties v1.8.9 // indirect
67+
github.com/mailru/easyjson v0.9.0 // indirect
68+
github.com/mattn/go-colorable v0.1.14 // indirect
7069
github.com/mattn/go-isatty v0.0.20 // indirect
7170
github.com/mfridman/interpolate v0.0.2 // indirect
7271
github.com/mitchellh/go-homedir v1.1.0 // indirect
7372
github.com/mitchellh/mapstructure v1.5.0 // indirect
7473
github.com/moby/docker-image-spec v1.3.1 // indirect
7574
github.com/moby/patternmatcher v0.6.0 // indirect
76-
github.com/moby/sys/sequential v0.5.0 // indirect
77-
github.com/moby/sys/user v0.1.0 // indirect
78-
github.com/moby/term v0.5.0 // indirect
75+
github.com/moby/sys/sequential v0.6.0 // indirect
76+
github.com/moby/sys/user v0.3.0 // indirect
77+
github.com/moby/sys/userns v0.1.0 // indirect
78+
github.com/moby/term v0.5.2 // indirect
7979
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
8080
github.com/morikuni/aec v1.0.0 // indirect
8181
github.com/ncruces/go-strftime v0.1.9 // indirect
82+
github.com/oasdiff/yaml v0.0.0-20241214135536-5f7845c759c8 // indirect
83+
github.com/oasdiff/yaml3 v0.0.0-20241214160948-977117996672 // indirect
8284
github.com/opencontainers/go-digest v1.0.0 // indirect
8385
github.com/opencontainers/image-spec v1.1.0 // indirect
84-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
86+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
8587
github.com/perimeterx/marshmallow v1.1.5 // indirect
8688
github.com/pganalyze/pg_query_go/v5 v5.1.0 // indirect
89+
github.com/pganalyze/pg_query_go/v6 v6.0.0 // indirect
8790
github.com/pingcap/errors v0.11.5-0.20240311024730-e056997136bb // indirect
8891
github.com/pingcap/failpoint v0.0.0-20240528011301-b51a646c7c86 // indirect
8992
github.com/pingcap/log v1.1.0 // indirect
90-
github.com/pingcap/tidb/pkg/parser v0.0.0-20241203170126-9812d85d0d25 // indirect
93+
github.com/pingcap/tidb/pkg/parser v0.0.0-20250130070702-43f2fb91d740 // indirect
9194
github.com/pkg/errors v0.9.1 // indirect
92-
github.com/pmezard/go-difflib v1.0.0 // indirect
93-
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
95+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
96+
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
9497
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
9598
github.com/riza-io/grpc-go v0.2.0 // indirect
96-
github.com/rs/zerolog v1.29.0 // indirect
99+
github.com/rs/zerolog v1.33.0 // indirect
100+
github.com/sagikazarmark/locafero v0.7.0 // indirect
101+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
97102
github.com/sethvargo/go-retry v0.3.0 // indirect
98-
github.com/shirou/gopsutil/v3 v3.23.12 // indirect
103+
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
99104
github.com/shoenig/go-m1cpu v0.1.6 // indirect
100-
github.com/speakeasy-api/openapi-overlay v0.9.0 // indirect
101-
github.com/spf13/afero v1.9.3 // indirect
102-
github.com/spf13/cast v1.5.0 // indirect
105+
github.com/sourcegraph/conc v0.3.0 // indirect
106+
github.com/speakeasy-api/jsonpath v0.6.1 // indirect
107+
github.com/speakeasy-api/openapi-overlay v0.10.1 // indirect
108+
github.com/spf13/afero v1.12.0 // indirect
109+
github.com/spf13/cast v1.7.1 // indirect
103110
github.com/spf13/cobra v1.8.1 // indirect
104-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
105-
github.com/spf13/pflag v1.0.5 // indirect
106-
github.com/spf13/viper v1.15.0 // indirect
107-
github.com/stoewer/go-strcase v1.2.0 // indirect
111+
github.com/spf13/pflag v1.0.6 // indirect
112+
github.com/spf13/viper v1.19.0 // indirect
113+
github.com/stoewer/go-strcase v1.3.0 // indirect
108114
github.com/stretchr/objx v0.5.2 // indirect
109-
github.com/subosito/gotenv v1.4.2 // indirect
115+
github.com/subosito/gotenv v1.6.0 // indirect
110116
github.com/testcontainers/testcontainers-go v0.35.0 // indirect
111117
github.com/tetratelabs/wazero v1.8.2 // indirect
112-
github.com/tklauser/go-sysconf v0.3.12 // indirect
113-
github.com/tklauser/numcpus v0.6.1 // indirect
118+
github.com/tklauser/go-sysconf v0.3.14 // indirect
119+
github.com/tklauser/numcpus v0.9.0 // indirect
114120
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
115-
github.com/wasilibs/go-pgquery v0.0.0-20240606042535-c0843d6592cc // indirect
116-
github.com/wasilibs/wazero-helpers v0.0.0-20240604052452-61d7981e9a38 // indirect
117-
github.com/yusufpapurcu/wmi v1.2.3 // indirect
121+
github.com/wasilibs/go-pgquery v0.0.0-20241226024732-8bfaa0ac5969 // indirect
122+
github.com/wasilibs/wazero-helpers v0.0.0-20250123031827-cd30c44769bb // indirect
123+
github.com/yusufpapurcu/wmi v1.2.4 // indirect
118124
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
119-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
125+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
120126
go.opentelemetry.io/otel v1.34.0 // indirect
127+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 // indirect
121128
go.opentelemetry.io/otel/metric v1.34.0 // indirect
122129
go.opentelemetry.io/otel/trace v1.34.0 // indirect
123130
go.uber.org/atomic v1.11.0 // indirect
124131
go.uber.org/multierr v1.11.0 // indirect
125132
go.uber.org/zap v1.27.0 // indirect
126133
golang.org/x/crypto v0.32.0 // indirect
127-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
128-
golang.org/x/mod v0.17.0 // indirect
134+
golang.org/x/exp v0.0.0-20250128182459-e0ece0dbea4c // indirect
135+
golang.org/x/mod v0.22.0 // indirect
129136
golang.org/x/net v0.34.0 // indirect
130137
golang.org/x/sync v0.10.0 // indirect
131138
golang.org/x/sys v0.29.0 // indirect
132139
golang.org/x/term v0.28.0 // indirect
133140
golang.org/x/text v0.21.0 // indirect
134-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
135-
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
136-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
141+
golang.org/x/tools v0.29.0 // indirect
142+
google.golang.org/genproto/googleapis/api v0.0.0-20250127172529-29210b9bc287 // indirect
143+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250127172529-29210b9bc287 // indirect
137144
gopkg.in/ini.v1 v1.67.0 // indirect
138145
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
139146
gopkg.in/yaml.v2 v2.4.0 // indirect
140147
gopkg.in/yaml.v3 v3.0.1 // indirect
141-
modernc.org/libc v1.55.3 // indirect
142-
modernc.org/mathutil v1.6.0 // indirect
143-
modernc.org/memory v1.8.0 // indirect
148+
modernc.org/libc v1.61.11 // indirect
149+
modernc.org/mathutil v1.7.1 // indirect
150+
modernc.org/memory v1.8.2 // indirect
144151
modernc.org/sqlite v1.34.5 // indirect
145152
)

0 commit comments

Comments
 (0)