From c7ca85388f0adbc166902757aef6184e73355034 Mon Sep 17 00:00:00 2001
From: heyitao <heyitao@uniontech.com>
Date: Thu, 21 Mar 2024 11:32:02 +0800
Subject: [PATCH 1/2] Fix yaml file format and clear ci errors

Signed-off-by: heyitao <heyitao@uniontech.com>
---
 .github/dependabot.yml                        |  8 ++--
 .golangci.yml                                 | 37 +++++++++----------
 .yamllint                                     |  2 +
 .../testdata/no-test-group-interval.yml       |  2 +-
 4 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9617e04a4..3d56ff2b2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,11 +6,11 @@ updates:
       interval: "monthly"
     groups:
       k8s.io:
-          patterns:
-            - "k8s.io/*"
+        patterns:
+          - "k8s.io/*"
       go.opentelemetry.io:
-          patterns:
-            - "go.opentelemetry.io/*"
+        patterns:
+          - "go.opentelemetry.io/*"
   - package-ecosystem: "gomod"
     directory: "/documentation/examples/remote_storage"
     schedule:
diff --git a/.golangci.yml b/.golangci.yml
index 2eeb6c1c8..42410aebf 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -48,24 +48,24 @@ linters-settings:
     rules:
       main:
         deny:
-        - pkg: "sync/atomic"
-          desc: "Use go.uber.org/atomic instead of sync/atomic"
-        - pkg: "github.com/stretchr/testify/assert"
-          desc: "Use github.com/stretchr/testify/require instead of github.com/stretchr/testify/assert"
-        - pkg: "github.com/go-kit/kit/log"
-          desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
-        - pkg: "io/ioutil"
-          desc: "Use corresponding 'os' or 'io' functions instead."
-        - pkg: "regexp"
-          desc: "Use github.com/grafana/regexp instead of regexp"
-        - pkg: "github.com/pkg/errors"
-          desc: "Use 'errors' or 'fmt' instead of github.com/pkg/errors"
-        - pkg: "gzip"
-          desc: "Use github.com/klauspost/compress instead of gzip"
-        - pkg: "zlib"
-          desc: "Use github.com/klauspost/compress instead of zlib"
-        - pkg: "golang.org/x/exp/slices"
-          desc: "Use 'slices' instead."
+          - pkg: "sync/atomic"
+            desc: "Use go.uber.org/atomic instead of sync/atomic"
+          - pkg: "github.com/stretchr/testify/assert"
+            desc: "Use github.com/stretchr/testify/require instead of github.com/stretchr/testify/assert"
+          - pkg: "github.com/go-kit/kit/log"
+            desc: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log"
+          - pkg: "io/ioutil"
+            desc: "Use corresponding 'os' or 'io' functions instead."
+          - pkg: "regexp"
+            desc: "Use github.com/grafana/regexp instead of regexp"
+          - pkg: "github.com/pkg/errors"
+            desc: "Use 'errors' or 'fmt' instead of github.com/pkg/errors"
+          - pkg: "gzip"
+            desc: "Use github.com/klauspost/compress instead of gzip"
+          - pkg: "zlib"
+            desc: "Use github.com/klauspost/compress instead of zlib"
+          - pkg: "golang.org/x/exp/slices"
+            desc: "Use 'slices' instead."
   errcheck:
     exclude-functions:
       # Don't flag lines such as "io.Copy(io.Discard, resp.Body)".
@@ -135,4 +135,3 @@ linters-settings:
       - require-error
       - suite-dont-use-pkg
       - suite-extra-assert-call
- 
diff --git a/.yamllint b/.yamllint
index 955a5a627..1859cb624 100644
--- a/.yamllint
+++ b/.yamllint
@@ -1,5 +1,7 @@
 ---
 extends: default
+ignore: |
+  ui/react-app/node_modules
 
 rules:
   braces:
diff --git a/cmd/promtool/testdata/no-test-group-interval.yml b/cmd/promtool/testdata/no-test-group-interval.yml
index d1f6935cd..99f2ec646 100644
--- a/cmd/promtool/testdata/no-test-group-interval.yml
+++ b/cmd/promtool/testdata/no-test-group-interval.yml
@@ -12,4 +12,4 @@ tests:
         eval_time: 1m
         exp_samples:
           - value: 1
-            labels: test
\ No newline at end of file
+            labels: test

From d9e43535202ef6a5846d62ac360cc5763559bb8b Mon Sep 17 00:00:00 2001
From: heyitao <heyitao@uniontech.com>
Date: Thu, 21 Mar 2024 11:32:23 +0800
Subject: [PATCH 2/2] Fix binary detection in Makefile

Signed-off-by: heyitao <heyitao@uniontech.com>
---
 Makefile        | 2 +-
 Makefile.common | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index ab229f931..d78813068 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ assets-tarball: assets
 .PHONY: parser
 parser:
 	@echo ">> running goyacc to generate the .go file."
-ifeq (, $(shell command -v goyacc > /dev/null))
+ifeq (, $(shell command -v goyacc 2> /dev/null))
 	@echo "goyacc not installed so skipping"
 	@echo "To install: go install golang.org/x/tools/cmd/goyacc@v0.6.0"
 else
diff --git a/Makefile.common b/Makefile.common
index 483b3bf9d..0acfb9d80 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -49,7 +49,7 @@ endif
 GOTEST := $(GO) test
 GOTEST_DIR :=
 ifneq ($(CIRCLE_JOB),)
-ifneq ($(shell command -v gotestsum > /dev/null),)
+ifneq ($(shell command -v gotestsum 2> /dev/null),)
 	GOTEST_DIR := test-results
 	GOTEST := gotestsum --junitfile $(GOTEST_DIR)/unit-tests.xml --
 endif
@@ -182,7 +182,7 @@ endif
 .PHONY: common-yamllint
 common-yamllint:
 	@echo ">> running yamllint on all YAML files in the repository"
-ifeq (, $(shell command -v yamllint > /dev/null))
+ifeq (, $(shell command -v yamllint 2> /dev/null))
 	@echo "yamllint not installed so skipping"
 else
 	yamllint .