chore: Add script to test sub project and add more unit test for nacos v2

.github/workflows/pr-check.yml

@@ -6,16 +6,44 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.16
+          go-version: 1.18
 
       - uses: actions/cache@v2
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
+
+  resolve-modules:
+    name: resolve module
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v3
+
+      - id: set-matrix
+        run: ./hack/resolve-modules.sh
+
+  lint:
+    name: lint module
+    runs-on: ubuntu-latest
+    needs: resolve-modules
+    strategy:
+      matrix: ${{ fromJson(needs.resolve-modules.outputs.matrix) }}
+    steps:
+      - uses: actions/checkout@v3
+      - name: Lint
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: latest
+          working-directory: ${{ matrix.workdir }}
+          args: -E gofumpt --timeout 10m
+          skip-pkg-cache: true

.github/workflows/push-check.yml

@@ -5,25 +5,31 @@ on: [ push, pull_request ]
 jobs:
   build:
     runs-on: ubuntu-latest
+
+    services:
+      nacos:
+        image: 'nacos/nacos-server:2.0.3'
+        ports:
+          - '8848:8848'
+          - '9848:9848'
+        env:
+          MODE: standalone
+
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: 1.16
+          go-version: 1.18
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/go/pkg/mod
           key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go-
 
-      - name: Prepare Nacos
-        run: |
-          make prepare
-
       - name: Check License Header
         uses: apache/skywalking-eyes/header@v0.4.0
         env:
@@ -32,18 +38,14 @@ jobs:
       - name: typos-action
         uses: crate-ci/typos@v1.2.1
 
-      - name: Lint
-        run: |
-          go vet -stdmethods=false $(go list ./...)
-          go install mvdan.cc/gofumpt@v0.2.0
-          test -z "$(gofumpt -l -extra .)" 
+
+      - name: Benchmark
+        run: go test -bench=. -benchmem -run=none ./...
 
       - name: Unit Test
-        run: go test -v -race -covermode=atomic -coverprofile=coverage.out ./...
+        run: make test
         env:
           serverAddr: 127.0.0.1
           serverPort: 8848
           namespace: public
 
-      - name: Benchmark
-        run: go test -bench=. -benchmem -run=none ./...

.licenserc.yaml

