From 931bb2aea106f534360815b004dcb5e354470ecf Mon Sep 17 00:00:00 2001 From: bilalcaliskan Date: Sun, 9 Jan 2022 13:12:37 +0300 Subject: [PATCH 1/4] add codecov.yml --- .github/workflows/pr.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 850f9cd..2406042 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -79,6 +79,20 @@ jobs: - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 + coverage: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Install Go + uses: actions/setup-go@v2 + with: + go-version: 1.16.x + - name: Coverage Test + run: go test ./... -race -coverprofile=coverage.txt -covermode=atomic + - name: Coverage Upload + run: bash <(curl -s https://codecov.io/bash) + sonarcloud: runs-on: ubuntu-latest steps: From 3fa276226d5c6f7018d0aa6ec4c114092e2de917 Mon Sep 17 00:00:00 2001 From: bilalcaliskan Date: Sun, 9 Jan 2022 13:13:44 +0300 Subject: [PATCH 2/4] upgrade dep uber.org/zap --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1be520e..fbd905b 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/spf13/pflag v1.0.5 go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.7.0 // indirect - go.uber.org/zap v1.19.1 + go.uber.org/zap v1.20.0 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect k8s.io/api v0.22.4 k8s.io/apimachinery v0.22.4 diff --git a/go.sum b/go.sum index 05f683a..48604be 100644 --- a/go.sum +++ b/go.sum @@ -323,11 +323,14 @@ go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723 h1:sHOAIxRGBp443oHZIPB+HsUGaksVCXVQENPxwTfQdH4= go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.7.0 h1:zaiO/rmgFjbmCXdSYJWQcdvOCsthmdaHfr3Gm2Kx4Ec= go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak= go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.20.0 h1:N4oPlghZwYG55MlU6LXk/Zp00FVNE9X9wrYO8CEs4lc= +go.uber.org/zap v1.20.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= From 127a7d1f833d1ae13094da9438ddb142c3daa064 Mon Sep 17 00:00:00 2001 From: bilalcaliskan Date: Sun, 9 Jan 2022 13:28:35 +0300 Subject: [PATCH 3/4] add codecov.yml --- codecov.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 codecov.yml diff --git a/codecov.yml b/codecov.yml new file mode 100644 index 0000000..0f0c29f --- /dev/null +++ b/codecov.yml @@ -0,0 +1,28 @@ +--- + +codecov: + require_ci_to_pass: yes + branch: master + +comment: + layout: "reach, diff, flags, files" + behavior: default + +coverage: + range: 50..80 + round: down + precision: 0 + status: + project: + default: + # Set the overall project code coverage requirement to 70% + target: 80 + patch: + default: + # Set the pull request requirement to not regress overall coverage by more than 5% + # and let codecov.io set the goal for the code changed in the patch. + target: auto + threshold: 8h + +ignore: + - cmd/**/* From 345b9bb57515add0ba8faaa8466245f7ef014f44 Mon Sep 17 00:00:00 2001 From: bilalcaliskan Date: Sun, 9 Jan 2022 13:33:26 +0300 Subject: [PATCH 4/4] update upgrade-direct-deps step --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f1cdf27..c52b990 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ cross-compile: GOOS=windows GOARCH=amd64 go build -o bin/main-windows-amd64 cmd/varnish-cache-invalidator/main.go upgrade-direct-deps: - for item in `grep -v 'indirect' go.mod | grep '/' | cut -d ' ' -f 1`; do \ + for item in `egrep -v "indirect|k8s.io" go.mod | grep '/' | cut -d ' ' -f 1`; do \ echo "trying to upgrade direct dependency $$item" ; \ go get -u $$item ; \ done