.gitea/workflows/job_lint.yml

@@ -1,29 +0,0 @@
-name: lint
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable' 
-    - name: setup deps
-      run: go get -v ./...
-    - name: run lint
-      uses: https://github.com/golangci/golangci-lint-action@v6
-      with:
-        version: 'latest'

.gitea/workflows/job_test.yml

@@ -1,34 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup deps
-      run: go get -v ./...
-    - name: run test
-      env:
-        INTEGRATION_TESTS: yes
-      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -1,53 +0,0 @@
-name: test
-
-on:
-  pull_request:
-    types: [opened, reopened, synchronize]
-    branches:
-    - master
-    - v3
-    - v4
-  push:
-    branches:
-    - master
-    - v3
-    - v4
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout code
-      uses: actions/checkout@v4
-      with:
-        filter: 'blob:none'
-    - name: checkout tests
-      uses: actions/checkout@v4
-      with:
-        ref: master
-        filter: 'blob:none'
-        repository: unistack-org/micro-tests
-        path: micro-tests
-    - name: setup go
-      uses: actions/setup-go@v5
-      with:
-        cache-dependency-path: "**/*.sum"
-        go-version: 'stable'
-    - name: setup go work
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        go work init
-        go work use .
-        go work use micro-tests        
-    - name: setup deps
-      env:
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: go get -v ./...
-    - name: run tests
-      env:
-        INTEGRATION_TESTS: yes
-        GOWORK: /workspace/${{ github.repository_owner }}/go.work
-      run: |
-        cd micro-tests
-        go test -mod readonly -v ./... || true        

.github/dependabot.yml

@@ -0,0 +1,19 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+
+  # Maintain dependencies for Golang
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/build.yml

@@ -0,0 +1,46 @@
+name: build
+on:
+ push:
+    branches:
+    - master
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: cache
+      uses: actions/cache@v2
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: lint
+        uses: golangci/golangci-lint-action@v2
+        continue-on-error: true
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,75 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '34 1 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'go' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,66 @@
+name: "prautomerge"
+
+on:
+  workflow_run:
+    workflows: ["prbuild"]
+    types:
+      - completed
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  Dependabot-Automerge:
+    runs-on: ubuntu-latest
+    # Contains workaround to execute if dependabot updates the PR by checking for the base branch in the linked PR
+    # The the github.event.workflow_run.event value is 'push' and not 'pull_request'
+    # dont work with multiple workflows when last returns success
+    if: >-
+      github.event.workflow_run.conclusion == 'success'
+      && github.actor == 'dependabot[bot]'
+      && github.event.sender.login == 'dependabot[bot]'
+      && github.event.sender.type == 'Bot'
+      && (github.event.workflow_run.event == 'pull_request'
+          || (github.event.workflow_run.event == 'push' && github.event.workflow_run.pull_requests[0].base.ref == github.event.repository.default_branch ))
+    steps:
+      - name: Approve Changes and Merge changes if label 'dependencies' is set
+        uses: actions/github-script@v4
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            console.log(context.payload.workflow_run);
+            
+            var labelNames = await github.paginate(
+              github.issues.listLabelsOnIssue,
+              {
+                repo: context.repo.repo,
+                owner: context.repo.owner,
+                issue_number: context.payload.workflow_run.pull_requests[0].number,
+              },
+              (response) => response.data.map(
+                (label) => label.name
+              )
+            );
+
+            console.log(labelNames);
+
+            if (labelNames.includes('dependencies')) {
+              console.log('Found label');
+
+              await github.pulls.createReview({
+                repo: context.repo.repo,
+                owner: context.repo.owner,
+                pull_number: context.payload.workflow_run.pull_requests[0].number,
+                event: 'APPROVE'
+              });
+              console.log('Approved PR');
+
+              await github.pulls.merge({
+                repo: context.repo.repo,
+                owner: context.repo.owner,
+                pull_number: context.payload.workflow_run.pull_requests[0].number,
+              });
+
+              console.log('Merged PR');
+            }

