update dump args

Merge pull request 'update go tools' (#11 ) from tools into master
Reviewed-on: #11
2026-01-05 14:21:00 +03:00 · 2025-12-27 21:42:54 +03:00 · 2025-12-27 21:41:14 +03:00 · 2025-12-27 20:16:31 +03:00 · 2025-12-27 20:15:09 +03:00 · 2025-12-27 20:01:51 +03:00
25 changed files with 210 additions and 651 deletions
--- a/.gitea/workflows/example.yml
+++ b/.gitea/workflows/example.yml
@@ -0,0 +1,34 @@
+name: Go Action 
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    paths:
+      - 'example/**'
+
+jobs:
+  goaction:
+    runs-on: ubuntu-latest # Use a Gitea Actions runner label
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4 # Action to clone the repo
+
+      - name: Set up Go
+        uses: actions/setup-go@v5 # Action to install a specific Go version
+        with:
+          go-version: '1.25.5' # Specify your required Go version
+
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v8 # Use the golangci-lint action
+        with:
+          version: v2.7.2 # Specify the linter version
+          # Optional: additional arguments
+          args: --verbose
+          working-directory: example
+
+      - name: Run go test
+        run: go test ./...
+        working-directory: example
+
--- a/.gitea/workflows/goaction.yml
+++ b/.gitea/workflows/goaction.yml
@@ -5,8 +5,8 @@ on:
    branches:
      - master
  pull_request:
-
-
+    paths-ignore:
+      - 'example/**'

 jobs:
  goaction:
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
 # Console

-
-[![Build Status](https://drone.gitoa.ru/api/badges/go-4devs/console/status.svg)](https://drone.gitoa.ru/go-4devs/console)
+![Build Status](https://gitoa.ru/go-4devs/console/actions/workflows/goaction.yml/badge.svg)
 [![Go Report Card](https://goreportcard.com/badge/gitoa.ru/go-4devs/console)](https://goreportcard.com/report/gitoa.ru/go-4devs/console)
 [![GoDoc](https://godoc.org/gitoa.ru/go-4devs/console?status.svg)](http://godoc.org/gitoa.ru/go-4devs/console)

@@ -17,14 +16,14 @@ import (
 	"context"

 	"gitoa.ru/go-4devs/console"
-	"gitoa.ru/go-4devs/console/input"
 	"gitoa.ru/go-4devs/console/output"
+	"gitoa.ru/go-4devs/config"
 )

 func CreateUser() *console.Command {
 	return &console.Command{
 		Name: "app:create-user",
-		Execute: func(ctx context.Context, in input.Input, out output.Output) error {
+		Execute: func(ctx context.Context, in config.Provider, out output.Output) error {
 			return nil
 		},
 	}
@@ -49,12 +48,14 @@ func CreateUser() *console.Command {
 func CreateUser(required bool) *console.Command {
 	return &console.Command{
        //....
-		Configure: func(ctx context.Context, cfg *input.Definition) error {
-			var opts []func(*input.Argument)
+		Configure: func(ctx context.Context, cfg config.Definition) error {
+			var opts []func(*arg.Option)
 			if required {
-				opts = append(opts, argument.Required)
+				opts = append(opts, arg.Required)
 			}
-			cfg.SetArgument("password", "User password", opts...)
+			cfg.Add(
+					arg.String("password", "User password", opts...)
+				)

 			return nil
 		},
@@ -98,7 +99,7 @@ The Execute field has access to the output stream to write messages to the conso
 func CreateUser(required bool) *console.Command {
 	return &console.Command{
        // ....
-		Execute: func(ctx context.Context, in input.Input, out output.Output) error {
+		Execute: func(ctx context.Context, in config.Provider, out output.Output) error {
 			// outputs a message followed by a "\n"
 			out.Println(ctx, "User Creator")
 			out.Println(ctx, "Whoa!")
@@ -128,21 +129,23 @@ Use input options or arguments to pass information to the command:
 ```go
 func CreateUser(required bool) *console.Command {
 	return &console.Command{
-		Configure: func(ctx context.Context, cfg *input.Definition) error {
+		Configure: func(ctx context.Context, cfg config.Definition) error {
 			var opts []func(*input.Argument)
 			if required {
 				opts = append(opts, argument.Required)
 			}
-			cfg.
-				SetArgument("username", "The username of the user.", argument.Required).
-				SetArgument("password", "User password", opts...)
+			cfg.Add(
+				arg.String("username", "The username of the user.", arg.Required),
+				arg.String("password", "User password", opts...),
+			)

 			return nil
 		},
-		Execute: func(ctx context.Context, in input.Input, out output.Output) error {
+		Execute: func(ctx context.Context, in config.Provider, out output.Output) error {
 			// outputs a message followed by a "\n"
+			username, _ := in.Value(ctx, "username")
 			out.Println(ctx, "User Creator")
-			out.Println(ctx, "Username: ", in.Argument(ctx, "username").String())
+			out.Println(ctx, "Username: ", username.String())

 			return nil
 		},
@@ -170,14 +173,14 @@ import (

 	"gitoa.ru/go-4devs/console"
 	"gitoa.ru/go-4devs/console/example/pkg/command"
-	"gitoa.ru/go-4devs/console/input/array"
+	"gitoa.ru/go-4devs/config/provider/memory"
 	"gitoa.ru/go-4devs/console/output"
 )

 func TestCreateUser(t *testing.T) {
 	ctx := context.Background()
-	in := input.Array{}
-    in.SetArgument("username","andrey")
+	in := memory.Map{}
+    in.Set("andrey","username")
 	buf := bytes.Buffer{}
 	out := output.Buffer(&buf)

--- a/app.go
+++ b/app.go
@@ -28,7 +28,7 @@ func WithInput(in config.BindProvider) func(*App) {

 // WithSkipArgs sets how many arguments are passed. For example, you don't need to pass the name of a single command.
 func WithSkipArgs(l int) func(*App) {
-	return WithInput(chain.New(arg.New(arg.WithSkip(l)), &memory.Default{}))
+	return WithInput(chain.New(arg.New(arg.WithArgs(os.Args[resolveSkip(l):])), &memory.Default{}))
 }

 // WithExit sets exit callback by default os.Exit.
@@ -43,7 +43,7 @@ func New(opts ...func(*App)) *App {
 	app := &App{
 		out:  output.Stdout(),
 		exit: os.Exit,
-		in:   chain.New(arg.New(arg.WithSkip(0)), &memory.Default{}),
+		in:   chain.New(arg.New(arg.WithArgs(os.Args[resolveSkip(0):])), &memory.Default{}),
 	}

 	for _, opt := range opts {
@@ -125,3 +125,20 @@ func (a *App) list(ctx context.Context) error {
 func (a *App) printError(ctx context.Context, err error) {
 	ansi(ctx, a.in, a.out).Println(ctx, "<error>\n\n  ", err, "\n</error>")
 }
+
+func resolveSkip(in int) int {
+	res := 2
+
+	switch {
+	case in > 0 && len(os.Args) > in:
+		res = in
+	case in > 0:
+		res = len(os.Args)
+	case len(os.Args) == 1:
+		res = 1
+	case len(os.Args) > 1 && os.Args[1][0] == '-':
+		res = 1
+	}
+
+	return res
+}
--- a/app_test.go
+++ b/app_test.go
@@ -30,21 +30,21 @@ func ExampleNew_help() {
 	//   test:command [options] [--] [<test_argument>]
 	//
 	// Arguments:
-	//   test_argument                                        test argument
+	//   test_argument                                      test argument
 	//
 	// Options:
-	//       --string[=STRING]                                  array string (multiple values allowed)
-	//       --group-bool                                       bool
-	//       --group-test-string[=GROUP-TEST-STRING]            test group string [default: group string default value]
-	//       --log-{service}-level[=LOG-{SERVICE}-LEVEL]        service level [default: debug]
-	//       --bool                                             test bool option
-	//       --duration[=DURATION]                              test duration with default [default: 1s]
-	//       --ansi                                             Do not ask any interactive question
-	//   -V, --version                                          Display this application version
-	//   -h, --help                                             Display this help message
-	//   -v, --verbose                                          Increase the verbosity of messages: -v for info output, -vv for debug and -vvv for trace (multiple values allowed)
-	//   -q, --quiet                                            Do not output any message
-	//       --no-ansi                                          Disable ANSI output
+	//       --string[=STRING]                              array string  (multiple values allowed)
+	//       --group-bool                                   bool
+	//       --group-test-string[=GROUP-TEST-STRING]        test group string [default:group string default value]
+	//       --log-{service}-level[=LOG-{SERVICE}-LEVEL]    service level [default:debug]
+	//       --bool                                         test bool option
+	//       --duration[=DURATION]                          test duration with default
+	//       --ansi                                         Do not ask any interactive question
+	//   -V, --version                                      Display this application version
+	//   -h, --help                                         Display this help message
+	//   -v, --verbose                                      Increase the verbosity of messages: -v for info output, -vv for debug and -vvv for trace  (multiple values allowed)
+	//   -q, --quiet                                        Do not output any message
+	//       --no-ansi                                      Disable ANSI output
 }

 func ExampleNew_list() {
@@ -81,7 +81,7 @@ func ExampleNew_list() {
 	//       --ansi     Do not ask any interactive question
 	//   -V, --version  Display this application version
 	//   -h, --help     Display this help message
-	//   -v, --verbose  Increase the verbosity of messages: -v for info output, -vv for debug and -vvv for trace (multiple values allowed)
+	//   -v, --verbose  Increase the verbosity of messages: -v for info output, -vv for debug and -vvv for trace  (multiple values allowed)
 	//   -q, --quiet    Do not output any message
 	//
 	// Available commands:
--- a/example/bin/console
+++ b/example/bin/console
--- a/example/cmd/cancel/main.go
+++ b/example/cmd/cancel/main.go
@@ -21,5 +21,6 @@ func main() {
 		<-ch
 		cancel()
 	}()
+
 	console.Execute(ctx, command.Long())
 }
--- a/example/cmd/config/main.go
+++ b/example/cmd/config/main.go
@@ -3,15 +3,12 @@ package main
 import (
 	"context"

-	"gitoa.ru/go-4devs/config"
+	"gitoa.ru/go-4devs/config/provider/arg"
+	"gitoa.ru/go-4devs/config/provider/chain"
 	"gitoa.ru/go-4devs/config/provider/env"
+	"gitoa.ru/go-4devs/config/provider/memory"
 	"gitoa.ru/go-4devs/console"
 	"gitoa.ru/go-4devs/console/example/pkg/command"
-	"gitoa.ru/go-4devs/console/input/cfg"
-	"gitoa.ru/go-4devs/console/input/key"
-	"gitoa.ru/go-4devs/console/input/provider/argv"
-	"gitoa.ru/go-4devs/console/input/provider/chain"
-	"gitoa.ru/go-4devs/console/input/provider/memory"
 )

 const (
@@ -22,17 +19,11 @@ const (
 // FDEVS_CONSOLE_CAT=env FDEVS_CONSOLE_HIDDEN=2022-09-18T23:07:49+03:00 go run cmd/config/main.go fdevs:console:arg -b tmp.
 // FDEVS_CONSOLE_CAT=env go run cmd/config/main.go fdevs:console:arg --hidden=2022-09-18T23:07:49+03:00 -b tmp.
 func main() {
-	env := config.New(Namespace, AppName, []config.Provider{
-		env.New(),
-	})
-
 	console.
 		New(console.WithInput(
 			chain.New(
-				argv.New(0),
-				cfg.New(func(ctx context.Context, name key.Key) (config.Value, error) {
-					return env.Value(ctx, name.String())
-				}),
+				arg.New(arg.WithSkip(0)),
+				env.New(Namespace, AppName),
 				&memory.Default{},
 			),
 		)).
--- a/example/go.mod
+++ b/example/go.mod
@@ -1,15 +1,10 @@
 module gitoa.ru/go-4devs/console/example

-go 1.22
+go 1.23

 toolchain go1.24.1

-replace gitoa.ru/go-4devs/console => ../
-
-replace gitoa.ru/go-4devs/console/input/cfg => ../input/cfg
-
 require (
-	gitoa.ru/go-4devs/config v0.0.0-20210427173104-3ba6b4c71578
-	gitoa.ru/go-4devs/console v0.1.0
-	gitoa.ru/go-4devs/console/input/cfg v0.0.1
+	gitoa.ru/go-4devs/config v0.0.7
+	gitoa.ru/go-4devs/console v0.2.0
 )
--- a/example/go.sum
+++ b/example/go.sum
@@ -1,300 +1,4 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/aws/aws-sdk-go v1.25.37/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.1.0 h1:kq/SbG2BCKLkDKkjQf5OWwKWUKj1lgs3lFI4PxnR5lg=
-github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
-github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-ldap/ldap/v3 v3.1.3/go.mod h1:3rbOH3jRS2u6jg2rJnKAMLE/xQyCKIveG2Sa/Cohzb8=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/go-test/deep v1.0.2-0.20181118220953-042da051cf31/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
-github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls=
-github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
-github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
-github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw=
-github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1 h1:dH3aiDG9Jvb5r5+bYHsikaOUIpcM0xvgMXVoDkXMzJM=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI=
-github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
-github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-kms-wrapping/entropy v0.1.0/go.mod h1:d1g9WGtAunDNpek8jUIEJnBlbgKS1N2Q61QkHiZyR1g=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0 h1:B9UzwGQJehnUY1yNrnwREHc3fGbC2xefo8g4TbElacI=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-retryablehttp v0.6.6 h1:HJunrbHTDDbBb/ay4kxa1n+dLmttUlnP3V9oNE4hmsM=
-github.com/hashicorp/go-retryablehttp v0.6.6/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY=
-github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-sockaddr v1.0.2 h1:ztczhD1jLxIRjVejw8gFomI1BQZOe2WoVOu0SyteCQc=
-github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/vault/api v1.1.0 h1:QcxC7FuqEl0sZaIjcXB/kNEeBa0DH5z57qbWBvZwLC4=
-github.com/hashicorp/vault/api v1.1.0/go.mod h1:R3Umvhlxi2TN7Ex2hzOowyeNb+SfbVWI973N+ctaFMk=
-github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267 h1:e1ok06zGrWJW91rzRroyl5nRNqraaBe4d5hiKcVZuHM=
-github.com/hashicorp/vault/sdk v0.1.14-0.20200519221838-e0cfd64bc267/go.mod h1:WX57W2PwkrOPQ6rVQk+dy5/htHIaB4aBM70EwKThu10=
-github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
-github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
-github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pelletier/go-toml v1.9.0/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.5.1/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
-github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
-github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/tidwall/gjson v1.7.5 h1:zmAN/xmX7OtpAkv4Ovfso60r/BiCi5IErCDYGNJu+uc=
-github.com/tidwall/gjson v1.7.5/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/match v1.0.3 h1:FQUVvBImDutD8wJLN6c5eMzWtjgONK9MwIBCOrUJKeE=
-github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
-github.com/tidwall/pretty v1.1.0 h1:K3hMW5epkdAVwibsQEfR/7Zj0Qgt4DxtNumTq/VloO8=
-github.com/tidwall/pretty v1.1.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-gitoa.ru/go-4devs/config v0.0.0-20210427173104-3ba6b4c71578 h1:VecgkaFAv+eoGOfSbRrnH2pRHzZa9gF98x71jYuvqFo=
-gitoa.ru/go-4devs/config v0.0.0-20210427173104-3ba6b4c71578/go.mod h1:gpSbYuLQRK2PXgA1AQc1Pwf56pAPpPlXbQ8fLg8vwPk=
-go.etcd.io/etcd/api/v3 v3.5.0-alpha.0 h1:+e5nrluATIy3GP53znpkHMFzPTHGYyzvJGFCbuI6ZLc=
-go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw=
-go.etcd.io/etcd/client/v3 v3.5.0-alpha.0 h1:dr1EOILak2pu4Nf5XbRIOCNIBjcz6UmkQd7hHRXwxaM=
-go.etcd.io/etcd/client/v3 v3.5.0-alpha.0/go.mod h1:wKt7jgDgf/OfKiYmCq5WFGxOFAkVMLxiiXgLDFhECr8=
-go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0 h1:3yLUEC0nFCxw/RArImOyRUI4OAFbg4PFpBbAhSNzKNY=
-go.etcd.io/etcd/pkg/v3 v3.5.0-alpha.0/go.mod h1:tV31atvwzcybuqejDoY3oaNRTtlD2l/Ot78Pc9w7DMY=
-go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
-go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
-go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
-go.uber.org/zap v1.16.0 h1:uFRZXykJGK9lLY4HtgSw44DnIcAM+kRBP7x5m+NpAOM=
-go.uber.org/zap v1.16.0/go.mod h1:MA8QOfq0BHJwdXa996Y4dYkAqRKB8/1K1QMMZVaNZjQ=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529 h1:iMGN4xG0cnqj3t+zOM8wUB0BiPKHEwSxEZCvzcbZuvk=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM=
-golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 h1:bNEHhJCnrwMKNMmOx3yAynp5vs5/gRy+XWFtZFu7NBM=
-golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1 h1:NusfzzA6yGQ+ua51ck7E3omNUX/JuqbFSaRGqU8CcLI=
-golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884 h1:fiNLklpBwWK1mth30Hlwk+fcdBmIALlgF5iy77O37Ig=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.32.0 h1:zWTV+LMdc3kaiJMSTOFz2UgSBgx8RNQoTGiZu3fR9S0=
-google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU=
-gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/square/go-jose.v2 v2.5.1 h1:7odma5RETjNHWJnR32wx8t+Io4djHE1PqxCFx3iiZ2w=
-gopkg.in/square/go-jose.v2 v2.5.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
+gitoa.ru/go-4devs/config v0.0.7 h1:8q6axRNLgXE5dYQd8Jbh9j+STqevbibVyvwrtsuHpZk=
+gitoa.ru/go-4devs/config v0.0.7/go.mod h1:UINWnObZA0nLiJro+TtavUBBvN0cSt17aRHOk20pP74=
+gitoa.ru/go-4devs/console v0.2.0 h1:6lsbArs99GA8vGdnwNDThZNKjFNctNtTlSCUjhgwIpU=
+gitoa.ru/go-4devs/console v0.2.0/go.mod h1:xi4Svw7T+lylckAQiJQS/2qwDwF4YbIanlhcbQrBAiI=
--- a/example/pkg/command/args.go
+++ b/example/pkg/command/args.go
@@ -4,10 +4,9 @@ import (
 	"context"
 	"time"

+	"gitoa.ru/go-4devs/config"
+	"gitoa.ru/go-4devs/config/definition/option"
 	"gitoa.ru/go-4devs/console"
-	"gitoa.ru/go-4devs/console/input"
-	"gitoa.ru/go-4devs/console/input/key"
-	"gitoa.ru/go-4devs/console/input/option"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -15,8 +14,8 @@ func Args() *console.Command {
 	return &console.Command{
 		Name:        "fdevs:console:arg",
 		Description: "Understanding how Console Arguments and Options Are Handled",
-		Configure: func(ctx context.Context, def *input.Definition) error {
-			def.SetOptions(
+		Configure: func(_ context.Context, def config.Definition) error {
+			def.Add(
 				option.Bool("foo", "foo option", option.Short('f')),
 				option.String("bar", "required bar option", option.Required, option.Short('b')),
 				option.String("cat", "cat option", option.Short('c')),
@@ -26,12 +25,12 @@ func Args() *console.Command {

 			return nil
 		},
-		Execute: func(ctx context.Context, in input.Input, out output.Output) error {
-			out.Println(ctx, "foo: <info>", in.Value(ctx, key.Dash("foo")).Bool(), "</info>")
-			out.Println(ctx, "bar: <info>", in.Value(ctx, key.Dash("bar")).String(), "</info>")
-			out.Println(ctx, "cat: <info>", in.Value(ctx, key.Dash("cat")).String(), "</info>")
-			out.Println(ctx, "time: <info>", in.Value(ctx, key.Dash("time")).Time().Format(time.RFC3339), "</info>")
-			out.Println(ctx, "hidden: <info>", in.Value(ctx, key.Dash("hidden")).Time().Format(time.RFC3339), "</info>")
+		Execute: func(ctx context.Context, in config.Provider, out output.Output) error {
+			out.Println(ctx, "foo: <info>", console.ReadValue(ctx, in, "foo").Bool(), "</info>")
+			out.Println(ctx, "bar: <info>", console.ReadValue(ctx, in, "bar").String(), "</info>")
+			out.Println(ctx, "cat: <info>", console.ReadValue(ctx, in, "cat").String(), "</info>")
+			out.Println(ctx, "time: <info>", console.ReadValue(ctx, in, "time").Time().Format(time.RFC3339), "</info>")
+			out.Println(ctx, "hidden: <info>", console.ReadValue(ctx, in, "hidden").Time().Format(time.RFC3339), "</info>")

 			return nil
 		},
--- a/example/pkg/command/create_user.go
+++ b/example/pkg/command/create_user.go
@@ -3,11 +3,11 @@ package command
 import (
 	"context"

+	"gitoa.ru/go-4devs/config"
+	"gitoa.ru/go-4devs/config/definition/option"
+	"gitoa.ru/go-4devs/config/param"
+	argument "gitoa.ru/go-4devs/config/provider/arg"
 	"gitoa.ru/go-4devs/console"
-	"gitoa.ru/go-4devs/console/input"
-	"gitoa.ru/go-4devs/console/input/argument"
-	"gitoa.ru/go-4devs/console/input/key"
-	"gitoa.ru/go-4devs/console/input/param"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -16,23 +16,24 @@ func CreateUser(required bool) *console.Command {
 		Name:        "app:create-user",
 		Description: "Creates a new user.",
 		Help:        "This command allows you to create a user...",
-		Configure: func(ctx context.Context, cfg *input.Definition) error {
+		Configure: func(_ context.Context, cfg config.Definition) error {
 			var opts []param.Option
 			if required {
-				opts = append(opts, argument.Required)
+				opts = append(opts, option.Required)
 			}
+
 			cfg.
-				SetOptions(
-					argument.String("username", "The username of the user.", argument.Required),
+				Add(
+					argument.String("username", "The username of the user.", option.Required),
 					argument.String("password", "User password", opts...),
 				)

 			return nil
 		},
-		Execute: func(ctx context.Context, in input.Input, out output.Output) error {
+		Execute: func(ctx context.Context, in config.Provider, out output.Output) error {
 			// outputs a message followed by a "\n"
 			out.Println(ctx, "User Creator")
-			out.Println(ctx, "Username: ", in.Value(ctx, key.Dash("username")).String())
+			out.Println(ctx, "Username: ", console.ReadValue(ctx, in, "username").String())

 			return nil
 		},
--- a/example/pkg/command/create_user_test.go
+++ b/example/pkg/command/create_user_test.go
@@ -5,10 +5,9 @@ import (
 	"context"
 	"testing"

+	"gitoa.ru/go-4devs/config/provider/memory"
 	"gitoa.ru/go-4devs/console"
 	"gitoa.ru/go-4devs/console/example/pkg/command"
-	"gitoa.ru/go-4devs/console/input/key"
-	"gitoa.ru/go-4devs/console/input/provider/memory"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -19,7 +18,7 @@ func TestCreateUser(t *testing.T) {
 	buf := bytes.Buffer{}
 	out := output.Buffer(&buf)
 	in := &memory.Map{}
-	in.SetOption(key.Dash("username"), "andrey")
+	in.SetOption("andrey", "username")

 	err := console.Run(ctx, command.CreateUser(false), in, out)
 	if err != nil {
--- a/example/pkg/command/hello.go
+++ b/example/pkg/command/hello.go
@@ -3,11 +3,10 @@ package command
 import (
 	"context"

+	"gitoa.ru/go-4devs/config"
+	"gitoa.ru/go-4devs/config/definition/option"
+	"gitoa.ru/go-4devs/config/provider/arg"
 	"gitoa.ru/go-4devs/console"
-	"gitoa.ru/go-4devs/console/input"
-	"gitoa.ru/go-4devs/console/input/argument"
-	"gitoa.ru/go-4devs/console/input/key"
-	"gitoa.ru/go-4devs/console/input/option"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -15,22 +14,22 @@ func Hello() *console.Command {
 	return &console.Command{
 		Name:        "fdevs:console:hello",
 		Description: "example hello command",
-		Execute: func(ctx context.Context, in input.Input, out output.Output) error {
-			name := in.Value(ctx, key.Dash("name")).String()
+		Execute: func(ctx context.Context, in config.Provider, out output.Output) error {
+			name := console.ReadValue(ctx, in, "name").String()
 			out.Println(ctx, "<error>Hello</error> <info>", name, "</info>")

 			out.Info(ctx, "same trace info\n")
 			out.Debug(ctx, "have some question?\n")
 			out.Trace(ctx, "this message shows with -vvv\n")

-			pass := in.Value(ctx, key.Dash("pass")).String()
+			pass := console.ReadValue(ctx, in, "pass").String()
 			out.Println(ctx, "hidden option pass <info>", pass, "</info>")

 			return nil
 		},
-		Configure: func(_ context.Context, def *input.Definition) error {
-			def.SetOptions(
-				argument.String("name", "Same name", argument.Default("World")),
+		Configure: func(_ context.Context, def config.Definition) error {
+			def.Add(
+				arg.String("name", "Same name", arg.Default("World")),
 				option.String("pass", "password", option.Hidden),
 			)

--- a/example/pkg/command/hidden.go
+++ b/example/pkg/command/hidden.go
@@ -3,8 +3,8 @@ package command
 import (
 	"context"

+	"gitoa.ru/go-4devs/config"
 	"gitoa.ru/go-4devs/console"
-	"gitoa.ru/go-4devs/console/input"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -13,7 +13,7 @@ func Hidden() *console.Command {
 		Name:        "fdevs:console:hidden",
 		Description: "hidden command exmale",
 		Hidden:      true,
-		Execute: func(ctx context.Context, _ input.Input, out output.Output) error {
+		Execute: func(ctx context.Context, _ config.Provider, out output.Output) error {
 			out.Println(ctx, "<info> call hidden command</info>")

 			return nil
--- a/example/pkg/command/long.go
+++ b/example/pkg/command/long.go
@@ -4,12 +4,11 @@ import (
 	"context"
 	"time"

+	"gitoa.ru/go-4devs/config"
+	"gitoa.ru/go-4devs/config/definition/option"
+	"gitoa.ru/go-4devs/config/validator"
+	"gitoa.ru/go-4devs/config/value"
 	"gitoa.ru/go-4devs/console"
-	"gitoa.ru/go-4devs/console/input"
-	"gitoa.ru/go-4devs/console/input/key"
-	"gitoa.ru/go-4devs/console/input/option"
-	"gitoa.ru/go-4devs/console/input/validator"
-	"gitoa.ru/go-4devs/console/input/value"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -19,11 +18,13 @@ const defaultTimeout = time.Second * 30
 func Long() *console.Command {
 	return &console.Command{
 		Name: "fdevs:command:long",
-		Execute: func(ctx context.Context, in input.Input, out output.Output) error {
-			timeout := in.Value(ctx, key.Dash("timeout")).Duration()
+		Execute: func(ctx context.Context, in config.Provider, out output.Output) error {
+			timeout := console.ReadValue(ctx, in, "timeout").Duration()
 			timer := time.NewTimer(timeout)
+
 			ticker := time.NewTicker(time.Second)
 			defer ticker.Stop()
+
 			for {
 				select {
 				case t := <-ticker.C:
@@ -39,8 +40,8 @@ func Long() *console.Command {
 				}
 			}
 		},
-		Configure: func(ctx context.Context, def *input.Definition) error {
-			def.SetOptions(option.Duration("timeout", "set duration run command",
+		Configure: func(_ context.Context, def config.Definition) error {
+			def.Add(option.Duration("timeout", "set duration run command",
 				option.Default(value.New(defaultTimeout)),
 				option.Short('t'),
 				validator.Valid(validator.NotBlank),
--- a/example/pkg/command/namespace.go
+++ b/example/pkg/command/namespace.go
@@ -3,8 +3,8 @@ package command
 import (
 	"context"

+	"gitoa.ru/go-4devs/config"
 	"gitoa.ru/go-4devs/console"
-	"gitoa.ru/go-4devs/console/input"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -12,7 +12,7 @@ func Namespace() *console.Command {
 	return &console.Command{
 		Name:        "app:start",
 		Description: "example command in other namespace",
-		Execute: func(ctx context.Context, _ input.Input, out output.Output) error {
+		Execute: func(ctx context.Context, _ config.Provider, out output.Output) error {
 			out.Println(ctx, "example command in other namespace")

 			return nil
--- a/go.mod
+++ b/go.mod
@@ -1,5 +1,13 @@
 module gitoa.ru/go-4devs/console

-go 1.23
+go 1.24.0

-require gitoa.ru/go-4devs/config v0.0.7
+require gitoa.ru/go-4devs/config v0.0.8
+
+require (
+	golang.org/x/mod v0.31.0 // indirect
+	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/tools v0.40.0 // indirect
+)
+
+tool golang.org/x/tools/cmd/stringer
--- a/go.sum
+++ b/go.sum
@@ -1,2 +1,10 @@
-gitoa.ru/go-4devs/config v0.0.7 h1:8q6axRNLgXE5dYQd8Jbh9j+STqevbibVyvwrtsuHpZk=
-gitoa.ru/go-4devs/config v0.0.7/go.mod h1:UINWnObZA0nLiJro+TtavUBBvN0cSt17aRHOk20pP74=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+gitoa.ru/go-4devs/config v0.0.8 h1:o4p8I9jWJMfiFVVKr50IqCGj1fF+8kmSPDkH0deRvn4=
+gitoa.ru/go-4devs/config v0.0.8/go.mod h1:jHKqVafFVW400LC0M4i1ifPapiI9sqpX/QTh+VMadKw=
+golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
+golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
+golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
--- a/help.go
+++ b/help.go
@@ -9,6 +9,7 @@ import (
 	"gitoa.ru/go-4devs/config"
 	"gitoa.ru/go-4devs/config/definition"
 	"gitoa.ru/go-4devs/config/definition/option"
+	"gitoa.ru/go-4devs/config/param"
 	"gitoa.ru/go-4devs/config/provider/arg"
 	"gitoa.ru/go-4devs/config/validator"
 	"gitoa.ru/go-4devs/config/value"
@@ -70,7 +71,7 @@ To display the list of available commands, please use the <info>list</info> comm
 				Name:        cmd.Name,
 				Description: cmd.Description,
 				Help:        cmd.Help,
-				Definition:  descriptor.NewDefinition(config.NewVars(def.Options()...).Variables()),
+				Options:     def.With(param.New(descriptor.TxtStyle())),
 			})
 			if derr != nil {
 				return fmt.Errorf("descriptor help:%w", derr)
--- a/list.go
+++ b/list.go
@@ -8,6 +8,7 @@ import (
 	"gitoa.ru/go-4devs/config"
 	"gitoa.ru/go-4devs/config/definition"
 	"gitoa.ru/go-4devs/config/definition/option"
+	"gitoa.ru/go-4devs/config/param"
 	"gitoa.ru/go-4devs/config/provider/arg"
 	"gitoa.ru/go-4devs/config/validator"
 	"gitoa.ru/go-4devs/config/value"
@@ -71,8 +72,8 @@ func executeList(ctx context.Context, in config.Provider, out output.Output) err

 	cmds := Commands()
 	commands := descriptor.Commands{
-		Namespace:  ns,
-		Definition: descriptor.NewDefinition(config.NewVars(definition.New(Default()...).Options()...).Variables()),
+		Namespace: ns,
+		Options:   definition.New(Default()...).With(param.New(descriptor.TxtStyle())),
 	}
 	groups := make(map[string]*descriptor.NSCommand)
 	namespaces := make([]string, 0, len(cmds))
--- a/output/descriptor/descriptor.go
+++ b/output/descriptor/descriptor.go
@@ -3,13 +3,9 @@ package descriptor
 import (
 	"context"
 	"errors"
-	"sort"
-	"strings"
 	"sync"

 	"gitoa.ru/go-4devs/config"
-	"gitoa.ru/go-4devs/config/definition/option"
-	"gitoa.ru/go-4devs/config/provider/arg"
 	"gitoa.ru/go-4devs/console/output"
 )

@@ -24,17 +20,19 @@ var (
 )

 type Command struct {
+	config.Options
+
 	Bin         string
 	Name        string
 	Description string
 	Help        string
-	Definition  Definition
 }

 type Commands struct {
-	Namespace  string
-	Definition Definition
-	Commands   []NSCommand
+	config.Options
+
+	Namespace string
+	Commands  []NSCommand
 }

 type NSCommand struct {
@@ -46,65 +44,6 @@ func (n *NSCommand) Append(name, desc string) {
 	n.Commands = append(n.Commands, ShortCommand{Name: name, Description: desc})
 }

-func NewDefinition(opts []config.Variable) Definition {
-	type data struct {
-		name string
-		pos  uint64
-		opt  config.Variable
-	}
-
-	posArgs := make([]data, 0, len(opts))
-
-	posOpt := make([]data, 0, len(opts))
-	for _, opt := range opts {
-		pos, ok := arg.ParamArgument(opt)
-		if !ok {
-			pos, _ = option.DataPosition(opt)
-			posOpt = append(posOpt, data{pos: pos, opt: opt})
-
-			continue
-		}
-
-		posArgs = append(posArgs, data{name: strings.Join(opt.Key(), "."), pos: pos, opt: opt})
-	}
-
-	sort.Slice(posArgs, func(i, j int) bool {
-		return posArgs[i].pos > posArgs[j].pos && posArgs[i].name > posArgs[j].name
-	})
-
-	sort.Slice(posOpt, func(i, j int) bool {
-		return posOpt[i].pos < posOpt[j].pos
-	})
-
-	args := make([]config.Variable, len(posArgs))
-	for idx := range posArgs {
-		args[idx] = posArgs[idx].opt
-	}
-
-	options := make([]config.Variable, len(posOpt))
-	for idx := range posOpt {
-		options[idx] = posOpt[idx].opt
-	}
-
-	return Definition{
-		options: options,
-		args:    args,
-	}
-}
-
-type Definition struct {
-	args    []config.Variable
-	options []config.Variable
-}
-
-func (d Definition) Arguments() []config.Variable {
-	return d.args
-}
-
-func (d Definition) Options() []config.Variable {
-	return d.options
-}
-
 type ShortCommand struct {
 	Name        string
 	Description string
--- a/output/descriptor/txt.go
+++ b/output/descriptor/txt.go
@@ -4,21 +4,18 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"strconv"
 	"strings"
 	"text/template"
-	"time"

 	"gitoa.ru/go-4devs/config"
 	"gitoa.ru/go-4devs/config/definition/option"
 	"gitoa.ru/go-4devs/config/param"
-	"gitoa.ru/go-4devs/config/value"
+	"gitoa.ru/go-4devs/config/provider/arg"
 	"gitoa.ru/go-4devs/console/output"
 )

 const (
 	defaultSpace  = 2
-	infoLen       = 13
 	dashDelimiter = "-"
 )

@@ -40,8 +37,8 @@ var (

 {{ end -}}
 <comment>Usage:</comment>
-  {{ .Name }} {{ synopsis .Definition }}
-{{- definition .Definition }}
+  {{ .Name }} {{ synopsis .Options }}
+{{ definition .Options }}
 {{- help . }}
 		`))

@@ -49,11 +46,24 @@ var (
 			Funcs(txtFunc).
 			Parse(`<comment>Usage:</comment>
  command [options] [arguments]
-{{- definition .Definition }}
+{{ definition .Options }}
 {{- commands .Commands -}}
 	`))
 )

+func TxtStyle() param.Option {
+	return arg.WithStyle(
+		arg.Style{
+			Start: "<comment>",
+			End:   "</comment>",
+		},
+		arg.Style{
+			Start: "<info>",
+			End:   "</info>",
+		},
+	)
+}
+
 type txt struct{}

 func (t *txt) Command(ctx context.Context, out output.Output, cmd Command) error {
@@ -82,54 +92,6 @@ func (t *txt) Commands(ctx context.Context, out output.Output, cmds Commands) er
 	return nil
 }

-func txtDefaultArray(val config.Value) string {
-	var st any
-
-	err := val.Unmarshal(&st)
-	if err != nil {
-		return ""
-	}
-
-	return fmt.Sprintf("%v", st)
-}
-
-//nolint:cyclop
-func txtDefault(val config.Value, vr config.Variable) []byte {
-	var buf bytes.Buffer
-
-	buf.WriteString("<comment> [default: ")
-
-	dataType := param.Type(vr)
-	if option.IsSlice(vr) {
-		buf.WriteString(txtDefaultArray(val))
-	} else {
-		switch dataType.(type) {
-		case int:
-			buf.WriteString(strconv.Itoa(val.Int()))
-		case int64:
-			buf.WriteString(strconv.FormatInt(val.Int64(), 10))
-		case uint:
-			buf.WriteString(strconv.FormatUint(uint64(val.Uint()), 10))
-		case uint64:
-			buf.WriteString(strconv.FormatUint(val.Uint64(), 10))
-		case float64:
-			buf.WriteString(strconv.FormatFloat(val.Float64(), 'g', -1, 64))
-		case time.Duration:
-			buf.WriteString(val.Duration().String())
-		case time.Time:
-			buf.WriteString(val.Time().Format(time.RFC3339))
-		case string:
-			buf.WriteString(val.String())
-		default:
-			buf.WriteString(fmt.Sprint(val.Any()))
-		}
-	}
-
-	buf.WriteString("]</comment>")
-
-	return buf.Bytes()
-}
-
 func txtCommands(cmds []NSCommand) string {
 	width := commandsTotalWidth(cmds)
 	showNS := len(cmds) > 1
@@ -181,95 +143,20 @@ func txtHelp(cmd Command) string {
 	return buf.String()
 }

-func txtDefinitionOption(maxLen int, opts ...config.Variable) string {
-	buf := bytes.Buffer{}
-	buf.WriteString("\n\n<comment>Options:</comment>\n")
-
-	for _, opt := range opts {
-		if option.IsHidden(opt) {
-			continue
-		}
-
-		var op bytes.Buffer
-
-		op.WriteString("  <info>")
-
-		if short, ok := option.ParamShort(opt); ok {
-			op.WriteString("-")
-			op.WriteString(short)
-			op.WriteString(", ")
-		} else {
-			op.WriteString("    ")
-		}
-
-		op.WriteString("--")
-		op.WriteString(strings.Join(opt.Key(), dashDelimiter))
-
-		if !option.IsBool(opt) {
-			if !option.IsRequired(opt) {
-				op.WriteString("[")
-			}
-
-			op.WriteString("=")
-			op.WriteString(strings.ToUpper(strings.Join(opt.Key(), dashDelimiter)))
-
-			if !option.IsRequired(opt) {
-				op.WriteString("]")
-			}
-		}
-
-		op.WriteString("</info>")
-		buf.Write(op.Bytes())
-		buf.WriteString(strings.Repeat(" ", maxLen+17-op.Len()))
-		buf.WriteString(option.DataDescription(opt))
-
-		if data, ok := option.DataDefaut(opt); ok {
-			buf.Write(txtDefault(value.New(data), opt))
-		}
-
-		if option.IsSlice(opt) {
-			buf.WriteString("<comment> (multiple values allowed)</comment>")
-		}
-
-		buf.WriteString("\n")
-	}
-
-	return buf.String()
-}
-
-func txtDefinition(def Definition) string {
-	width := totalWidth(def)
-
+func txtDefinition(options config.Options) string {
 	var buf bytes.Buffer

-	if args := def.Arguments(); len(args) > 0 {
-		buf.WriteString("\n\n<comment>Arguments:</comment>\n")
-
-		for _, arg := range args {
-			var ab bytes.Buffer
-
-			ab.WriteString("  <info>")
-			ab.WriteString(strings.Join(arg.Key(), dashDelimiter))
-			ab.WriteString("</info>")
-			ab.WriteString(strings.Repeat(" ", width+infoLen+defaultSpace-ab.Len()))
-
-			buf.Write(ab.Bytes())
-			buf.WriteString(option.DataDescription(arg))
-
-			if data, ok := option.DataDefaut(arg); ok {
-				buf.Write(txtDefault(value.New(data), arg))
-			}
-		}
-	}
-
-	if opts := def.Options(); len(opts) > 0 {
-		buf.WriteString(txtDefinitionOption(width, opts...))
+	err := arg.NewDump().Reference(&buf, options)
+	if err != nil {
+		return err.Error()
 	}

 	return buf.String()
 }

-func txtSynopsis(def Definition) string {
+func txtSynopsis(options config.Options) string {
+	def := arg.NewViews(options, nil)
+
 	var buf bytes.Buffer

 	if len(def.Options()) > 0 {
@@ -294,7 +181,7 @@ func txtSynopsis(def Definition) string {
 		}

 		buf.WriteString("<")
-		buf.WriteString(strings.Join(arg.Key(), dashDelimiter))
+		buf.WriteString(arg.Name(dashDelimiter))
 		buf.WriteString(">")

 		if option.IsSlice(arg) {
@@ -320,32 +207,3 @@ func commandsTotalWidth(cmds []NSCommand) int {

 	return width
 }
-
-//nolint:mnd
-func totalWidth(def Definition) int {
-	var width int
-
-	for _, arg := range def.Arguments() {
-		if l := len(strings.Join(arg.Key(), dashDelimiter)); l > width {
-			width = l
-		}
-	}
-
-	for _, opt := range def.Options() {
-		current := len(strings.Join(opt.Key(), dashDelimiter)) + 6
-
-		if !option.IsBool(opt) {
-			current = current*2 + 1
-		}
-
-		if _, ok := option.DataDefaut(opt); ok {
-			current += 2
-		}
-
-		if current > width {
-			width = current
-		}
-	}
-
-	return width
-}
--- a/output/verbosity/verbosity.go
+++ b/output/verbosity/verbosity.go
@@ -1,6 +1,6 @@
 package verbosity

-//go:generate stringer -type=Verbosity -linecomment
+//go:generate go tool stringer -type=Verbosity -linecomment

 type Verbosity int

--- a/output/verbosity/verbosity_string.go
+++ b/output/verbosity/verbosity_string.go
@@ -20,9 +20,9 @@ const _Verbosity_name = "quietnorminfodebugtrace"
 var _Verbosity_index = [...]uint8{0, 5, 9, 13, 18, 23}

 func (i Verbosity) String() string {
-	i -= -1
-	if i < 0 || i >= Verbosity(len(_Verbosity_index)-1) {
-		return "Verbosity(" + strconv.FormatInt(int64(i+-1), 10) + ")"
+	idx := int(i) - -1
+	if i < -1 || idx >= len(_Verbosity_index)-1 {
+		return "Verbosity(" + strconv.FormatInt(int64(i), 10) + ")"
 	}
-	return _Verbosity_name[_Verbosity_index[i]:_Verbosity_index[i+1]]
+	return _Verbosity_name[_Verbosity_index[idx]:_Verbosity_index[idx+1]]
 }
Author	SHA1	Message	Date
andrey	60d879caf2	update dump args All checks were successful Go Action / goaction (pull_request) Successful in 2m3s Details	2026-01-05 14:21:00 +03:00
andrey	e48a9b29d8	Merge pull request 'update go tools' (#11 ) from tools into master All checks were successful Go Action / goaction (push) Successful in 20s Details Reviewed-on: #11	2025-12-27 21:42:54 +03:00
andrey	71f774aa5a	update go tools All checks were successful Go Action / goaction (pull_request) Successful in 52s Details	2025-12-27 21:41:14 +03:00
andrey	c6a6300edf	Merge pull request 'update readme' (#10 ) from readme into master All checks were successful Go Action / goaction (push) Successful in 18s Details Reviewed-on: #10	2025-12-27 20:16:31 +03:00
andrey	c9b4f4cfd0	update readme All checks were successful Go Action / goaction (pull_request) Successful in 18s Details	2025-12-27 20:15:09 +03:00
andrey	d2ef3f7d0a	update example (#8 ) All checks were successful Go Action / goaction (push) Successful in 20s Details Reviewed-on: #8	2025-12-27 20:01:51 +03:00