From 3556af10e69057cb3cb7917be752780670705acb Mon Sep 17 00:00:00 2001 From: Guangming Luo Date: Tue, 20 Aug 2024 15:20:09 +0800 Subject: [PATCH 1/2] chore: update version & rm useless file --- .github/workflows/release-check.yml | 25 ------------------------- _typos.toml | 4 ++++ check_branch_name.sh | 10 ---------- go.mod | 17 +++++++---------- go.sum | 15 ++++++++------- typos.toml | 2 -- 6 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 .github/workflows/release-check.yml create mode 100644 _typos.toml delete mode 100755 check_branch_name.sh delete mode 100644 typos.toml diff --git a/.github/workflows/release-check.yml b/.github/workflows/release-check.yml deleted file mode 100644 index fb6cfcd..0000000 --- a/.github/workflows/release-check.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: Release Check - -on: - pull_request: - branches: - - main - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Check Source Branch - run: python2 -c "exit(0 if '${{ github.head_ref }}'.startswith('release') or '${{ github.head_ref }}'.startswith('hotfix') else 1)" - - - name: Check Version - run: | - # get version code, runner not support grep -E here - SOURCE_VERSION=`grep 'Version\s*=\s*\"v[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\"' *.go | awk -F '\"' '{print $(NF-1)}'` - git checkout main - MASTER_VERSION=`grep 'Version\s*=\s*\"v[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}\"' *.go | awk -F '\"' '{print $(NF-1)}'` - git checkout ${{Head.SHA}} - # check version update - python2 -c "exit(0 if list(map(int,'${SOURCE_VERSION#v}'.split('.')[:3])) > list(map(int,'${MASTER_VERSION#v}'.split('.')[:3])) else 1)" diff --git a/_typos.toml b/_typos.toml new file mode 100644 index 0000000..1c1c51b --- /dev/null +++ b/_typos.toml @@ -0,0 +1,4 @@ +# Typo check: https://github.com/crate-ci/typos + +[files] +extend-exclude = ["go.mod", "go.sum"] \ No newline at end of file diff --git a/check_branch_name.sh b/check_branch_name.sh deleted file mode 100755 index 1876fc0..0000000 --- a/check_branch_name.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash - -current=$(git status | head -n1 | sed 's/On branch //') -name=${1:-$current} -if [[ ! $name =~ ^(((opt(imize)?|feat(ure)?|(bug|hot)?fix|test|refact(or)?|ci)/.+)|(main|develop)|(release-v[0-9]+\.[0-9]+)|(release/v[0-9]+\.[0-9]+\.[0-9]+(-[a-z0-9.]+(\+[a-z0-9.]+)?)?)|revert-[a-z0-9]+)$ ]]; then - echo "branch name '$name' is invalid" - exit 1 -else - echo "branch name '$name' is valid" -fi diff --git a/go.mod b/go.mod index a48bee2..03ec923 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,16 @@ module github.com/kitex-contrib/xds go 1.17 require ( - github.com/bytedance/gopkg v0.0.0-20240514070511-01b2cbcf35e1 + github.com/bytedance/gopkg v0.1.0 github.com/cenkalti/backoff/v4 v4.1.0 - github.com/cloudwego/kitex v0.10.2-0.20240704095136-573dc2b9e772 + github.com/cloudwego/kitex v0.10.3 github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe github.com/envoyproxy/go-control-plane v0.11.1 github.com/golang/protobuf v1.5.3 + github.com/google/go-cmp v0.5.9 github.com/stretchr/testify v1.8.3 go.uber.org/atomic v1.11.0 + google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e google.golang.org/protobuf v1.30.0 ) @@ -26,9 +28,9 @@ require ( github.com/cloudwego/frugal v0.1.15 // indirect github.com/cloudwego/iasm v0.2.0 // indirect github.com/cloudwego/localsession v0.0.2 // indirect - github.com/cloudwego/netpoll v0.6.2 // indirect + github.com/cloudwego/netpoll v0.6.3 // indirect github.com/cloudwego/runtimex v0.1.0 // indirect - github.com/cloudwego/thriftgo v0.3.14-0.20240625094426-efe48e84f538 // indirect + github.com/cloudwego/thriftgo v0.3.15 // indirect github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/envoyproxy/protoc-gen-validate v1.0.1 // indirect @@ -39,6 +41,7 @@ require ( github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/kr/pretty v0.3.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/gls v0.0.0-20220109145502-612d0167dce5 // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/oleiade/lane v1.0.1 // indirect @@ -60,10 +63,4 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect ) -require ( - github.com/google/go-cmp v0.5.9 - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e -) - replace github.com/apache/thrift => github.com/apache/thrift v0.13.0 diff --git a/go.sum b/go.sum index 6cacece..8e2fa93 100644 --- a/go.sum +++ b/go.sum @@ -613,8 +613,9 @@ github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bytedance/gopkg v0.0.0-20230728082804-614d0af6619b/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= github.com/bytedance/gopkg v0.0.0-20240507064146-197ded923ae3/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= -github.com/bytedance/gopkg v0.0.0-20240514070511-01b2cbcf35e1 h1:rT7Mm6uUpHeZQzfs2v0Mlj0SL02CzyVi+EB7VYPM/z4= github.com/bytedance/gopkg v0.0.0-20240514070511-01b2cbcf35e1/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= +github.com/bytedance/gopkg v0.1.0 h1:aAxB7mm1qms4Wz4sp8e1AtKDOeFLtdqvGiUe7aonRJs= +github.com/bytedance/gopkg v0.1.0/go.mod h1:FtQG3YbQG9L/91pbKSw787yBQPutC+457AvDW77fgUQ= github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= github.com/bytedance/sonic v1.11.8 h1:Zw/j1KfiS+OYTi9lyB3bb0CFxPJVkM17k1wyDG32LRA= github.com/bytedance/sonic v1.11.8/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= @@ -649,17 +650,17 @@ github.com/cloudwego/frugal v0.1.15/go.mod h1:26kU1r18vA8vRg12c66XPDlfv1GQHDbE1R github.com/cloudwego/iasm v0.0.9/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= -github.com/cloudwego/kitex v0.10.2-0.20240704095136-573dc2b9e772 h1:dug8ioTtrnBSpepcL738epxRjxs2XsK3e/LCNZ6rWKE= -github.com/cloudwego/kitex v0.10.2-0.20240704095136-573dc2b9e772/go.mod h1:3T3OfyMOAKSr6q9P+fn8yK1t0LhPkhi57m2o8ZUdkpo= +github.com/cloudwego/kitex v0.10.3 h1:L3JRkb25oXMf1ROslQNY7E9EpaUBBjJWwjGfkQERJ+k= +github.com/cloudwego/kitex v0.10.3/go.mod h1:6wYnJc0TpKnHwM8/Fcy2YrQNyrlmpMYP0y5ADZrqYsc= github.com/cloudwego/localsession v0.0.2 h1:N9/IDtCPj1fCL9bCTP+DbXx3f40YjVYWcwkJG0YhQkY= github.com/cloudwego/localsession v0.0.2/go.mod h1:kiJxmvAcy4PLgKtEnPS5AXed3xCiXcs7Z+KBHP72Wv8= -github.com/cloudwego/netpoll v0.6.2 h1:+KdILv5ATJU+222wNNXpHapYaBeRvvL8qhJyhcxRxrQ= -github.com/cloudwego/netpoll v0.6.2/go.mod h1:kaqvfZ70qd4T2WtIIpCOi5Cxyob8viEpzLhCrTrz3HM= +github.com/cloudwego/netpoll v0.6.3 h1:t+ndlwBFjQZimUj3ul31DwI45t18eOr2pcK3juZZm+E= +github.com/cloudwego/netpoll v0.6.3/go.mod h1:kaqvfZ70qd4T2WtIIpCOi5Cxyob8viEpzLhCrTrz3HM= github.com/cloudwego/runtimex v0.1.0 h1:HG+WxWoj5/CDChDZ7D99ROwvSMkuNXAqt6hnhTTZDiI= github.com/cloudwego/runtimex v0.1.0/go.mod h1:23vL/HGV0W8nSCHbe084AgEBdDV4rvXenEUMnUNvUd8= github.com/cloudwego/thriftgo v0.3.6/go.mod h1:29ukiySoAMd0vXMYIduAY9dph/7dmChvOS11YLotFb8= -github.com/cloudwego/thriftgo v0.3.14-0.20240625094426-efe48e84f538 h1:erd7sP8sG2j+hMjISTNtdF60oPUL/76EPS+XsbYYdYo= -github.com/cloudwego/thriftgo v0.3.14-0.20240625094426-efe48e84f538/go.mod h1:R4a+4aVDI0V9YCTfpNgmvbkq/9ThKgF7Om8Z0I36698= +github.com/cloudwego/thriftgo v0.3.15 h1:yB/DDGjeSjliyidMVBjKhGl9RgE4M8iVIz5dKpAIyUs= +github.com/cloudwego/thriftgo v0.3.15/go.mod h1:R4a+4aVDI0V9YCTfpNgmvbkq/9ThKgF7Om8Z0I36698= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= diff --git a/typos.toml b/typos.toml deleted file mode 100644 index 0f11c56..0000000 --- a/typos.toml +++ /dev/null @@ -1,2 +0,0 @@ -[files] -extend-exclude = ["check_branch_name.sh"] \ No newline at end of file From 46cd20f641ef3816dd7f8f39aa95c6ea2bf7f5b1 Mon Sep 17 00:00:00 2001 From: Guangming Luo Date: Tue, 20 Aug 2024 15:54:55 +0800 Subject: [PATCH 2/2] chore: fix printf-style issue --- core/xdsresource/util.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/xdsresource/util.go b/core/xdsresource/util.go index 2e45107..1e04323 100644 --- a/core/xdsresource/util.go +++ b/core/xdsresource/util.go @@ -17,6 +17,7 @@ package xdsresource import ( + "errors" "fmt" "strings" ) @@ -35,7 +36,7 @@ func processUnmarshalErrors(errs []error, errMap map[string]error) error { } } - return fmt.Errorf(b.String()) + return errors.New(b.String()) } func combineErrors(errs []error) error { @@ -43,9 +44,11 @@ func combineErrors(errs []error) error { return nil } var b strings.Builder - for _, err := range errs { + for i, err := range errs { + if i > 0 { + b.WriteString("\n") + } b.WriteString(err.Error()) - b.WriteString("\n") } - return fmt.Errorf(b.String()) + return errors.New(b.String()) }