.github/workflows/pr.yml

@@ -0,0 +1,46 @@
+name: prbuild
+on:
+  pull_request:
+    branches:
+    - master
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16
+    - name: checkout
+      uses: actions/checkout@v2
+    - name: cache
+      uses: actions/cache@v2
+      with:
+        path: ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: ${{ runner.os }}-go-
+    - name: deps
+      run: go get -v -t -d ./...
+    - name: test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...
+  lint:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v2
+      - name: lint
+        uses: golangci/golangci-lint-action@v2
+        continue-on-error: true
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: v1.30
+          # Optional: working directory, useful for monorepos
+          # working-directory: somedir
+          # Optional: golangci-lint command line arguments.
+          # args: --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          # only-new-issues: true

.golangci.yml

@@ -1,5 +0,0 @@
-run:
-  concurrency: 8
-  deadline: 5m
-  issues-exit-code: 1
-  tests: true

flag.go

@@ -1,13 +1,11 @@
-package flag
+package flag // import "go.unistack.org/micro-config-flag/v3"
 
 import (
 	"context"
 	"errors"
 	"flag"
 	"fmt"
-	"os"
 	"reflect"
-	"strings"
 	"time"
 
 	"go.unistack.org/micro/v3/config"
@@ -29,10 +27,7 @@ var (
 */
 
 type flagConfig struct {
-	fset *flag.FlagSet
 	opts config.Options
-	name string
-	env  string
 }
 
 func (c *flagConfig) Options() config.Options {
@@ -44,23 +39,9 @@ func (c *flagConfig) Init(opts ...config.Option) error {
 		o(&c.opts)
 	}
 
-	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
-	c.configure()
-
 	fields, err := rutil.StructFields(c.opts.Struct)
 	if err != nil {
-		if !c.opts.AllowFail {
+		return err
-			return err
-		}
-
-		if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-			return err
-		}
-
-		return nil
 	}
 
 	for _, sf := range fields {
@@ -68,26 +49,10 @@ func (c *flagConfig) Init(opts ...config.Option) error {
 		if !ok {
 			continue
 		}
-
+		fn, fv, fd := getFlagOpts(tf)
-		fn, fd, fv := getFlagOpts(tf)
-		if tf, ok = sf.Field.Tag.Lookup(c.env); ok {
-			fd += fmt.Sprintf(" (env %s)", tf)
-		}
 
 		rcheck := true
-
+		switch sf.Value.Interface().(type) {
-		if !sf.Value.IsValid() {
-			continue
-		}
-		vi := sf.Value.Interface()
-		if vi == nil {
-			continue
-		}
-		if f := flag.Lookup(fn); f != nil {
-			return nil
-		}
-
-		switch vi.(type) {
 		case time.Duration:
 			err = c.flagDuration(sf.Value, fn, fv, fd)
 			rcheck = false
@@ -95,15 +60,11 @@ func (c *flagConfig) Init(opts ...config.Option) error {
 			err = c.flagTime(sf.Value, fn, fv, fd)
 			rcheck = false
 		}
-
 		if err != nil {
+			c.opts.Logger.Errorf(c.opts.Context, "flag init error: %v", err)
 			if !c.opts.AllowFail {
 				return err
 			}
-			if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-				return err
-			}
-
 			return nil
 		}
 
@@ -136,60 +97,26 @@ func (c *flagConfig) Init(opts ...config.Option) error {
 			err = c.flagMap(sf.Value, fn, fv, fd)
 		}
 		if err != nil {
+			c.opts.Logger.Errorf(c.opts.Context, "flag init error: %v", err)
 			if !c.opts.AllowFail {
 				return err
 			}
-
-			if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-				return err
-			}
-
 			return nil
 		}
 	}
 
-	if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
 	return nil
 }
 
 func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
-	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
-		return nil
-	}
-
 	options := config.NewLoadOptions(opts...)
 	_ = options
-
-	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
-	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
 	// TODO: allow merge, append and so
 	flag.Parse()
-
 	return nil
 }
 
 func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
