Skip to content

Commit be2aea6

Browse files
deweydewey
authored
Merge pull request #158 from wanix/cve-scan-fixes-20250515
CVE scan fixes 20250515
2 parents 732df41 + 971239b commit be2aea6

File tree

1,194 files changed

+74760
-44539
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,194 files changed

+74760
-44539
lines changed

‎.github/workflows/go.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
- name: Test
2222
run: go test -v ./...
2323

24-
- uses: dominikh/staticcheck-action@v1.3.0
24+
- uses: dominikh/staticcheck-action@v1.3.1
2525
with:
26-
version: "2023.1"
26+
version: "2025.1"
2727
# go is already installed by actions/setup-go with the correct version from go.mod
2828
install-go: false

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
config.yaml
22
config.yml
33
sql_exporter
4+
sql-exporter
45
*.tar.gz

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.21-alpine AS builder
1+
FROM golang:1.24-alpine AS builder
22

33
RUN apk add git bash
44

@@ -9,10 +9,10 @@ COPY ./ /src
99

1010
# build
1111
WORKDIR /src
12-
RUN GOGC=off go build -mod=vendor -v -o /sql_exporter .
12+
RUN GOGC=off go build -mod=vendor -ldflags="-s -w" -v -o /sql_exporter .
1313

1414
# multistage
15-
FROM alpine:3.21.0
15+
FROM alpine:3.21.3
1616

1717
RUN apk --update upgrade && \
1818
apk add curl ca-certificates && \

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.9
1+
0.7

‎go.mod‎

Lines changed: 46 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/justwatchcom/sql_exporter
22

3-
go 1.21
3+
go 1.24
44

