Skip to content

Commit 6aa0b54

Browse files
lucacomelucacome
authored
Merge branch 'main' into chore/update-docker
2 parents d6dae95 + 5968bc3 commit 6aa0b54

File tree

6 files changed

+40
-53
lines changed

6 files changed

+40
-53
lines changed

‎.github/dependabot.yml

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ updates:
88
- package-ecosystem: gomod
99
directories:
1010
- "**/*"
11-
1211
schedule:
1312
interval: daily
1413

‎.github/workflows/codeql-analysis.yml

+16-28
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,29 @@ permissions:
2323
jobs:
2424
analyze:
2525
permissions:
26+
packages: read
2627
actions: read # for github/codeql-action/init to get workflow details
2728
contents: read # for actions/checkout to fetch code
2829
security-events: write # for github/codeql-action/autobuild to send a status report
29-
name: Analyze
30+
name: Analyze (${{ matrix.language }})
3031
runs-on: ubuntu-22.04
3132

3233
strategy:
3334
fail-fast: false
3435
matrix:
35-
language: ["go", "javascript"]
36-
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
37-
# Use only 'java' to analyze code written in Java, Kotlin or both
38-
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
39-
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
40-
36+
include:
37+
- language: go
38+
build-mode: autobuild
39+
- language: javascript-typescript
40+
build-mode: none
41+
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
42+
# Use `c-cpp` to analyze code written in C, C++ or both
43+
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
44+
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
45+
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
46+
# see https://docs.github.com./en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
47+
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
48+
# your codebase is analyzed, see https://docs.github.com./en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages.
4149
steps:
4250
- name: Checkout repository
4351
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -47,34 +55,14 @@ jobs:
4755
uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
4856
with:
4957
languages: ${{ matrix.language }}
58+
build-mode: ${{ matrix.build-mode }}
5059
# If you wish to specify custom queries, you can do so here or in a config file.
5160
# By default, queries listed here will override any specified in a config file.
5261
# Prefix the list here with "+" to use these queries and those in the config file.
5362

5463
# For more details on CodeQL's query packs, refer to: https://docs.github.com./en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
5564
# queries: security-extended,security-and-quality
5665