-	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
-		return nil
-	}
-
-	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
-	if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
-		return err
-	}
-
 	return nil
 }
 
@@ -205,125 +132,10 @@ func (c *flagConfig) Watch(ctx context.Context, opts ...config.WatchOption) (con
 	return nil, fmt.Errorf("not implemented")
 }
 
-func (c *flagConfig) usage() {
-	mapDelim := DefaultMapDelim
-	sliceDelim := DefaultSliceDelim
-
-	if c.opts.Context != nil {
-		if d, ok := c.opts.Context.Value(mapDelimKey{}).(string); ok {
-			mapDelim = d
-		}
-		if d, ok := c.opts.Context.Value(sliceDelimKey{}).(string); ok {
-			sliceDelim = d
-		}
-	}
-
-	if c.name == "" {
-		fmt.Fprintf(c.fset.Output(), "Usage:\n")
-	} else {
-		fmt.Fprintf(c.fset.Output(), "Usage of %s:\n", c.name)
-	}
-
-	c.fset.VisitAll(func(f *flag.Flag) {
-		var b strings.Builder
-		fmt.Fprintf(&b, "  -%s", f.Name) // Two spaces before -; see next two comments.
-		_, usage := flag.UnquoteUsage(f)
-		name := "value"
-		v := reflect.TypeOf(f.Value).String()
-		b.WriteString(" ")
-		switch v {
-		case "*flag.boolFlag":
-			name = "bool"
-		case "*flag.durationValue":
-			name = "duration"
-		case "*flag.float64Value":
-			name = "float"
-		case "*flag.intValue", "*flag.int64Value":
-			name = "int"
-		case "*flag.stringValue":
-			name = "string"
-		case "*flag.uintValue", "*flag.uint64Value":
-			name = "uint"
-		case "*flag.mapValue":
-			//	nv := f.Value.(*mapValue)
-			name = fmt.Sprintf("string key=val with %q as separator", mapDelim)
-		case "*flag.sliceValue":
-			//	nv := f.Value.(*sliceValue)
-			name = fmt.Sprintf("string with %q as separator", sliceDelim)
-		}
-		b.WriteString(name)
-
-		// Boolean flags of one ASCII letter are so common we
-		// treat them specially, putting their usage on the same line.
-		if b.Len() <= 4 { // space, space, '-', 'x'.
-			b.WriteString("\t")
-		} else {
-			// Four spaces before the tab triggers good alignment
-			// for both 4- and 8-space tab stops.
-			b.WriteString("\n    \t")
-		}
-		b.WriteString(strings.ReplaceAll(usage, "\n", "\n    \t"))
-
-		if f.Value.String() == f.DefValue {
-			fmt.Fprintf(&b, " (default %q)", f.DefValue)
-		} else {
-			fmt.Fprintf(&b, " (default %q current %q)", f.DefValue, f.Value)
-		}
-
-		fmt.Fprint(c.fset.Output(), b.String(), "\n")
-	})
-}
-
-func (c *flagConfig) configure() {
-	flagSet := flag.CommandLine
-	flagSetName := os.Args[0]
-	flagSetErrorHandling := flag.ExitOnError
-	flagEnv := "env"
-	var flagUsage func()
-	var isSet bool
-
-	if c.opts.Context != nil {
-		if v, ok := c.opts.Context.Value(flagSetNameKey{}).(string); ok {
-			isSet = true
-			flagSetName = v
-		}
-		if v, ok := c.opts.Context.Value(flagSetErrorHandlingKey{}).(flag.ErrorHandling); ok {
-			isSet = true
-			flagSetErrorHandling = v
-		}
-		if v, ok := c.opts.Context.Value(flagSetKey{}).(*flag.FlagSet); ok {
-			flagSet = v
-		}
-		if v, ok := c.opts.Context.Value(flagSetUsageKey{}).(func()); ok {
-			flagUsage = v
-		}
-		if v, ok := c.opts.Context.Value(flagEnvKey{}).(string); ok {
-			flagEnv = v
-		}
-	}
-	c.fset = flagSet
-
-	if isSet {
-		c.fset.Init(flagSetName, flagSetErrorHandling)
-	}
-	if flagUsage != nil {
-		c.fset.Usage = flagUsage
-	} else {
-		c.fset.Usage = c.usage
-	}
-	c.env = flagEnv
-
-	c.name = flagSetName
-}
-
 func NewConfig(opts ...config.Option) config.Config {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag
 	}