55
require (
66
cloud.google.com/go/cloudsqlconn v1.12.1
7-
github.com/ClickHouse/clickhouse-go/v2 v2.17.1
7+
github.com/ClickHouse/clickhouse-go/v2 v2.34.0
88
github.com/aws/aws-sdk-go v1.50.6
99
github.com/cenkalti/backoff v2.2.1+incompatible
1010
github.com/go-kit/log v0.2.1
@@ -17,7 +17,7 @@ require (
1717
github.com/prometheus/common v0.60.0
1818
github.com/robfig/cron/v3 v3.0.1
1919
github.com/segmentio/go-athena v0.0.0-20230626212750-5fac08ed8dab
20-
github.com/snowflakedb/gosnowflake v1.7.2
20+
github.com/snowflakedb/gosnowflake v1.13.3
2121
github.com/vertica/vertica-sql-go v1.3.3
2222
go.uber.org/automaxprocs v1.5.3
2323
google.golang.org/api v0.197.0
@@ -34,43 +34,44 @@ require (
3434
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
3535
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
3636
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 // indirect
37-
github.com/ClickHouse/ch-go v0.61.2 // indirect
37+
github.com/BurntSushi/toml v1.4.0 // indirect
38+
github.com/ClickHouse/ch-go v0.65.1 // indirect
3839
github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect
39-
github.com/andybalholm/brotli v1.1.0 // indirect
40-
github.com/apache/arrow/go/v14 v14.0.2 // indirect
41-
github.com/aws/aws-sdk-go-v2 v1.24.1 // indirect
42-
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.5.4 // indirect
43-
github.com/aws/aws-sdk-go-v2/credentials v1.16.16 // indirect
44-
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.15.15 // indirect
45-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10 // indirect
46-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10 // indirect
47-
github.com/aws/aws-sdk-go-v2/internal/v4a v1.2.10 // indirect
48-
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4 // indirect
49-
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.2.10 // indirect
50-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10 // indirect
51-
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.16.10 // indirect
52-
github.com/aws/aws-sdk-go-v2/service/s3 v1.48.1 // indirect
53-
github.com/aws/smithy-go v1.19.0 // indirect
40+
github.com/andybalholm/brotli v1.1.1 // indirect
41+
github.com/apache/arrow-go/v18 v18.0.0 // indirect
42+
github.com/aws/aws-sdk-go-v2 v1.26.1 // indirect
43+
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.2 // indirect
44+
github.com/aws/aws-sdk-go-v2/credentials v1.17.11 // indirect
45+
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.16.15 // indirect
46+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.5 // indirect
47+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.5 // indirect
48+
github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.5 // indirect
49+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.2 // indirect
50+
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.7 // indirect
51+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.7 // indirect
52+
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.5 // indirect
53+
github.com/aws/aws-sdk-go-v2/service/s3 v1.53.1 // indirect
54+
github.com/aws/smithy-go v1.20.2 // indirect
5455
github.com/beorn7/perks v1.0.1 // indirect
5556
github.com/cespare/xxhash/v2 v2.3.0 // indirect
56-
github.com/danieljoos/wincred v1.2.1 // indirect
57+
github.com/danieljoos/wincred v1.2.2 // indirect
5758
github.com/dvsekhvalnov/jose2go v1.6.0 // indirect
5859
github.com/elastic/go-sysinfo v1.11.2 // indirect
5960
github.com/elastic/go-windows v1.0.1 // indirect
6061
github.com/felixge/httpsnoop v1.0.4 // indirect
61-
github.com/form3tech-oss/jwt-go v3.2.5+incompatible // indirect
62-
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
62+
github.com/gabriel-vasile/mimetype v1.4.7 // indirect
6363
github.com/go-faster/city v1.0.1 // indirect
6464
github.com/go-faster/errors v0.7.1 // indirect
6565
github.com/go-logfmt/logfmt v0.6.0 // indirect
6666
github.com/go-logr/logr v1.4.2 // indirect
6767
github.com/go-logr/stdr v1.2.2 // indirect
68-
github.com/goccy/go-json v0.10.2 // indirect
68+
github.com/goccy/go-json v0.10.4 // indirect
6969
github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect
70+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
7071
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
7172
github.com/golang-sql/sqlexp v0.1.0 // indirect
7273
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
73-
github.com/google/flatbuffers v23.5.26+incompatible // indirect
74+
github.com/google/flatbuffers v24.12.23+incompatible // indirect
7475
github.com/google/s2a-go v0.1.8 // indirect
7576
github.com/google/uuid v1.6.0 // indirect
7677
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
@@ -93,40 +94,41 @@ require (
9394
github.com/jcmturner/rpc/v2 v2.0.3 // indirect
9495
github.com/jmespath/go-jmespath v0.4.0 // indirect
9596
github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 // indirect
96-
github.com/klauspost/compress v1.17.9 // indirect
97-
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
97+
github.com/klauspost/compress v1.17.11 // indirect
98+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
9899
github.com/mtibben/percent v0.2.1 // indirect
99100
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
100101
github.com/paulmach/orb v0.11.1 // indirect
101-
github.com/pierrec/lz4/v4 v4.1.21 // indirect
102+
github.com/pierrec/lz4/v4 v4.1.22 // indirect
102103
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
103104
github.com/pkg/errors v0.9.1 // indirect
104105
github.com/prometheus/client_model v0.6.1 // indirect
105106
github.com/prometheus/procfs v0.15.1 // indirect
106107
github.com/segmentio/asm v1.2.0 // indirect
107-
github.com/shopspring/decimal v1.3.1 // indirect
108+
github.com/shopspring/decimal v1.4.0 // indirect
108109
github.com/sirupsen/logrus v1.9.3 // indirect
109110
github.com/zeebo/xxh3 v1.0.2 // indirect
110111
go.opencensus.io v0.24.0 // indirect
112+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
111113
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
112-
go.opentelemetry.io/otel v1.29.0 // indirect
113-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
114-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
115-
golang.org/x/crypto v0.31.0 // indirect
116-
golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
117-
golang.org/x/mod v0.17.0 // indirect
118-
golang.org/x/net v0.33.0 // indirect
119-
golang.org/x/oauth2 v0.23.0 // indirect
120-
golang.org/x/sync v0.10.0 // indirect
121-
golang.org/x/sys v0.28.0 // indirect
122-
golang.org/x/term v0.27.0 // indirect
123-
golang.org/x/text v0.21.0 // indirect
114+
go.opentelemetry.io/otel v1.35.0 // indirect
115+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
116+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
117+
golang.org/x/crypto v0.36.0 // indirect
118+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
119+
golang.org/x/mod v0.23.0 // indirect
120+
golang.org/x/net v0.38.0 // indirect
121+
golang.org/x/oauth2 v0.26.0 // indirect
122+
golang.org/x/sync v0.12.0 // indirect
123+
golang.org/x/sys v0.31.0 // indirect
124+
golang.org/x/term v0.30.0 // indirect
125+
golang.org/x/text v0.23.0 // indirect
124126
golang.org/x/time v0.6.0 // indirect
125-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
126-
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
127+
golang.org/x/tools v0.30.0 // indirect
128+
golang.org/x/xerrors v0.0.0-20240903120638-7835f813f4da // indirect
127129
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
128-
google.golang.org/grpc v1.66.2 // indirect
129-
google.golang.org/protobuf v1.34.2 // indirect
130+
google.golang.org/grpc v1.67.1 // indirect
131+
google.golang.org/protobuf v1.35.1 // indirect
130132
gopkg.in/yaml.v3 v3.0.1 // indirect
131133
howett.net/plist v1.0.1 // indirect
132134
)

0 commit comments

Comments
 (0)