Skip to content

Commit b8ec213

Browse files
author
sapcc-bot
committed
Run go-makefile-maker and autoupdate dependencies
go: upgraded github.com/prometheus/client_golang v1.23.0 => v1.23.2 go: upgraded github.com/prometheus/common v0.66.0 => v0.66.1 go: upgraded github.com/sapcc/go-bits v0.0.0-20250911190512-4d3226a57454 => v0.0.0-20250923124349-47cc042a32b4
1 parent 2470bf6 commit b8ec213

36 files changed

+10073
-2817
lines changed

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
# SPDX-FileCopyrightText: 2024 SAP SE or an SAP affiliate company
77
# SPDX-License-Identifier: Apache-2.0
88

9+
MAKEFLAGS=--warn-undefined-variables
910
# /bin/sh is dash on Debian which does not support all features of ash/bash
1011
# to fix that we use /bin/bash only on Debian to not break Alpine
1112
ifneq (,$(wildcard /etc/os-release)) # check file existence
@@ -48,11 +49,11 @@ prepare-static-check: FORCE install-golangci-lint install-modernize install-shel
4849

4950
# To add additional flags or values, specify the variable in the environment, e.g. `GO_BUILDFLAGS='-tags experimental' make`.
5051
# To override the default flags or values, specify the variable on the command line, e.g. `make GO_BUILDFLAGS='-tags experimental'`.
51-
GO_BUILDFLAGS := -mod vendor $(GO_BUILDFLAGS)
52-
GO_LDFLAGS := $(GO_LDFLAGS)
53-
GO_TESTFLAGS := $(GO_TESTFLAGS)
54-
GO_TESTENV := $(GO_TESTENV)
55-
GO_BUILDENV := $(GO_BUILDENV)
52+
GO_BUILDFLAGS += -mod vendor
53+
GO_LDFLAGS +=
54+
GO_TESTFLAGS +=
55+
GO_TESTENV +=
56+
GO_BUILDENV +=
5657

5758
# These definitions are overridable, e.g. to provide fixed version/commit values when
5859
# no .git directory is present or to provide a fixed build date for reproducibility.

REUSE.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -308,14 +308,6 @@ precedence = "aggregate"
308308
SPDX-FileCopyrightText = "Other"
309309
SPDX-License-Identifier = "BSD-3-Clause"
310310

