Merge remote-tracking branch 'upstream/master' into add/meshery-cillium

.github/codecov.yml

@@ -33,12 +33,13 @@ flags:
     carryforward: true
   backend:
     paths:
-      - cmd
-      - handlers
-      - helpers
-      - internal
-      - mesheryctl
-      - meshes
-      - models
-      - router
+    # Accepts only glob patterns, not regex
+      - "*/cmd/**"
+      - "*/handlers/**"
+      - "*/helpers/**"
+      - "*/internal/**"
+      - "*/mesheryctl/**" 
+      - "*/meshes/**"
+      - "*/models/**"
+      - "*/router/**"
     carryforward: true

.github/workflows/build-and-preview-site.yml

@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout 🛎️
-        uses: actions/checkout@v2.3.1
+        uses: actions/checkout@v3
         with:
           persist-credentials: false
       - name: Setup Ruby
-        uses: ruby/setup-ruby@v1
+        uses: ruby/setup-ruby@v1.99.0
         with:
           ruby-version: 2.7.5 # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
@@ -26,7 +26,7 @@ jobs:
       - name: Zip Site
         run: bash docs/script.sh
       - name: Upload files
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: site-dir
           path: ./site-dir.zip

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

@@ -0,0 +1,73 @@
+name: Docker Desktop Extension for Meshery
+  # TODO 
+  ##   1) Incorporate mesheryctl binaries into each DDE image
+
+on:
+  push:
+    tags:
+      - 'v*'  
+    branches:
+      - 'master'
+    paths-ignore:
+      - 'docs/**'
+      - '.github/**'
+  workflow_dispatch:
+
+jobs:
+  docker:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Determine Release Channel
+        id: release-channel
+        run: |
+          if [[ ${{ github.ref }} = refs/tags* ]]
+          then
+              echo "RELEASE_CHANNEL=stable" >> $GITHUB_ENV
+          else
+              echo "RELEASE_CHANNEL=edge" >> $GITHUB_ENV
+          fi
+          echo "Release channel determined to be $RELEASE_CHANNEL"
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Docker Meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: meshery/meshery-docker-desktop-extension
+          flavor: |
+            latest=false
+            prefix=${{env.RELEASE_CHANNEL}}-
+          tags: |
+            type=raw,value={{sha}}
+            type=raw,value={{tag}},enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            type=raw,value=latest
+            type=semver,pattern={{version}}
+
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - 
+        name: Build and Push 
+        uses: docker/build-push-action@v2
+        with:
+          context: "{{defaultContext}}:install/docker-desktop-extension"
+          push: true
+          platforms: linux/amd64,linux/arm64,linux/386
+          tags: ${{ steps.meta.outputs.tags }}     
+
+      - 
+        name: Docker Hub Description
+        uses: peter-evans/dockerhub-description@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: meshery/meshery-docker-desktop-extension   

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

@@ -6,16 +6,17 @@ on:
     paths-ignore:
       - 'docs/**'
       - '.github/**'
+      - 'install/**'
 jobs:
   build:
     name: Docker build and push
-    if: github.repository == 'meshery/meshery'
+    if: github.repository == 'meshery/meshery' && github.event_name != 'pull_request' && success()
     env:
       RELEASE_CHANNEL: "edge"
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 1
       - name: Docker login

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

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 1
       - name: Docker login
@@ -43,13 +43,13 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.0.0
         with:
             fetch-depth: 0
       - name: Set up Go
         uses: actions/[email protected]
         with:
-          go-version: ${{ secrets.GO_VERSION }}
+          go-version: 1.17
       - name: goreleaser with tag
         uses: goreleaser/[email protected]
         env:

.github/workflows/ci.yml

@@ -27,6 +27,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
+      - uses: actions/setup-go@v2
+        with: 
+          check-latest: 'true'
+          go-version: '1.17'
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
@@ -37,7 +41,7 @@ jobs:
           # working-directory: somedir
 
           # Optional: golangci-lint command line arguments.
-          # args: --issues-exit-code=0
+          # args: --disable-all -E revive -E gosec -E errcheck -E nilerr -E govet -E gofmt -E goimports -E staticcheck
 
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
@@ -53,7 +57,7 @@ jobs:
     - name: Setup Go
       uses: actions/[email protected]
       with:
-        go-version: '1.16.7'
+        go-version: '1.17'
     - name: Setup Cache
       uses: actions/[email protected]
       with:

