Synchronize common files from prometheus/prometheus (#242)

* Update common Prometheus files Signed-off-by: prombot <[email protected]> * chore: fix lint issue Signed-off-by: Simon Pasquier <[email protected]> --------- Signed-off-by: prombot <[email protected]> Signed-off-by: Simon Pasquier <[email protected]> Co-authored-by: Simon Pasquier <[email protected]>
prometheus-community · Aug 20, 2024 · 6a810d3 · 6a810d3
1 parent eed8f74
commit 6a810d3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -36,4 +36,4 @@ jobs:
         uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
         with:
           args: --verbose
-          version: v1.59.1
+          version: v1.60.1
diff --git a/Makefile.common b/Makefile.common
@@ -61,7 +61,7 @@ PROMU_URL     := https://github.com/prometheus/promu/releases/download/v$(PROMU_
 SKIP_GOLANGCI_LINT :=
 GOLANGCI_LINT :=
 GOLANGCI_LINT_OPTS ?=
-GOLANGCI_LINT_VERSION ?= v1.59.1
+GOLANGCI_LINT_VERSION ?= v1.60.1
 # golangci-lint only supports linux, darwin and windows platforms on i386/amd64/arm64.
 # windows isn't included here because of the path separator being different.
 ifeq ($(GOHOSTOS),$(filter $(GOHOSTOS),linux darwin))

diff --git a/injectproxy/silences_test.go b/injectproxy/silences_test.go
@@ -340,7 +340,7 @@ func TestDeleteSilence(t *testing.T) {
 				t.Fatalf("unexpected error: %v", err)
 			}
 
-			u, err := url.Parse(fmt.Sprintf("http://alertmanager.example.com/api/v2/silence/" + tc.ID))
+			u, err := url.Parse(fmt.Sprintf("http://alertmanager.example.com/api/v2/silence/%s", tc.ID))
 			if err != nil {
 				t.Fatalf("unexpected error: %v", err)
 			}