-
+	return &flagConfig{opts: options}
-	c := &flagConfig{opts: options}
-	c.configure()
-
-	return c
 }

flag_test.go

@@ -2,7 +2,6 @@ package flag
 
 import (
 	"context"
-	"flag"
 	"os"
 	"testing"
 	"time"
@@ -11,58 +10,39 @@ import (
 )
 
 func TestLoad(t *testing.T) {
-	time.Local = time.UTC
 	os.Args = append(os.Args, "-broker", "5566:33")
 	os.Args = append(os.Args, "-verbose")
 	os.Args = append(os.Args, "-wait", "5s")
 	os.Args = append(os.Args, "-addr", "33,44")
 	os.Args = append(os.Args, "-time", time.RFC822)
 	os.Args = append(os.Args, "-metadata", "key=20")
-	os.Args = append(os.Args, "-components", "all=info,api=debug")
-	os.Args = append(os.Args, "-addr", "33,44")
-	os.Args = append(os.Args, "-badflag", "test")
-	type NestedConfig struct {
-		Value string `flag:"name=nested_value"`
-	}
 	type Config struct {
-		Time           time.Time         `flag:"name=time,desc='some time',default='02 Jan 06 15:04 MST'"`
+		Broker   string         `flag:"name=broker,desc='description with, comma',default='127.0.0.1:9092'"`
-		Components     map[string]string `flag:"name=components,desc='components logging'"`
+		Verbose  bool           `flag:"name=verbose,desc='verbose output',default='false'"`
-		Metadata       map[string]int    `flag:"name=metadata,desc='some meta',default=''"`
+		Addr     []string       `flag:"name=addr,desc='addrs',default='127.0.0.1:9092'"`
-		Nested         *NestedConfig
+		Wait     time.Duration  `flag:"name=wait,desc='wait time',default='2s'"`
-		Broker         string        `flag:"name=broker,desc='description with, comma',default='127.0.0.1:9092'"`
+		Time     time.Time      `flag:"name=time,desc='some time',default='02 Jan 06 15:04 MST'"`
-		WithoutDesc    string        `flag:"name=without_desc,default='without_default'"`
+		Metadata map[string]int `flag:"name=metadata,desc='some meta',default=''"`
-		WithoutAll     string        `flag:"name=without_all"`
-		WithoutDefault string        `flag:"name=without_default,desc='with'"`
-		Addr           []string      `flag:"name=addr,desc='addrs',default='127.0.0.1:9092'"`
-		Wait           time.Duration `flag:"name=wait,desc='wait time',default='2s'"`
-		Verbose        bool          `flag:"name=verbose,desc='verbose output',default='false'"`
 	}
 
 	ctx := context.Background()
-	cfg := &Config{Nested: &NestedConfig{}}
+	cfg := &Config{}
 
-	c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822), FlagErrorHandling(flag.ContinueOnError))
+	c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822))
 	if err := c.Init(); err != nil {
-		t.Fatalf("init failed: %v", err)
+		t.Fatal(err)
-	}
-
-	// double init test
-	if err := c.Init(); err != nil {
-		t.Fatalf("init failed: %v", err)
 	}
 
 	if err := c.Load(ctx); err != nil {
-		t.Fatalf("load failed: %v", err)
+		t.Fatal(err)
 	}
 
 	if cfg.Broker != "5566:33" {
 		t.Fatalf("failed to parse flags broker value invalid: %#+v", cfg)
 	}