.github/workflows/go-testing-ci.yml

@@ -8,6 +8,7 @@ on:
       - "ui/**"
       - "provider-ui/**"
       - ".github/**"
+      - "install/**"
   pull_request:
     branches:
       - "master"
@@ -25,15 +26,15 @@ jobs:
     name: Unit tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3.0.0
         with:
           fetch-depth: 2
       - name: Install lynx for xdg-open support
         run: sudo apt-get install lynx
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3.0.0
         with:
-          go-version: "1.16.7"
+          go-version: "1.17"
       - name: Run coverage
         run: go test --short ./... -race -coverprofile=coverage.txt -covermode=atomic
       - name: Upload coverage to Codecov
@@ -53,9 +54,9 @@ jobs:
       - name: Install lynx for xdg-open support
         run: sudo apt-get install lynx
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3.0.0
         with:
-          go-version: "1.16.7"
+          go-version: "1.17"
       - name: Create k8s Kind Cluster
         uses: helm/[email protected]
         with:

.github/workflows/helm-chart-releaser.yml

@@ -24,8 +24,8 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{github.event_name == 'pull_request'}}
     steps:
-    - uses: actions/checkout@v2
-    - uses: azure/setup-helm@v1
+    - uses: actions/checkout@v3
+    - uses: azure/setup-helm@v2.0
       with:
         version: 'v3.6.0' # default is latest stable
       id: install
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'pull_request' }} && ${{ github.ref == 'refs/heads/master' }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: set env
         id: vars
         # https://github.community/t/how-to-get-just-the-tag-name/16241/7

.github/workflows/mesheryctl-ci.yml

@@ -24,6 +24,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/[email protected]
+      - uses: actions/setup-go@v2
+        with: 
+          check-latest: 'true'
+          go-version: '1.17'
       - name: golangci-lint
         uses: golangci/[email protected]
         with:
@@ -59,7 +63,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-go-
     - name: goreleaser WITHOUT tag
-      uses: goreleaser/goreleaser-action@v2
+      uses: goreleaser/goreleaser-action@v2.8.0
       if: success() && startsWith(github.ref, 'refs/tags/') == false
       env:
         RELEASE_CHANNEL: "edge"

.golangci.yml

@@ -42,7 +42,11 @@ linters-settings:
     settings:
       mnd:
         # don't include the "operation" and "assign"
-        checks: argument,case,condition,return
+        checks: 
+          - argument
+          - case
+          - condition
+          - return
   gosec:
     settings:
       exclude: -G204
@@ -150,6 +154,6 @@ run:
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration
 service:
-  golangci-lint-version: 1.23.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.45.2 # use the fixed version to not introduce new linters unexpectedly
   prepare:
     - echo "here I can run custom commands, but no preparation needed for this repo"

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16 as meshery-server
+FROM golang:1.17 as meshery-server
 ARG TOKEN
 ARG GIT_VERSION
 ARG GIT_COMMITSHA

Makefile

@@ -106,15 +106,6 @@ run-fast-no-content:
 	SKIP_DOWNLOAD_CONTENT=true \
 	go run main.go;
 
-run-16-fast:
-	cd cmd; go1.16.4 mod tidy; \
-	BUILD="$(GIT_VERSION)" \
-	PROVIDER_BASE_URLS=$(MESHERY_CLOUD_PROD) \
-	PORT=9081 \
-	DEBUG=true \
-	ADAPTER_URLS=$(ADAPTER_URLS) \
-	go1.16.4 run main.go;
-
 run-fast-cloud: error
 	cd cmd; go mod tidy; \
 	PROVIDER_BASE_URLS=$(MESHERY_CLOUD_DEV) \

cmd/main_test.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"testing"
+)
+
+func TestMain(t *testing.T) {
+	if testing.Short() {
+		t.Skip("Skipping test in short mode.")
+	}
+
+	t.Log("Need to run main() skipping")
+}

docker-compose.yaml

@@ -75,12 +75,12 @@ services:
      - "com.centurylinklabs.watchtower.enable=true"
    ports:
      - "10010:10010"
-  meshery-cilium:
+  meshery-cilium: 
     image: layer5/meshery-cilium:stable-latest
     labels:
       - "com.centurylinklabs.watchtower.enable=true"
     ports:
-      - "10011:10011"
+      - "10012:10012"
   # nighthawk-lg:
   #   image: envoyproxy/nighthawk-dev:latest
   watchtower: