Merge pull request #164 from acald-creator/upgrade-meshkit

Enhance project

.github/workflows/build-and-release.yml

@@ -9,33 +9,33 @@ on:
 jobs:
   build:
     name: Build check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@main
       with:
         fetch-depth: 1
     - name: Setup Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@main
       with:
         go-version: '1.19'
         check-latest: 'true'
     - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build -o meshery-meshsync . 
   docker:
     name: Docker build and push
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Check out code
-      uses: actions/checkout@v3
+      uses: actions/checkout@main
       with:
         fetch-depth: 1
     - name: Setup go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@main
       with:
         go-version: '1.19'
         check-latest: 'true'
     - name: Docker login
-      uses: azure/docker-login@v1
+      uses: docker/login-action@v2
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/ci.yml

@@ -15,12 +15,12 @@ on:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@main
       - name: Setup go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@main
         with:
           check-latest: 'true'
           go-version: '^1.19'
@@ -41,3 +41,4 @@ jobs:
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
+          skip-build-cache: true

.github/workflows/error-codes-updater.yml

@@ -10,16 +10,16 @@ jobs:
   Update-error-codes:
     name: Error codes utility
     if: github.repository == 'meshery/meshsync'
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@main
       # token here with write access to meshsync repo
         with:
           token: ${{ secrets.GH_ACCESS_TOKEN }}
           ref: 'master'
 
       - name: Setup Go
-        uses: actions/setup-go@v1
+        uses: actions/setup-go@main
         with:
           go-version: ${{ secrets.GO_VERSION }}
 
@@ -40,7 +40,7 @@ jobs:
 
       # to push changes to meshery docs
       - name: Checkout meshery
-        uses: actions/checkout@v3
+        uses: actions/checkout@main
         with:
           repository: 'meshery/meshery'
           # token with write access to meshery repository

.github/workflows/label-commenter.yml

@@ -16,9 +16,9 @@ permissions:
 
 jobs:
   comment:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@main
         with:
           ref: master # Set your default branch
 

.github/workflows/multi-platform.yml

@@ -33,7 +33,7 @@ env:
 
 jobs:
   print-inputs:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
 
     - run: |
@@ -45,11 +45,11 @@ jobs:
         echo "Env GIT_TAG: ${{ github.event.release.tag_name }}"
   
   docker-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - 
         name: Checkout repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@main
       - 
         name: Identify Release Values
         if: "${{ github.event.inputs.release-ver}} != 'v' }}"
@@ -94,7 +94,7 @@ jobs:
             type=raw,value=${{env.RELEASE_CHANNEL}}-${{env.GIT_VERSION}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1 
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/newcomers-alert.yml

@@ -6,7 +6,7 @@ jobs:
   good-first-issue-notify:
     if: github.event.label.name == 'good first issue' || github.event.label.name == 'first-timers-only'
     name: Notify Slack for new good-first-issue
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Notify slack
         env:

.github/workflows/release-drafter.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   update_release_draft:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       # Drafts your next Release notes as Pull Requests are merged into "master"
       - name: Drafting release

.github/workflows/slack.yml

@@ -3,7 +3,7 @@ on: watch
 jobs:
   star-notify:
     name: Notify Slack on star
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Get current star count
         run: |

.golangci.yml

@@ -49,7 +49,7 @@ linters-settings:
           - return
   gosec:
     settings:
-      exclude: -G204
+      exclude: -G204,-G107
   govet:
     check-shadowing: false
     settings:

Makefile

@@ -1,3 +1,10 @@
+# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
+ifeq (,$(shell go env GOBIN))
+GOBIN=$(shell go env GOPATH)/bin
+else
+GOBIN=$(shell go env GOBIN)
+endif
+
 .PHONY: go-checks
 go-checks: go-lint go-fmt go-mod-tidy
 
@@ -7,7 +14,7 @@ go-vet:
 
 .PHONY: go-lint
 go-lint:
-	golangci-lint run --config .golangci.yml
+	$(GOBIN)/golangci-lint run ./...
 
 .PHONY: go-fmt
 go-fmt:
@@ -23,7 +30,7 @@ go-test:
 
 .PHONY: check
 check: error
-	golangci-lint run
+	$(GOBIN)/golangci-lint run ./...
 
 .PHONY: docker-check
 docker: check

go.mod

@@ -11,7 +11,7 @@ go 1.19
 require (
 	github.com/buger/jsonparser v1.1.1
 	github.com/google/uuid v1.3.0
-	github.com/layer5io/meshkit v0.6.2
+	github.com/layer5io/meshkit v0.6.5
 	github.com/myntra/pipeline v0.0.0-20180618182531-2babf4864ce8
 	github.com/spf13/viper v1.14.0
 	gorm.io/gorm v1.23.10

go.sum

@@ -635,8 +635,8 @@ github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq
 github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk=
 github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw=
-github.com/layer5io/meshkit v0.6.2 h1:QUDIuem9XN8atTfoBokuHbHyRpfpycZs6+iwbccRDlE=
-github.com/layer5io/meshkit v0.6.2/go.mod h1:RRrfwtykKlT6sbAnfoXq3Fib70YQpCCAxrc9/2dhnLw=
+github.com/layer5io/meshkit v0.6.5 h1:XDfVCZFwIdwhm3FzchX9hfrJ/EOYmvtDxQDW+lRUqIk=
+github.com/layer5io/meshkit v0.6.5/go.mod h1:9ZXmiP0dxRCNlVYgchrOnfFcNrdHVXuayiuN8RRTQ68=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs=
@@ -1050,8 +1050,8 @@ golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm
 golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM=
-golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
+golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

main.go

@@ -83,7 +83,7 @@ func main() {
 		if resp.StatusCode == http.StatusOK {
 			break
 		}
-		log.Info("could not recieve OK response from broker: "+pingURL, " retrying...")
+		log.Info("could not receive OK response from broker: "+pingURL, " retrying...")
 		time.Sleep(1 * time.Second)
 	}