-	if tf := cfg.Time.Format(time.RFC822); tf != "02 Jan 06 15:04 MST" {
+	if tf := cfg.Time.Format(time.RFC822); tf != "02 Jan 06 14:32 MSK" {
-		t.Fatalf("parse time error: %s != %s", tf, "02 Jan 06 15:04 MST")
+		t.Fatalf("parse time error: %v", cfg.Time)
 	}
 
-	if len(cfg.Components) != 2 {
+	t.Logf("cfg %#+v", cfg)
-		t.Fatalf("cant parse map components %#+v", cfg)
-	}
 }

go.mod

@@ -1,16 +1,5 @@
-module go.unistack.org/micro-config-flag/v3
+module go.unistack.orgmicro-config-flag/v3
 
-go 1.22
+go 1.16
 
-toolchain go1.23.1
+require go.unistack.org/micro/v3 v3.8.5
-
-require go.unistack.org/micro/v3 v3.11.14
-
-require (
-	dario.cat/mergo v1.0.1 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/uuid v1.6.0 // indirect
-	go.unistack.org/micro-proto/v3 v3.4.1 // indirect
-	google.golang.org/protobuf v1.35.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
-)

go.sum

@@ -1,17 +1,28 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
+github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/golang-jwt/jwt/v4 v4.1.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
+github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
+github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-go.unistack.org/micro/v3 v3.10.97 h1:8l7fv+i06/PjPrBBhRC/ZQkWGIOuHPg3jJN0vktYE78=
+github.com/silas/dag v0.0.0-20210626123444-3804bac2d6d4/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-go.unistack.org/micro/v3 v3.10.97/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro-proto/v3 v3.1.0 h1:q39FwjFiRZn+Ux/tt+d3bJTmDtsQQWa+3SLYVo1vLfA=
-go.unistack.org/micro/v3 v3.11.14 h1:3e9T30Ih9cvqZTCD8inG1qsBWRk4x5ZinWuTiDFM4CE=
+go.unistack.org/micro-proto/v3 v3.1.0/go.mod h1:DpRhYCBXlmSJ/AAXTmntvlh7kQkYU6eFvlmYAx4BQS8=
-go.unistack.org/micro/v3 v3.11.14/go.mod h1:k++F5Ej4LIy3XnOW/oj3P7B97wp2t9yLSlqtUzMpatM=
+go.unistack.org/micro/v3 v3.8.5 h1:DIYWRsQF+NPhKZP45sCtNsUhaRw6u2+Ps7U+pKU7i3s=
-google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+go.unistack.org/micro/v3 v3.8.5/go.mod h1:KMMmOmbgo/D52/rCAbqeKbBsgEEbSKM69he54J3ZIuA=
-google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

options.go

@@ -1,8 +1,6 @@
 package flag
 
 import (
-	"flag"
-
 	"go.unistack.org/micro/v3/config"
 )
 
@@ -26,39 +24,3 @@ type timeFormatKey struct{}
 func TimeFormat(s string) config.Option {
 	return config.SetOption(timeFormatKey{}, s)
 }
-
-type flagSetKey struct{}
-
-// FlagSet set flag set name
-func FlagSet(f *flag.FlagSet) config.Option {
-	return config.SetOption(flagSetKey{}, f)
-}
-
-type flagSetNameKey struct{}
-
-// FlagSetName set flag set name
-func FlagSetName(n string) config.Option {
-	return config.SetOption(flagSetNameKey{}, n)
-}
-
-type flagSetErrorHandlingKey struct{}
-
-// FlagErrorHandling set flag set error handling
-func FlagErrorHandling(eh flag.ErrorHandling) config.Option {
-	return config.SetOption(flagSetErrorHandlingKey{}, eh)
-}
-
-type flagSetUsageKey struct{}
-
-// FlagUsage set flag set usage func
-func FlagUsage(fn func()) config.Option {
-	return config.SetOption(flagSetUsageKey{}, fn)
-}
-
-
-type flagEnvKey struct{}
-
-// FlagEnv set flag set usage func
-func FlagEnv(n string) config.Option {
-	return config.SetOption(flagEnvKey{}, n)
-}

util.go

@@ -2,139 +2,12 @@ package flag
 
 import (
 	"flag"
-	"fmt"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
 )
 
-type mapValue struct {
-	delim string
-	def   string
-	v     reflect.Value
-}
-
-func (v *mapValue) String() string {
-	if v.v.Kind() != reflect.Invalid {
-		var kv []string
-		it := v.v.MapRange()
-		for it.Next() {
-			k := it.Key().Interface()
-			v := it.Value().Interface()
-			kv = append(kv, fmt.Sprintf("%v=%v", k, v))
-		}
-		return strings.Join(kv, ",")
-	}
-	return v.def
-}
-
-func (v *mapValue) Get() interface{} {
-	return v.v.Interface()
-}
-
-func (v *mapValue) Set(s string) error {
-	ps := strings.Split(s, v.delim)
-	if len(ps) == 0 {
-		return nil
-	}
-	v.v.Set(reflect.MakeMapWithSize(v.v.Type(), len(ps)))
-	kt := v.v.Type().Key().Kind()
-	vt := v.v.Type().Elem().Kind()
-
-	for i := 0; i < len(ps); i++ {
-		fs := strings.Split(ps[i], "=")
-		switch len(fs) {
-		case 0:
-			return nil
-		case 1:
-			if len(fs[0]) == 0 {
-				return nil
-			}
-			return ErrInvalidValue
-		case 2:
-			break
-		default:
-			return ErrInvalidValue
-		}
-		key, err := convertType(reflect.ValueOf(fs[0]), kt)
-		if err != nil {
-			return err
-		}
-		val, err := convertType(reflect.ValueOf(fs[1]), vt)
-		if err != nil {
-			return err
-		}
-		v.v.SetMapIndex(key.Convert(v.v.Type().Key()), val.Convert(v.v.Type().Elem()))
-	}
-	return nil
-}
-
-type sliceValue struct {
-	delim string
-	def   string
-	v     reflect.Value
-}
-
-func (v *sliceValue) String() string {
-	if v.v.Kind() != reflect.Invalid {
-		var kv []string
-		for idx := 0; idx < v.v.Len(); idx++ {
-			kv = append(kv, fmt.Sprintf("%v", v.v.Index(idx).Interface()))
-		}
-		return strings.Join(kv, ",")
-	}
-	return v.def
-}
-
-func (v *sliceValue) Get() interface{} {
-	return v.v.Interface()
-}
-
-func (v *sliceValue) Set(s string) error {
-	p := strings.Split(s, v.delim)
-	v.v.Set(reflect.MakeSlice(v.v.Type(), len(p), len(p)))
-	switch v.v.Type().Elem().Kind() {
-	case reflect.Int, reflect.Int64:
-		for idx := range p {
-			i, err := strconv.ParseInt(p[idx], 10, 64)
-			if err != nil {
-				return err
-			}
-			v.v.Index(idx).SetInt(i)
-		}
-	case reflect.Uint, reflect.Uint64:
-		for idx := range p {
-			i, err := strconv.ParseUint(p[idx], 10, 64)
-			if err != nil {
-				return err
-			}
-			v.v.Index(idx).SetUint(i)
-		}
-	case reflect.Float64:
-		for idx := range p {
-			i, err := strconv.ParseFloat(p[idx], 64)
-			if err != nil {
-				return err
-			}
-			v.v.Index(idx).SetFloat(i)
-		}
-	case reflect.Bool:
-		for idx := range p {
-			i, err := strconv.ParseBool(p[idx])
-			if err != nil {
-				return err
-			}
-			v.v.Index(idx).SetBool(i)
-		}
-	case reflect.String:
-		for idx := range p {
-			v.v.Index(idx).SetString(p[idx])
-		}
-	}
-	return nil
-}
-
 func convertType(v reflect.Value, t reflect.Kind) (reflect.Value, error) {
 	switch v.Kind() {
 	case reflect.String:
@@ -178,12 +51,50 @@ func (c *flagConfig) flagSlice(v reflect.Value, fn, fv, fd string) error {
 		}
 	}
 
-	v.Set(reflect.MakeSlice(v.Type(), 0, 0))
+	flag.Func(fn, fd, func(s string) error {
-	mp := &sliceValue{v: v, def: fv, delim: delim}
+		p := strings.Split(s, delim)
-	if err := mp.Set(fv); err != nil {
+		v.Set(reflect.MakeSlice(v.Type(), len(p), len(p)))
-		return err
+		switch v.Type().Elem().Kind() {
-	}
+		case reflect.Int, reflect.Int64:
-	flag.Var(mp, fn, fd)
+			for idx := range p {
+				i, err := strconv.ParseInt(p[idx], 10, 64)
+				if err != nil {
+					return err
+				}
+				v.Index(idx).SetInt(i)
+			}
+		case reflect.Uint, reflect.Uint64:
+			for idx := range p {
+				i, err := strconv.ParseUint(p[idx], 10, 64)
+				if err != nil {
+					return err
+				}
+				v.Index(idx).SetUint(i)
+			}
+		case reflect.Float64:
+			for idx := range p {
+				i, err := strconv.ParseFloat(p[idx], 64)
+				if err != nil {
+					return err
+				}
+				v.Index(idx).SetFloat(i)
+			}
+		case reflect.Bool:
+			for idx := range p {
+				i, err := strconv.ParseBool(p[idx])
+				if err != nil {
+					return err
+				}
+				v.Index(idx).SetBool(i)
+			}
+		case reflect.String:
+			for idx := range p {
+				v.Index(idx).SetString(p[idx])
+			}
+		}
+		return nil
+	})
+
 	return nil
 }
 
@@ -194,12 +105,43 @@ func (c *flagConfig) flagMap(v reflect.Value, fn, fv, fd string) error {
 			delim = d
 		}
 	}
-	v.Set(reflect.MakeMapWithSize(v.Type(), 0))
+	flag.Func(fn, fd, func(s string) error {
-	mp := &mapValue{v: v, def: fv, delim: delim}
+		ps := strings.Split(s, delim)
-	if err := mp.Set(fv); err != nil {
+		if len(ps) == 0 {
-		return err
+			return nil
-	}
+		}
-	flag.Var(mp, fn, fd)
+		v.Set(reflect.MakeMapWithSize(v.Type(), len(ps)))
+		kt := v.Type().Key().Kind()
+		vt := v.Type().Elem().Kind()
+
+		for i := 0; i < len(ps); i++ {
+			fs := strings.Split(ps[i], "=")
+			switch len(fs) {
+			case 0:
+				return nil
+			case 1:
+				if len(fs[0]) == 0 {
+					return nil
+				}
+				return ErrInvalidValue
+			case 2:
+				break
+			default:
+				return ErrInvalidValue
+			}
+			key, err := convertType(reflect.ValueOf(fs[0]), kt)
+			if err != nil {
+				return err
+			}
+			val, err := convertType(reflect.ValueOf(fs[1]), vt)
+			if err != nil {
+				return err
+			}
+			v.SetMapIndex(key.Convert(v.Type().Key()), val.Convert(v.Type().Elem()))
+		}
+		return nil
+	})
+
 	return nil
 }
 