57-
- name: Setup Golang Environment
58-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
59-
with:
60-
go-version: stable
61-
if: matrix.language == 'go'
62-
63-
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
64-
# If this step fails, then you should remove it and run the build manually (see below)
65-
- name: Autobuild
66-
uses: github/codeql-action/autobuild@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
67-
68-
# ℹ️ Command-line programs to run using the OS shell.
69-
# 📚 See https://docs.github.com./en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
70-
71-
# If the Autobuild fails above, remove it and uncomment the following three lines.
72-
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
73-
74-
# - run: |
75-
# echo "Run, Build Application using script"
76-
# ./location_of_script_within_repo/buildscript.sh
77-
7866
- name: Perform CodeQL Analysis
7967
uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
8068
with:

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ require (
1414
github.com./onsi/ginkgo/v2 v2.19.0
1515
github.com./onsi/gomega v1.33.1
1616
github.com./prometheus/client_golang v1.19.1
17-
github.com./prometheus/common v0.54.0
17+
github.com./prometheus/common v0.55.0
1818
github.com./spf13/cobra v1.8.1
1919
github.com./spf13/pflag v1.0.5
2020
go.opentelemetry.io/otel v1.27.0
@@ -67,7 +67,7 @@ require (
6767
github.com./munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6868
github.com./pkg/errors v0.9.1 // indirect
6969
github.com./prometheus/client_model v0.6.1 // indirect
70-
github.com./prometheus/procfs v0.12.0 // indirect
70+
github.com./prometheus/procfs v0.15.1 // indirect
7171
github.com./russross/blackfriday/v2 v2.1.0 // indirect
7272
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 // indirect
7373
go.opentelemetry.io/otel/metric v1.27.0 // indirect
@@ -78,7 +78,7 @@ require (
7878
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
7979
golang.org/x/mod v0.18.0 // indirect
8080
golang.org/x/net v0.26.0 // indirect
81-
golang.org/x/oauth2 v0.20.0 // indirect
81+
golang.org/x/oauth2 v0.21.0 // indirect
8282
golang.org/x/sync v0.7.0 // indirect
8383
golang.org/x/sys v0.21.0 // indirect
8484
golang.org/x/term v0.21.0 // indirect
@@ -89,7 +89,7 @@ require (
8989
google.golang.org/genproto/googleapis/api v0.0.0-20240520151616-dc85e6b867a5 // indirect
9090
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
9191
google.golang.org/grpc v1.64.0 // indirect
92-
google.golang.org/protobuf v1.34.1 // indirect
92+
google.golang.org/protobuf v1.34.2 // indirect
9393
gopkg.in/inf.v0 v0.9.1 // indirect
9494
gopkg.in/yaml.v2 v2.4.0 // indirect
9595
gopkg.in/yaml.v3 v3.0.1 // indirect

‎go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,10 @@ github.com./prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ
120120
github.com./prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
121121
github.com./prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
122122
github.com./prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
123-
github.com./prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8=
124-
github.com./prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ=
125-
github.com./prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
126-
github.com./prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
123+
github.com./prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
124+
github.com./prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
125+
github.com./prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
126+
github.com./prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
127127
github.com./rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
128128
github.com./rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
129129
github.com./russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -182,8 +182,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
182182
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
183183
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
184184
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
185-
golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
186-
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
185+
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
186+
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
187187
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
188188
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
189189
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -223,8 +223,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 h1:
223223
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
224224
google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
225225
google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
226-
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
227-
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
226+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
227+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
228228
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
229229
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
230230
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=

‎tests/go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com./onsi/ginkgo/v2 v2.19.0
88
github.com./onsi/gomega v1.33.1
99
github.com./prometheus/client_golang v1.19.1
10-
github.com./prometheus/common v0.54.0
10+
github.com./prometheus/common v0.55.0
1111
github.com./tsenart/vegeta/v12 v12.11.1
1212
k8s.io/api v0.30.2
1313
k8s.io/apiextensions-apiserver v0.30.2
@@ -53,14 +53,14 @@ require (
5353
github.com./pkg/errors v0.9.1 // indirect
5454
github.com./pmezard/go-difflib v1.0.0 // indirect
5555
github.com./prometheus/client_model v0.6.1 // indirect
56-
github.com./prometheus/procfs v0.12.0 // indirect
56+
github.com./prometheus/procfs v0.15.1 // indirect
5757
github.com./rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
5858
github.com./spf13/pflag v1.0.5 // indirect
5959
github.com./stretchr/testify v1.9.0 // indirect
6060
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
6161
golang.org/x/mod v0.18.0 // indirect
6262
golang.org/x/net v0.26.0 // indirect
63-
golang.org/x/oauth2 v0.20.0 // indirect
63+
golang.org/x/oauth2 v0.21.0 // indirect
6464
golang.org/x/sync v0.7.0 // indirect
6565
golang.org/x/sys v0.21.0 // indirect
6666
golang.org/x/term v0.21.0 // indirect
@@ -70,7 +70,7 @@ require (
7070
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7171
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 // indirect
7272
google.golang.org/grpc v1.64.0 // indirect
73-
google.golang.org/protobuf v1.34.1 // indirect
73+
google.golang.org/protobuf v1.34.2 // indirect
7474
gopkg.in/inf.v0 v0.9.1 // indirect
7575
gopkg.in/yaml.v2 v2.4.0 // indirect
7676
gopkg.in/yaml.v3 v3.0.1 // indirect

‎tests/go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,10 @@ github.com./prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQ
9898
github.com./prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
9999
github.com./prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
100100
github.com./prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
101-
github.com./prometheus/common v0.54.0 h1:ZlZy0BgJhTwVZUn7dLOkwCZHUkrAqd3WYtcFCWnM1D8=
102-
github.com./prometheus/common v0.54.0/go.mod h1:/TQgMJP5CuVYveyT7n/0Ix8yLNNXy9yRSkhnLTHPDIQ=
103-
github.com./prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
104-
github.com./prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
101+
github.com./prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
102+
github.com./prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
103+
github.com./prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
104+
github.com./prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
105105
github.com./rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
106106
github.com./rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
107107
github.com./rs/dnscache v0.0.0-20211102005908-e0241e321417 h1:Lt9DzQALzHoDwMBGJ6v8ObDPR0dzr2a6sXTB1Fq7IHs=
@@ -140,8 +140,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
140140
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
141141
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
142142
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
143-
golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
144-
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
143+
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
144+
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
145145
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
146146
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
147147
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -180,8 +180,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291 h1:
180180
google.golang.org/genproto/googleapis/rpc v0.0.0-20240515191416-fc5f0ca64291/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
181181
google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY=
182182
google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg=
183-
google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
184-
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
183+
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
184+
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
185185
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
186186
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
187187
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

0 commit comments

Comments
 (0)