diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml deleted file mode 100644 index d82cbec6..00000000 --- a/.github/workflows/release.yaml +++ /dev/null @@ -1,25 +0,0 @@ -on: - release: - types: [created] - -jobs: - releases-matrix: - name: Release goctl binary - runs-on: ubuntu-latest - strategy: - matrix: - # build and publish in parallel: linux/386, linux/amd64, linux/arm64, - # windows/386, windows/amd64, windows/arm64, darwin/amd64, darwin/arm64 - goos: [linux, windows, darwin] - goarch: [amd64, arm64] - steps: - - uses: actions/checkout@v2 - - uses: wangyoucao577/go-release-action@v1.22 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - goos: ${{ matrix.goos }} - goarch: ${{ matrix.goarch }} - goversion: "https://dl.google.com/go/go1.17.5.linux-amd64.tar.gz" - project_path: "tools/goctl" - binary_name: "goctl" - extra_files: tools/goctl/goctl.md diff --git a/core/discov/accountregistry.go b/core/discov/accountregistry.go index 5e8481ee..bbb1d4a9 100644 --- a/core/discov/accountregistry.go +++ b/core/discov/accountregistry.go @@ -2,6 +2,7 @@ package discov import "github.com/tal-tech/go-zero/core/discov/internal" +// RegisterAccount registers the username/password to the given etcd cluster. func RegisterAccount(endpoints []string, user, pass string) { internal.AddAccount(endpoints, user, pass) } diff --git a/core/discov/internal/accountmanager.go b/core/discov/internal/accountmanager.go index f0791292..4b84c9de 100644 --- a/core/discov/internal/accountmanager.go +++ b/core/discov/internal/accountmanager.go @@ -2,16 +2,18 @@ package internal import "sync" -type Account struct { - User string - Pass string -} - var ( accounts = make(map[string]Account) lock sync.RWMutex ) +// Account holds the username/password for an etcd cluster. +type Account struct { + User string + Pass string +} + +// AddAccount adds the username/password for the given etcd cluster. func AddAccount(endpoints []string, user, pass string) { lock.Lock() defer lock.Unlock() @@ -22,6 +24,7 @@ func AddAccount(endpoints []string, user, pass string) { } } +// GetAccount gets the username/password for the given etcd cluster. func GetAccount(endpoints []string) (Account, bool) { lock.RLock() defer lock.RUnlock() diff --git a/core/discov/subscriber.go b/core/discov/subscriber.go index b70e76b2..7b70bb45 100644 --- a/core/discov/subscriber.go +++ b/core/discov/subscriber.go @@ -58,6 +58,7 @@ func Exclusive() SubOption { } } +// WithSubEtcdAccount customizes the Subscriber with given etcd username/password. func WithSubEtcdAccount(user, pass string) SubOption { return func(sub *Subscriber) { internal.AddAccount(sub.endpoints, user, pass) diff --git a/tools/goctl/api/parser/g4/gen/api/apiparser_parser.go b/tools/goctl/api/parser/g4/gen/api/apiparser_parser.go old mode 100755 new mode 100644 index fbb26a9a..8599337c --- a/tools/goctl/api/parser/g4/gen/api/apiparser_parser.go +++ b/tools/goctl/api/parser/g4/gen/api/apiparser_parser.go @@ -1,4 +1,5 @@ -package api // ApiParser +package api + import ( "fmt" "reflect" diff --git a/tools/goctl/api/spec/spec.go b/tools/goctl/api/spec/spec.go index 199e2251..1410843e 100644 --- a/tools/goctl/api/spec/spec.go +++ b/tools/goctl/api/spec/spec.go @@ -1,5 +1,6 @@ package spec +// RoutePrefixKey is the prefix keyword for the routes. const RoutePrefixKey = "prefix" type ( diff --git a/tools/goctl/model/sql/parser/parser.go b/tools/goctl/model/sql/parser/parser.go index e220dd06..28f69a43 100644 --- a/tools/goctl/model/sql/parser/parser.go +++ b/tools/goctl/model/sql/parser/parser.go @@ -371,6 +371,7 @@ func getTableFields(table *model.Table) (map[string]*Field, error) { return fieldM, nil } +// GetSafeTables escapes the golang keywords from sql tables. func GetSafeTables(tables []*parser.Table) []*parser.Table { var list []*parser.Table for _, t := range tables { @@ -381,6 +382,7 @@ func GetSafeTables(tables []*parser.Table) []*parser.Table { return list } +// GetSafeTable escapes the golang keywords from sql table. func GetSafeTable(table *parser.Table) *parser.Table { table.Name = su.EscapeGolangKeyword(table.Name) for _, c := range table.Columns { diff --git a/tools/goctl/util/string.go b/tools/goctl/util/string.go index 0aa93845..8422e4e4 100644 --- a/tools/goctl/util/string.go +++ b/tools/goctl/util/string.go @@ -96,6 +96,7 @@ func isNumber(r rune) bool { return '0' <= r && r <= '9' } +// EscapeGolangKeyword escapes the golang keywords. func EscapeGolangKeyword(s string) string { if !isGolangKeyword(s) { return s