@@ -21,4 +21,5 @@ header:
     - '**/*.go'
   paths-ignore:
     - example/hello/**
+    - v2/example/hello/**
   comment: on-failure

Makefile

@@ -1,8 +1,22 @@
 NACOS_VERSION ?= 2.0.3
+TOOLS_SHELL="./hack/tools.sh"
 
 prepare:
 	docker pull nacos/nacos-server:$(NACOS_VERSION)
 	docker run --rm --name nacos-quick -e MODE=standalone -p 8848:8848 -p 9848:9848 -d nacos/nacos-server:$(NACOS_VERSION)
 
 stop:
 	docker stop nacos-quick
+
+
+.PHONY: test
+test:
+	@${TOOLS_SHELL} test
+	@echo "go test finished"
+
+
+
+.PHONY: vet
+vet:
+	@${TOOLS_SHELL} vet
+	@echo "vet check finished"

hack/resolve-modules.sh

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+# This is used by the linter action.
+# Recursively finds all directories with a go.mod file and creates
+# a GitHub Actions JSON output option.
+
+set -o errexit
+
+HOME=$(
+	cd "$(dirname "${BASH_SOURCE[0]}")" &&
+		cd .. &&
+		pwd
+)
+
+source "${HOME}/hack/util.sh"
+all_modules=$(util::find_modules)
+PATHS=""
+for mod in $all_modules; do
+		PATHS+=$(printf '{"workdir":"%s"},' ${mod})
+done
+
+echo "::set-output name=matrix::{\"include\":[${PATHS%?}]}"

hack/tools.sh

@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+HOME=$(
+	cd "$(dirname "${BASH_SOURCE[0]}")" &&
+		cd .. &&
+		pwd
+)
+
+source "${HOME}/hack/util.sh"
+
+all_modules=$(util::find_modules)
+
+# test all mod
+function test() {
+	for mod in $all_modules; do
+			pushd "$mod" >/dev/null &&
+				echo "go test $(sed -n 1p go.mod | cut -d ' ' -f2)" &&
+				go test -race -covermode=atomic -coverprofile=coverage.out ./...
+			popd >/dev/null || exit
+	done
+}
+
+# vet all mod
+function vet() {
+	for mod in $all_modules; do
+			pushd "$mod" >/dev/null &&
+				echo "go vet $(sed -n 1p go.mod | cut -d ' ' -f2)" &&
+				go vet -stdmethods=false ./...
+			popd >/dev/null || exit
+	done
+}
+
+function help() {
+	echo "use: test,vet"
+}
+
+case $1 in
+vet)
+	vet
+	;;
+test)
+	test
+	;;
+*)
+	help
+	;;
+esac

hack/util.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+# find all go mod path
+# returns an array contains mod path
+function util::find_modules() {
+	find . -not \( \
+		\( \
+		-path './output' \
+		-o -path './.git' \
+		-o -path '*/third_party/*' \
+		-o -path '*/vendor/*' \
+			-o -path '*/example/*' \
+		\) -prune \
+		\) -name 'go.mod' -print0 | xargs -0 -I {} dirname {}
+}

v2/Makefile

@@ -0,0 +1,9 @@
+NACOS_VERSION ?= 2.0.3
+TOOLS_SHELL="./hack/tools.sh"
+
+prepare:
+	docker pull nacos/nacos-server:$(NACOS_VERSION)
+	docker run --rm --name nacos-quick -e MODE=standalone -p 8848:8848 -p 9848:9848 -d nacos/nacos-server:$(NACOS_VERSION)
+
+stop:
+	docker stop nacos-quick

v2/example/basic/client/client.go

@@ -19,9 +19,10 @@ import (
 	"log"
 	"time"
 
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api"
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api/hello"
+
 	"github.com/cloudwego/kitex/client"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api/hello"
 	"github.com/kitex-contrib/registry-nacos/v2/resolver"
 )
 

v2/example/basic/server/server.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/cloudwego/kitex/pkg/rpcinfo"
 	"github.com/cloudwego/kitex/server"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api/hello"
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api"
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api/hello"
 	"github.com/kitex-contrib/registry-nacos/v2/registry"
 )
 

v2/example/custom-config/client/main.go

@@ -20,8 +20,8 @@ import (
 	"time"
 
 	"github.com/cloudwego/kitex/client"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api/hello"
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api"
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api/hello"
 	"github.com/kitex-contrib/registry-nacos/v2/resolver"
 	"github.com/nacos-group/nacos-sdk-go/v2/clients"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"

v2/example/custom-config/server/main.go

@@ -20,8 +20,8 @@ import (
 
 	"github.com/cloudwego/kitex/pkg/rpcinfo"
 	"github.com/cloudwego/kitex/server"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api"
-	"github.com/kitex-contrib/registry-nacos/example/hello/kitex_gen/api/hello"
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api"
+	"github.com/kitex-contrib/registry-nacos/v2/example/hello/kitex_gen/api/hello"
 	"github.com/kitex-contrib/registry-nacos/v2/registry"
 	"github.com/nacos-group/nacos-sdk-go/v2/clients"
 	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"

v2/example/hello/hello.thrift

@@ -0,0 +1,28 @@
+// Copyright 2021 CloudWeGo Authors 
+// 
+// Licensed under the Apache License, Version 2.0 (the "License"); 
+// you may not use this file except in compliance with the License. 
+// You may obtain a copy of the License at 
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0 
+// 
+// Unless required by applicable law or agreed to in writing, software 
+// distributed under the License is distributed on an "AS IS" BASIS, 
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+// See the License for the specific language governing permissions and 
+// limitations under the License. 
+// 
+
+namespace go api
+
+struct Request {
+	1: string message
+}
+
+struct Response {
+	1: string message
+}
+
+service Hello {
+    Response echo(1: Request req)
+}