Skip to content

Commit 9430d35

Browse files
Dependabot/go modules/go dependencies 27eebd2a4b (#6289)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 1e05e34 commit 9430d35

File tree

106 files changed

+13316
-21487
lines changed

Some content is hidden

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

106 files changed

+13316
-21487
lines changed

.github/dependabot.yml

+19-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,26 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: "gomod"
8+
- package-ecosystem: "github-actions"
99
directory: "/"
1010
schedule:
11-
interval: "weekly"
11+
interval: "daily"
12+
groups:
13+
actions-dependencies:
14+
dependency-type: "production"
15+
labels:
16+
- "infra"
1217
- package-ecosystem: "gomod"
13-
directory: "/website"
18+
directories:
19+
- "/"
20+
- "/website"
21+
groups:
22+
go-dependencies:
23+
exclude-patterns:
24+
- "github.com/thanos-io/thanos"
25+
ignore:
26+
- dependency-name: "github.com/prometheus/prometheus"
27+
versions:
28+
- ">=0.300.0-beta.0"
1429
schedule:
15-
interval: "weekly"
30+
interval: "daily"

.github/workflows/build-image.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
build:
2020
runs-on: ubuntu-24.04
2121
steps:
22-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
22+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2323
name: Checkout
2424
with:
2525
fetch-depth: 0
@@ -28,13 +28,13 @@ jobs:
2828
uses: docker/setup-qemu-action@49b3bc8e6bdd4a60e6116a5414239cba5943d3cf # v3.2.0
2929

3030
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@988b5a0280414f521da01fcc63a27aeeb4b104db # v3.6.1
31+
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
3232

3333
- name: Save image
3434
run: make save-multiarch-build-image
3535

3636
- name: Upload Docker Images Artifacts
37-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
37+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
3838
with:
3939
name: build-image
4040
path: |
@@ -47,7 +47,7 @@ jobs:
4747
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/')) && github.repository == 'cortexproject/cortex'
4848
runs-on: ubuntu-24.04
4949
steps:
50-
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
50+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5151
name: Checkout
5252
with:
5353
fetch-depth: 0

.github/workflows/scorecards.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ jobs:
2828

2929
steps:
3030
- name: "Checkout code"
31-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
with:
3333
persist-credentials: false
3434

3535
- name: "Run analysis"
36-
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
36+
uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
3737
with:
3838
results_file: results.sarif
3939
results_format: sarif
@@ -55,7 +55,7 @@ jobs:
5555
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
5656
# format to the repository Actions tab.
5757
- name: "Upload artifact"
58-
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
58+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v3.pre.node20
5959
with:
6060
name: SARIF file
6161
path: results.sarif
@@ -64,6 +64,6 @@ jobs:
6464
# Upload the results to GitHub's code scanning dashboard (optional).
6565
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
6666
- name: "Upload to code-scanning"
67-
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
67+
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6868
with:
6969
sarif_file: results.sarif

.github/workflows/test-build-deploy.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
image: quay.io/cortexproject/build-image:master-ac7827fa9
2121
steps:
2222
- name: Checkout Repo
23-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
23+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2424
- name: Setup Git safe.directory
2525
run: |
2626
echo "this step is needed because when running in container, actions/checkout does not set safe.directory effectively."
@@ -49,7 +49,7 @@ jobs:
4949
image: quay.io/cortexproject/build-image:master-ac7827fa9
5050
steps:
5151
- name: Checkout Repo
52-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
52+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5353
- name: Setup Git safe.directory
5454
run: |
5555
echo "this step is needed because when running in container, actions/checkout does not set safe.directory effectively."
@@ -71,19 +71,19 @@ jobs:
7171
security-events: write
7272
steps:
7373
- name: Checkout repository
74-
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
74+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7575

7676
# Initializes the CodeQL tools for scanning.
7777
- name: Initialize CodeQL
78-
uses: github/codeql-action/init@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
78+
uses: github/codeql-action/init@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
7979
with:
8080
languages: go
8181

8282
- name: Autobuild
83-
uses: github/codeql-action/autobuild@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
83+
uses: github/codeql-action/autobuild@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
8484

8585
- name: Perform CodeQL Analysis
86-
uses: github/codeql-action/analyze@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
86+
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
8787

8888

8989
build:
@@ -92,7 +92,7 @@ jobs:
9292
image: quay.io/cortexproject/build-image:master-ac7827fa9
9393
steps:
9494
- name: Checkout Repo
95-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
95+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9696
- name: Setup Git safe.directory
9797
run: |
9898
echo "this step is needed because when running in container, actions/checkout does not set safe.directory effectively."
@@ -113,7 +113,7 @@ jobs:
113113
touch build-image/.uptodate
114114
make BUILD_IN_CONTAINER=false web-build
115115
- name: Upload Website Artifact
116-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
116+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
117117
with:
118118
name: website public
119119
path: website/public/
@@ -125,7 +125,7 @@ jobs:
125125
- name: Create Docker Images Archive
126126
run: tar -cvf images.tar /tmp/images
127127
- name: Upload Docker Images Artifact
128-
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
128+
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
129129
with:
130130
name: Docker Images
131131
path: ./images.tar
@@ -146,11 +146,11 @@ jobs:
146146
- integration_query_fuzz
147147
steps:
148148
- name: Upgrade golang
149-
uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2.2.0
149+
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
150150
with:
151151
go-version: 1.23.2
152152
- name: Checkout Repo
153-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
153+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
154154
- name: Install Docker Client
155155
run: sudo ./.github/workflows/scripts/install-docker.sh
156156
- name: Sym Link Expected Path to Workspace
@@ -215,7 +215,7 @@ jobs:
215215
runs-on: ubuntu-20.04
216216
steps:
217217
- name: Checkout Repo
218-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
218+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
219219
- name: Install Docker Client
220220
run: sudo ./.github/workflows/scripts/install-docker.sh
221221
- name: Download Docker Images Artifact
@@ -239,7 +239,7 @@ jobs:
239239
image: quay.io/cortexproject/build-image:master-ac7827fa9
240240
steps:
241241
- name: Checkout Repo
242-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
242+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
243243
with:
244244
# web-deploy script expects repo to be cloned with ssh for some commands to work
245245
ssh-key: ${{ secrets.WEBSITE_DEPLOY_SSH_PRIVATE_KEY }}
@@ -281,7 +281,7 @@ jobs:
281281
image: quay.io/cortexproject/build-image:master-ac7827fa9
282282
steps:
283283
- name: Checkout Repo
284-
uses: actions/checkout@ee0669bd1cc54295c223e0bb666b733df41de1c5 # v2.7.0
284+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
285285
- name: Setup Git safe.directory
286286
run: |
287287
echo "this step is needed because when running in container, actions/checkout does not set safe.directory effectively."

go.mod

+16-16
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,30 @@ require (
2121
github.com/go-redis/redis/v8 v8.11.5
2222
github.com/gogo/protobuf v1.3.2
2323
github.com/gogo/status v1.1.1
24-
github.com/golang-migrate/migrate/v4 v4.17.1
24+
github.com/golang-migrate/migrate/v4 v4.18.1
2525
github.com/golang/protobuf v1.5.4
2626
github.com/golang/snappy v0.0.4
2727
github.com/gorilla/mux v1.8.1
2828
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
2929
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
30-
github.com/hashicorp/consul/api v1.29.4
30+
github.com/hashicorp/consul/api v1.30.0
3131
github.com/hashicorp/go-cleanhttp v0.5.2
32-
github.com/hashicorp/go-sockaddr v1.0.6
32+
github.com/hashicorp/go-sockaddr v1.0.7
3333
github.com/hashicorp/memberlist v0.5.1
3434
github.com/json-iterator/go v1.1.12
35-
github.com/klauspost/compress v1.17.9
35+
github.com/klauspost/compress v1.17.11
3636
github.com/lib/pq v1.10.9
37-
github.com/minio/minio-go/v7 v7.0.75
37+
github.com/minio/minio-go/v7 v7.0.79
3838
github.com/mitchellh/go-wordwrap v1.0.1
3939
github.com/oklog/ulid v1.3.1
4040
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e
4141
github.com/opentracing-contrib/go-stdlib v1.0.0
4242
github.com/opentracing/opentracing-go v1.2.0
4343
github.com/pkg/errors v0.9.1
4444
github.com/prometheus/alertmanager v0.27.0
45-
github.com/prometheus/client_golang v1.20.4
45+
github.com/prometheus/client_golang v1.20.5
4646
github.com/prometheus/client_model v0.6.1
47-
github.com/prometheus/common v0.60.0
47+
github.com/prometheus/common v0.60.1
4848
// Prometheus maps version 2.x.y to tags v0.x.y.
4949
github.com/prometheus/prometheus v0.55.1-0.20241102120812-a6fd22b9d2c8
5050
github.com/segmentio/fasthash v1.0.3
@@ -59,12 +59,12 @@ require (
5959
go.etcd.io/etcd/api/v3 v3.5.16
6060
go.etcd.io/etcd/client/pkg/v3 v3.5.16
6161
go.etcd.io/etcd/client/v3 v3.5.16
62-
go.opentelemetry.io/contrib/propagators/aws v1.29.0
62+
go.opentelemetry.io/contrib/propagators/aws v1.31.0
6363
go.opentelemetry.io/otel v1.31.0
6464
go.opentelemetry.io/otel/bridge/opentracing v1.31.0
65-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.29.0
66-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.29.0
67-
go.opentelemetry.io/otel/sdk v1.29.0
65+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0
66+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0
67+
go.opentelemetry.io/otel/sdk v1.31.0
6868
go.opentelemetry.io/otel/trace v1.31.0
6969
go.uber.org/atomic v1.11.0
7070
golang.org/x/net v0.30.0
@@ -81,7 +81,7 @@ require (
8181
github.com/cespare/xxhash/v2 v2.3.0
8282
github.com/google/go-cmp v0.6.0
8383
github.com/sercand/kuberesolver/v4 v4.0.0
84-
go.opentelemetry.io/collector/pdata v1.14.1
84+
go.opentelemetry.io/collector/pdata v1.18.0
8585
golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8
8686
google.golang.org/protobuf v1.35.1
8787
)
@@ -198,7 +198,7 @@ require (
198198
github.com/prometheus/procfs v0.15.1 // indirect
199199
github.com/redis/rueidis v1.0.45-alpha.1 // indirect
200200
github.com/rs/cors v1.11.0 // indirect
201-
github.com/rs/xid v1.5.0 // indirect
201+
github.com/rs/xid v1.6.0 // indirect
202202
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 // indirect
203203
github.com/seiflotfy/cuckoofilter v0.0.0-20240715131351-a2f2c23f1771 // indirect
204204
github.com/shurcooL/httpfs v0.0.0-20230704072500-f1e31cf0ba5c // indirect
@@ -215,7 +215,7 @@ require (
215215
go.opencensus.io v0.24.0 // indirect
216216
go.opentelemetry.io/collector/semconv v0.108.1 // indirect
217217
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
218-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
218+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
219219
go.opentelemetry.io/contrib/propagators/autoprop v0.54.0 // indirect
220220
go.opentelemetry.io/contrib/propagators/b3 v1.29.0 // indirect
221221
go.opentelemetry.io/contrib/propagators/jaeger v1.29.0 // indirect
@@ -236,8 +236,8 @@ require (
236236
gonum.org/v1/gonum v0.15.0 // indirect
237237
google.golang.org/api v0.195.0 // indirect
238238
google.golang.org/genproto v0.0.0-20240823204242-4ba0660f739c // indirect
239-
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
240-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
239+
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
240+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
241241
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
242242
gopkg.in/telebot.v3 v3.2.1 // indirect
243243
k8s.io/apimachinery v0.31.1 // indirect

0 commit comments

Comments
 (0)