.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/autoapprove.yml

@@ -0,0 +1,20 @@
+name: "autoapprove"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  autoapprove:
+    runs-on: ubuntu-latest
+    steps:
+      - name: approve
+        uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'vtolstov' || github.actor == 'dependabot[bot]'
+        id: approve
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/automerge.yml

@@ -0,0 +1,21 @@
+name: "automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'vtolstov'
+    steps:
+      - name: merge
+        id: merge
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: build
+on:
+ push:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      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@v3
+      - name: lint
+        uses: golangci/golangci-lint-action@v3.4.0
+        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,78 @@
+# 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, v3 ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master, v3 ]
+  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
+      uses: actions/checkout@v3
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    # Initializes the CodeQL tools for scanning.
+    - name: init
+      uses: github/codeql-action/init@v2
+      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@v2
+
+    # ℹ️ 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: analyze
+      uses: github/codeql-action/analyze@v2

.github/workflows/dependabot-automerge.yml

@@ -0,0 +1,27 @@
+name: "dependabot-automerge"
+
+on:
+  pull_request_target:
+    types: [assigned, opened, synchronize, reopened]
+
+permissions:
+  pull-requests: write
+  contents: write
+
+jobs:
+  automerge:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v1.3.6
+        with:
+          github-token: "${{ secrets.TOKEN }}"
+      - name: merge
+        id: merge
+        if: ${{contains(steps.metadata.outputs.dependency-names, 'go.unistack.org')}}
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GITHUB_TOKEN: ${{secrets.TOKEN}}

.github/workflows/pr.yml

@@ -0,0 +1,47 @@
+name: prbuild
+on:
+  pull_request:
+    branches:
+    - master
+    - v3
+jobs:
+  test:
+    name: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: setup
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.17
+    - name: checkout
+      uses: actions/checkout@v3
+    - name: cache
+      uses: actions/cache@v3
+      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@v3
+      - name: lint
+        uses: golangci/golangci-lint-action@v3.4.0
+        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

event.go

@@ -4,37 +4,26 @@ import (
 	"context"
 	"errors"
 	"net"
-	"time"
+	"sync/atomic"
 
 	goredis "github.com/redis/go-redis/v9"
-	"go.unistack.org/micro/v3/store"
 )
 
 type eventHook struct {
-	s *Store
+	connected *atomic.Bool
 }
 
 var _ goredis.Hook = (*eventHook)(nil)
 
-func newEventHook(s *Store) *eventHook {
+func newEventHook(connected *atomic.Bool) *eventHook {
-	return &eventHook{s: s}
+	return &eventHook{connected: connected}
 }
 
 func (h *eventHook) DialHook(hook goredis.DialHook) goredis.DialHook {
 	return func(ctx context.Context, network, addr string) (net.Conn, error) {
 		conn, err := hook(ctx, network, addr)
-		if err != nil {
+		if err != nil && !isRedisError(err) {
-			if !isRedisError(err) {
+			h.connected.Store(false)
-				if h.s.connected.CompareAndSwap(1, 0) {
-					h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeDisconnect})
-				}
-			} else {
-				h.s.connected.Store(1)
-			}
-		} else {
-			if h.s.connected.CompareAndSwap(0, 1) {
-				h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeConnect})
-			}
 		}
 		return conn, err
 	}
@@ -43,18 +32,8 @@ func (h *eventHook) DialHook(hook goredis.DialHook) goredis.DialHook {
 func (h *eventHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook {
 	return func(ctx context.Context, cmd goredis.Cmder) error {
 		err := hook(ctx, cmd)
-		if err != nil {
+		if err != nil && !isRedisError(err) {
-			if !isRedisError(err) {
+			h.connected.Store(false)
-				if h.s.connected.CompareAndSwap(1, 0) {
-					h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeDisconnect})
-				}
-			} else {
-				h.s.connected.Store(1)
-			}
-		} else {
-			if h.s.connected.CompareAndSwap(0, 1) {
-				h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeConnect})
-			}
 		}
 		return err
 	}