311-
[[annotations]]
312-
path = [
313-
"vendor/github.com/grafana/regexp/**",
314-
]
315-
precedence = "aggregate"
316-
SPDX-FileCopyrightText = "Other"
317-
SPDX-License-Identifier = "BSD-3-Clause"
318-
319311
[[annotations]]
320312
path = [
321313
"vendor/github.com/hashicorp/golang-lru/v2/**",
@@ -564,6 +556,14 @@ precedence = "aggregate"
564556
SPDX-FileCopyrightText = "Other"
565557
SPDX-License-Identifier = "MIT"
566558

559+
[[annotations]]
560+
path = [
561+
"vendor/go.yaml.in/yaml/v2/**",
562+
]
563+
precedence = "aggregate"
564+
SPDX-FileCopyrightText = "Other"
565+
SPDX-License-Identifier = "Apache-2.0"
566+
567567
[[annotations]]
568568
path = [
569569
"vendor/golang.org/x/net/**",

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ require (
1111
github.com/majewsky/schwift/v2 v2.0.0
1212
github.com/mitchellh/mapstructure v1.5.0
1313
github.com/pkg/errors v0.9.1
14-
github.com/prometheus/client_golang v1.23.0
14+
github.com/prometheus/client_golang v1.23.2
1515
github.com/sapcc/go-api-declarations v1.17.4
16-
github.com/sapcc/go-bits v0.0.0-20250911190512-4d3226a57454
16+
github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4
1717
go.uber.org/automaxprocs v1.6.0
1818
gopkg.in/yaml.v2 v2.4.0
1919
k8s.io/apimachinery v0.29.1
@@ -38,7 +38,6 @@ require (
3838
github.com/google/gnostic-models v0.6.8 // indirect
3939
github.com/google/gofuzz v1.2.0 // indirect
4040
github.com/google/uuid v1.3.0 // indirect
41-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
4241
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
4342
github.com/imdario/mergo v0.3.6 // indirect
4443
github.com/josharian/intern v1.0.0 // indirect
@@ -54,12 +53,13 @@ require (
5453
github.com/opencontainers/go-digest v1.0.0 // indirect
5554
github.com/opencontainers/image-spec v1.1.1 // indirect
5655
github.com/prometheus/client_model v0.6.2 // indirect
57-
github.com/prometheus/common v0.66.0 // indirect
56+
github.com/prometheus/common v0.66.1 // indirect
5857
github.com/prometheus/procfs v0.17.0 // indirect
5958
github.com/sergi/go-diff v1.4.0 // indirect
6059
github.com/sirupsen/logrus v1.9.3 // indirect
6160
github.com/spf13/pflag v1.0.6 // indirect
6261
github.com/vbatts/tar-split v0.12.1 // indirect
62+
go.yaml.in/yaml/v2 v2.4.2 // indirect
6363
golang.org/x/net v0.43.0 // indirect
6464
golang.org/x/oauth2 v0.30.0 // indirect
6565
golang.org/x/sync v0.16.0 // indirect

go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ github.com/gophercloud/gophercloud/v2 v2.8.0 h1:of2+8tT6+FbEYHfYC8GBu8TXJNsXYSNm
5555
github.com/gophercloud/gophercloud/v2 v2.8.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
5656
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
5757
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
58-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc h1:GN2Lv3MGO7AS6PrRoT6yV5+wkrOpcszoIsO4+4ds248=
59-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc/go.mod h1:+JKpmjMGhpgPL+rXZ5nsZieVzvarn86asRlBg4uNGnk=
6058
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
6159
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
6260
github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
@@ -112,20 +110,20 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
112110
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
113111
github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
114112
github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
115-
github.com/prometheus/client_golang v1.23.0 h1:ust4zpdl9r4trLY/gSjlm07PuiBq2ynaXXlptpfy8Uc=
116-
github.com/prometheus/client_golang v1.23.0/go.mod h1:i/o0R9ByOnHX0McrTMTyhYvKE4haaf2mW08I+jGAjEE=
113+
github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o=
114+
github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg=
117115
github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
118116
github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
119-
github.com/prometheus/common v0.66.0 h1:K/rJPHrG3+AoQs50r2+0t7zMnMzek2Vbv31OFVsMeVY=
120-
github.com/prometheus/common v0.66.0/go.mod h1:Ux6NtV1B4LatamKE63tJBntoxD++xmtI/lK0VtEplN4=
117+
github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs=
118+
github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA=
121119
github.com/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0=
122120
github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw=
123121
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
124122
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
125123
github.com/sapcc/go-api-declarations v1.17.4 h1:F4smuE9x1NJ/7NAdytJ1wekeXT3QeRaYu3L/HyWKqqo=
126124
github.com/sapcc/go-api-declarations v1.17.4/go.mod h1:MWmLjmvjftgyAugNUfIhsDsHIzXH1pn32cWLZpiluKg=
127-
github.com/sapcc/go-bits v0.0.0-20250911190512-4d3226a57454 h1:S8LtNT93egXvEa+15yKb5ZMChuXKpd0J7iXfd4uoNlc=
128-
github.com/sapcc/go-bits v0.0.0-20250911190512-4d3226a57454/go.mod h1:YfKAF5oNv8UD/zkOjK+dOVft8DUZq5KphjPy2IEI+QU=
125+
github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4 h1:9SrJTmXMhUBaMGCVGp/7FfJ8ku3aeeuQ4PQtqtTx8wI=
126+
github.com/sapcc/go-bits v0.0.0-20250923124349-47cc042a32b4/go.mod h1:+hy4RXW/4ZnFl/Ct7vBl9cnLEA9Lt/BKYYGoxZkwLZY=
129127
github.com/sergi/go-diff v1.4.0 h1:n/SP9D5ad1fORl+llWyN+D6qoUETXNZARKjyY2/KVCw=
130128
github.com/sergi/go-diff v1.4.0/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
131129
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -151,6 +149,8 @@ go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
151149
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
152150
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
153151
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
152+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
153+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
154154
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
155155
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
156156
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

vendor/github.com/grafana/regexp/.gitignore

Lines changed: 0 additions & 15 deletions
This file was deleted.

vendor/github.com/grafana/regexp/LICENSE

Lines changed: 0 additions & 27 deletions
This file was deleted.

vendor/github.com/grafana/regexp/README.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)