@@ -230,7 +172,7 @@ func (c *flagConfig) flagDuration(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := time.ParseDuration(fv)
+	i, err := time.ParseDuration(fd)
 	if err != nil {
 		return err
 	}
@@ -243,7 +185,7 @@ func (c *flagConfig) flagBool(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseBool(fv)
+	i, err := strconv.ParseBool(fd)
 	if err != nil {
 		return err
 	}
@@ -265,11 +207,11 @@ func (c *flagConfig) flagInt(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseInt(fv, 10, 64)
+	i, err := strconv.ParseInt(fd, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.IntVar(nv, fn, int(i), fv)
+	flag.IntVar(nv, fn, int(i), fd)
 	return nil
 }
 
@@ -278,11 +220,11 @@ func (c *flagConfig) flagInt64(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseInt(fv, 10, 64)
+	i, err := strconv.ParseInt(fd, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.Int64Var(nv, fn, int64(i), fv)
+	flag.Int64Var(nv, fn, int64(i), fd)
 	return nil
 }
 
@@ -291,11 +233,11 @@ func (c *flagConfig) flagUint(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseUint(fv, 10, 64)
+	i, err := strconv.ParseUint(fd, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.UintVar(nv, fn, uint(i), fv)
+	flag.UintVar(nv, fn, uint(i), fd)
 	return nil
 }
 
@@ -304,11 +246,11 @@ func (c *flagConfig) flagUint64(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseUint(fv, 10, 64)
+	i, err := strconv.ParseUint(fd, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.Uint64Var(nv, fn, uint64(i), fv)
+	flag.Uint64Var(nv, fn, uint64(i), fd)
 	return nil
 }
 
@@ -317,15 +259,14 @@ func (c *flagConfig) flagFloat64(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseFloat(fv, 64)
+	i, err := strconv.ParseFloat(fd, 64)
 	if err != nil {
 		return err
 	}
-	flag.Float64Var(nv, fn, float64(i), fv)
+	flag.Float64Var(nv, fn, float64(i), fd)
 	return nil
 }
 
-/*
 func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
 	nv, ok := v.Addr().Interface().(*string)
 	if !ok {
@@ -334,77 +275,33 @@ func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
 	flag.StringVar(nv, fn, fv, fd)
 	return nil
 }
-*/
 
 func getFlagOpts(tf string) (string, string, string) {
-	var name, desc, def string
+	ret := make([]string, 3)
-	delim := ","
+	vals := strings.Split(tf, ",")
-
+	f := 0
-	var buf string
+	for _, val := range vals {
-	for idx := 0; idx < len(tf); idx++ {
+		p := strings.Split(val, "=")
-		buf += string(tf[idx])
+		switch p[0] {
-		switch buf {
 		case "name":
-			ndx := idx + 2
+			f = 0
-			stop := ","
-			var quote bool
-			for ; ndx < len(tf); ndx++ {
-				if string(tf[ndx]) == stop {
-					if quote {
-						ndx++
-					}
-					break
-				}
-				if string(tf[ndx]) == "'" {
-					stop = "'"
-					quote = true
-					continue
-				}
-				name += string(tf[ndx])
-			}
-			idx = ndx
-			buf = ""
 		case "desc":
-			ndx := idx + 2
+			f = 1
-			stop := ","
-			var quote bool
-			for ; ndx < len(tf); ndx++ {
-				if string(tf[ndx]) == stop {
-					if quote {
-						ndx++
-					}
-					break
-				}
-				if string(tf[ndx]) == "'" {
-					stop = "'"
-					quote = true
-					continue
-				}
-				desc += string(tf[ndx])
-			}
-			idx = ndx
-			buf = ""
 		case "default":
-			ndx := idx + 2
+			f = 2
-			stop := ","
+		default:
-			var quote bool
+			ret[f] += "," + val
-			for ; ndx < len(tf); ndx++ {
+			continue
-				if string(tf[ndx]) == stop && (stop != delim) {
+		}
-					if quote {
+		ret[f] = p[1]
-						ndx++
+	}
-					}
+	for idx := range ret {
-					break
+		if ret[idx][0] == '\'' {
-				}
+			ret[idx] = ret[idx][1:]
-				if string(tf[ndx]) == "'" {
+		}
-					stop = "'"
+		if ret[idx][len(ret[idx])-1] == '\'' {
-					quote = true
+			ret[idx] = ret[idx][:len(ret[idx])-1]
-					continue
-				}
-				def += string(tf[ndx])
-			}
-			idx = ndx
-			buf = ""
 		}
 	}
-	return name, desc, def
+	return ret[0], ret[1], ret[2]
 }