@@ -63,18 +42,8 @@ func (h *eventHook) ProcessHook(hook goredis.ProcessHook) goredis.ProcessHook {
 func (h *eventHook) ProcessPipelineHook(hook goredis.ProcessPipelineHook) goredis.ProcessPipelineHook {
 	return func(ctx context.Context, cmds []goredis.Cmder) error {
 		err := hook(ctx, cmds)
-		if err != nil {
+		if err != nil && !isRedisError(err) {
-			if !isRedisError(err) {
+			h.connected.Store(false)
-				if h.s.connected.CompareAndSwap(1, 0) {
-					h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeDisconnect})
-				}
-			} else {
-				h.s.connected.Store(1)
-			}
-		} else {
-			if h.s.connected.CompareAndSwap(0, 1) {
-				h.s.sendEvent(&event{ts: time.Now(), err: err, t: store.EventTypeConnect})
-			}
 		}
 		return err
 	}

go.mod

@@ -7,7 +7,7 @@ toolchain go1.22.4
 require (
 	github.com/redis/go-redis/extra/rediscmd/v9 v9.7.0
 	github.com/redis/go-redis/v9 v9.7.0
-	go.unistack.org/micro/v3 v3.10.108
+	go.unistack.org/micro/v3 v3.10.106
 )
 
 require (

go.sum

@@ -14,7 +14,7 @@ github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa
 github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw=
 go.unistack.org/micro-proto/v3 v3.4.1 h1:UTjLSRz2YZuaHk9iSlVqqsA50JQNAEK2ZFboGqtEa9Q=
 go.unistack.org/micro-proto/v3 v3.4.1/go.mod h1:okx/cnOhzuCX0ggl/vToatbCupi0O44diiiLLsZ93Zo=
-go.unistack.org/micro/v3 v3.10.108 h1:3L7SkilMVLtH8y3pQIPtr3jjQYrf0AMv1oAkoL3nFkE=
+go.unistack.org/micro/v3 v3.10.106 h1:ya4+n58l4PImtrIKrJi1GgkUuJ1gmzLYa9WKYI1JFLs=
-go.unistack.org/micro/v3 v3.10.108/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
+go.unistack.org/micro/v3 v3.10.106/go.mod h1:YzMldzHN9Ei+zy5t/Psu7RUWDZwUfrNYiStSQtTz90g=
 google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
 google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

redis.go

@@ -5,22 +5,19 @@ import (
 	"errors"
 	"reflect"
 	"strings"
-	"sync"
 	"sync/atomic"
 	"time"
 
 	goredis "github.com/redis/go-redis/v9"
 	"go.unistack.org/micro/v3/semconv"
 	"go.unistack.org/micro/v3/store"
-	"go.unistack.org/micro/v3/util/id"
 	pool "go.unistack.org/micro/v3/util/xpool"
 )
 
 var (
-	_                       store.Store = (*Store)(nil)
+	DefaultPathSeparator = "/"
-	_                       store.Event = (*event)(nil)
+
-	sendEventTime                       = 10 * time.Millisecond
+	DefaultUniversalOptions = &goredis.UniversalOptions{
-	DefaultUniversalOptions             = &goredis.UniversalOptions{
 		Username:        "",
 		Password:        "", // no password set
 		MaxRetries:      2,
@@ -61,26 +58,12 @@ var (
 type Store struct {
 	cli       goredis.UniversalClient
 	pool      *pool.StringsPool
-	connected *atomic.Uint32
+	connected *atomic.Bool
 	opts      store.Options
-	watchers  map[string]*watcher
-	mu        sync.RWMutex
-}
-
-func (r *Store) Live() bool {
-	return r.connected.Load() == 1
-}
-
-func (r *Store) Ready() bool {
-	return r.connected.Load() == 1
-}
-
-func (r *Store) Health() bool {
-	return r.connected.Load() == 1
 }
 
 func (r *Store) Connect(ctx context.Context) error {
-	if r.connected.Load() == 1 {
+	if r.connected.Load() {
 		return nil
 	}
 	if r.cli == nil {
@@ -93,12 +76,16 @@ func (r *Store) Connect(ctx context.Context) error {
 		setSpanError(ctx, err)
 		return err
 	}
-	r.connected.Store(1)
+	r.connected.Store(true)
 	return nil
 }
 
 func (r *Store) Init(opts ...store.Option) error {
-	err := r.configure(opts...)
+	for _, o := range opts {
+		o(&r.opts)
+	}
+
+	err := r.configure()
 	if err != nil {
 		return err
 	}
@@ -125,7 +112,7 @@ func (r *Store) ClusterClient() *goredis.ClusterClient {
 }
 
 func (r *Store) Disconnect(ctx context.Context) error {
-	if r.connected.Load() == 0 {
+	if !r.connected.Load() {
 		return nil
 	}
 
@@ -135,7 +122,7 @@ func (r *Store) Disconnect(ctx context.Context) error {
 		}
 	}
 
-	r.connected.Store(1)
+	r.connected.Store(false)
 	return nil
 }
 
@@ -663,23 +650,18 @@ func (r *Store) String() string {
 }
 
 func NewStore(opts ...store.Option) *Store {
-	b := atomic.Uint32{}
+	b := atomic.Bool{}
 	return &Store{
 		opts:      store.NewOptions(opts...),
 		connected: &b,
-		watchers:  make(map[string]*watcher),
 	}
 }
 
-func (r *Store) configure(opts ...store.Option) error {
+func (r *Store) configure() error {
-	if r.cli != nil && len(opts) == 0 {
+	if r.cli != nil && r.opts.Context == nil {
 		return nil
 	}
 
-	for _, o := range opts {
-		o(&r.opts)
-	}
-
 	universalOptions := DefaultUniversalOptions
 
 	if r.opts.Context != nil {
@@ -708,8 +690,8 @@ func (r *Store) configure(opts ...store.Option) error {
 			universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
 			universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
 
-			if o.TLSConfig != nil {
+			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = o.TLSConfig
+				universalOptions.TLSConfig = r.opts.TLSConfig
 			}
 		}
 
@@ -742,15 +724,15 @@ func (r *Store) configure(opts ...store.Option) error {
 			universalOptions.MaxIdleConns = o.MaxIdleConns
 			universalOptions.ConnMaxIdleTime = o.ConnMaxIdleTime
 			universalOptions.ConnMaxLifetime = o.ConnMaxLifetime
-			if o.TLSConfig != nil {
+			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = o.TLSConfig
+				universalOptions.TLSConfig = r.opts.TLSConfig
 			}
 		}
 
 		if o, ok := r.opts.Context.Value(universalConfigKey{}).(*goredis.UniversalOptions); ok {
 			universalOptions = o
-			if o.TLSConfig != nil {
+			if r.opts.TLSConfig != nil {
-				universalOptions.TLSConfig = o.TLSConfig
+				universalOptions.TLSConfig = r.opts.TLSConfig
 			}
 		}
 	}
@@ -763,7 +745,7 @@ func (r *Store) configure(opts ...store.Option) error {
 
 	r.cli = goredis.NewUniversalClient(universalOptions)
 	setTracing(r.cli, r.opts.Tracer)
-	r.cli.AddHook(newEventHook(r))
+	r.cli.AddHook(newEventHook(r.connected))
 
 	r.pool = pool.NewStringsPool(50)
 
@@ -778,99 +760,8 @@ func (r *Store) getKey(b *strings.Builder, mainNamespace string, opNamespace str
 	}
 	if opNamespace != "" {
 		b.WriteString(opNamespace)
-		b.WriteString(r.opts.Separator)
+		b.WriteString(DefaultPathSeparator)
 	}
 	b.WriteString(key)
 	return b.String()
 }
-
-func (r *Store) Watch(ctx context.Context, opts ...store.WatchOption) (store.Watcher, error) {
-	id, err := id.New()
-	if err != nil {
-		return nil, err
-	}
-	wo, err := store.NewWatchOptions(opts...)
-	if err != nil {
-		return nil, err
-	}
-	// construct the watcher
-	w := &watcher{
-		exit: make(chan bool),
-		ch:   make(chan store.Event),
-		id:   id,
-		opts: wo,
-	}
-
-	r.mu.Lock()
-	r.watchers[w.id] = w
-	r.mu.Unlock()
-
-	return w, nil
-}
-
-func (r *Store) sendEvent(e store.Event) {
-	r.mu.RLock()
-	watchers := make([]*watcher, 0, len(r.watchers))
-	for _, w := range r.watchers {
-		watchers = append(watchers, w)
-	}
-	r.mu.RUnlock()
-	for _, w := range watchers {
-		select {
-		case <-w.exit:
-			r.mu.Lock()
-			delete(r.watchers, w.id)
-			r.mu.Unlock()
-		default:
-			select {
-			case w.ch <- e:
-			case <-time.After(sendEventTime):
-			}
-		}
-	}
-}
-
-type watcher struct {
-	ch   chan store.Event
-	exit chan bool
-	opts store.WatchOptions
-	id   string
-}
-
-func (w *watcher) Next() (store.Event, error) {
-	for {
-		select {
-		case e := <-w.ch:
-			return e, nil
-		case <-w.exit:
-			return nil, store.ErrWatcherStopped
-		}
-	}
-}
-
-func (w *watcher) Stop() {
-	select {
-	case <-w.exit:
-		return
-	default:
-		close(w.exit)
-	}
-}
-
-type event struct {
-	ts  time.Time
-	t   store.EventType
-	err error
-}
-
-func (e *event) Error() error {
-	return e.err
-}
-
-func (e *event) Timestamp() time.Time {
-	return e.ts
-}
-
-func (e *event) Type() store.EventType {
-	return e.t
-}

redis_test.go

@@ -14,7 +14,6 @@ import (
 )
 
 func TestLazyConnect(t *testing.T) {
-	t.Skip("skipping test for manual check")
 	ctx := context.Background()
 	var err error
 
@@ -121,7 +120,7 @@ func Test_rkv_configure(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			b := atomic.Uint32{}
+			b := atomic.Bool{}
 			rc := &Store{
 				opts:      tt.fields.options,
 				cli:       tt.fields.Client,