bump(version): to v0.0.16

Author: darkweak

.github/workflows/static.yml

@@ -60,7 +60,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v8
         with:
           working-directory: ${{ matrix.submodules }}
       - name: Install olric

.golangci.yml

@@ -1,16 +1,12 @@
-run:
-  go: '1.22.2'
-
-output:
-  formats:
-    - format: json
-      path: stderr
-    - format: checkstyle
-      path: report.xml
-    - format: colored-line-number
+version: "2"
 
 linters:
-  enable-all: true
+  default: all
+  settings:
+    wsl_v5:
+      allow-first-in-block: true
+      allow-whole-block: false
+      branch-max-lines: 2
   disable:
     - bodyclose
     - containedctx
@@ -23,14 +19,16 @@ linters:
     - gochecknoglobals
     - gocognit
     - gomoddirectives
-    - gomnd
+#    - gomnd
     - interfacebloat
     - ireturn
     - lll
     - mnd
     - nestif
+    - noinlineerr
     - nonamedreturns
     - paralleltest
-    - stylecheck
+#    - stylecheck
     - revive
-    - wrapcheck
+    - wrapcheck
+    - wsl

badger/badger.go

@@ -23,6 +23,7 @@ import (
 // Badger provider type.
 type Badger struct {
 	*badger.DB
+
 	stale  time.Duration
 	logger core.Logger
 }
@@ -37,7 +38,7 @@ type badgerLogger struct {
 }
 
 func (b *badgerLogger) Warningf(msg string, params ...interface{}) {
-	b.SugaredLogger.Warnf(msg, params...)
+	b.Warnf(msg, params...)
 }
 
 // Factory function create new Badger instance.
@@ -48,6 +49,7 @@ func Factory(badgerConfiguration core.CacheProvider, logger core.Logger, stale t
 
 	if badgerConfiguration.Configuration != nil {
 		var parsedBadger badger.Options
+
 		if b, e := json.Marshal(badgerConfiguration.Configuration); e == nil {
 			if e = json.Unmarshal(b, &parsedBadger); e != nil {
 				logger.Error("Impossible to parse the configuration for the default provider (Badger)", e)
@@ -112,7 +114,7 @@ func (provider *Badger) Uuid() string {
 func (provider *Badger) MapKeys(prefix string) map[string]string {
 	keys := map[string]string{}
 
-	_ = provider.DB.View(func(txn *badger.Txn) error {
+	_ = provider.View(func(txn *badger.Txn) error {
 		opts := badger.DefaultIteratorOptions
 		opts.PrefetchValues = false
 		iterator := txn.NewIterator(opts)
@@ -139,7 +141,7 @@ func (provider *Badger) MapKeys(prefix string) map[string]string {
 func (provider *Badger) ListKeys() []string {
 	keys := []string{}
 
-	err := provider.DB.View(func(txn *badger.Txn) error {
+	err := provider.View(func(txn *badger.Txn) error {
 		opts := badger.DefaultIteratorOptions
 		opts.PrefetchValues = false
 		it := txn.NewIterator(opts)
@@ -174,7 +176,7 @@ func (provider *Badger) Get(key string) []byte {
 
 	var result []byte
 
-	err := provider.DB.View(func(txn *badger.Txn) error {
+	err := provider.View(func(txn *badger.Txn) error {
 		i, err := txn.Get([]byte(key))
 		item = i
 
@@ -198,7 +200,7 @@ func (provider *Badger) Get(key string) []byte {
 
 // GetMultiLevel tries to load the key and check if one of linked keys is a fresh/stale candidate.
 func (provider *Badger) GetMultiLevel(key string, req *http.Request, validator *core.Revalidator) (fresh *http.Response, stale *http.Response) {
-	_ = provider.DB.View(func(tx *badger.Txn) error {
+	_ = provider.View(func(tx *badger.Txn) error {
 		result, err := tx.Get([]byte(core.MappingKeyPrefix + key))
 		if err != nil && !errors.Is(err, badger.ErrKeyNotFound) {
 			return err
@@ -226,7 +228,7 @@ func (provider *Badger) GetMultiLevel(key string, req *http.Request, validator *
 func (provider *Badger) SetMultiLevel(baseKey, variedKey string, value []byte, variedHeaders http.Header, etag string, duration time.Duration, realKey string) error {
 	now := time.Now()
 
-	err := provider.DB.Update(func(btx *badger.Txn) error {
+	err := provider.Update(func(btx *badger.Txn) error {
 		var err error
 
 		compressed := new(bytes.Buffer)
@@ -280,7 +282,7 @@ func (provider *Badger) SetMultiLevel(baseKey, variedKey string, value []byte, v
 
 // Set method will store the response in Badger provider.
 func (provider *Badger) Set(key string, value []byte, duration time.Duration) error {
-	err := provider.DB.Update(func(txn *badger.Txn) error {
+	err := provider.Update(func(txn *badger.Txn) error {
 		return txn.SetEntry(badger.NewEntry([]byte(key), value).WithTTL(duration))
 	})
 	if err != nil {
@@ -292,20 +294,19 @@ func (provider *Badger) Set(key string, value []byte, duration time.Duration) er
 
 // Delete method will delete the response in Badger provider if exists corresponding to key param.
 func (provider *Badger) Delete(key string) {
-	_ = provider.DB.Update(func(txn *badger.Txn) error {
+	_ = provider.Update(func(txn *badger.Txn) error {
 		return txn.Delete([]byte(key))
 	})
 }
 
 // DeleteMany method will delete the responses in Badger provider if exists corresponding to the regex key param.
 func (provider *Badger) DeleteMany(key string) {
 	rgKey, e := regexp.Compile(key)
-
 	if e != nil {
 		return
 	}
 
-	_ = provider.DB.View(func(txn *badger.Txn) error {
+	_ = provider.View(func(txn *badger.Txn) error {
 		opts := badger.DefaultIteratorOptions
 		opts.PrefetchValues = false
 		it := txn.NewIterator(opts)
@@ -330,13 +331,11 @@ func (provider *Badger) Init() error {
 
 // Reset method will reset or close provider.
 func (provider *Badger) Reset() error {
-	err := provider.DB.DropAll()
-	if err != nil {
+	if err := provider.DropAll(); err != nil {
 		provider.logger.Errorf("Impossible to reset the Badger DB, %v", err)
 	}
 
-	err = provider.DB.Close()
-	if err != nil {
+	if err := provider.Close(); err != nil {
 		provider.logger.Errorf("Impossible to close the Badger DB, %v", err)
 	}
 

badger/caddy/go.mod

@@ -4,8 +4,8 @@ go 1.23.0
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/badger v0.0.15
-	github.com/darkweak/storages/core v0.0.15
+	github.com/darkweak/storages/badger v0.0.16
+	github.com/darkweak/storages/core v0.0.16
 )
 
 require (

badger/go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	dario.cat/mergo v1.0.1
-	github.com/darkweak/storages/core v0.0.15
+	github.com/darkweak/storages/core v0.0.16
 	github.com/dgraph-io/badger/v4 v4.8.0
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.uber.org/zap v1.27.0

core/registered.go

@@ -31,6 +31,7 @@ func ResetRegisteredStorages() {
 				_ = value.(Storer).Reset()
 			}
 		}
+
 		registered.Delete(key)
 
 		return true

etcd/caddy/go.mod

@@ -4,8 +4,8 @@ go 1.22.1
 
 require (
 	github.com/caddyserver/caddy/v2 v2.8.4
-	github.com/darkweak/storages/core v0.0.15
-	github.com/darkweak/storages/etcd v0.0.15
+	github.com/darkweak/storages/core v0.0.16
+	github.com/darkweak/storages/etcd v0.0.16
 )
 
 require (

etcd/etcd.go

@@ -21,6 +21,7 @@ import (
 // Etcd provider type.
 type Etcd struct {
 	*clientv3.Client
+
 	stale         time.Duration
 	ctx           context.Context
 	logger        core.Logger
@@ -61,10 +62,8 @@ func Factory(etcdCfg core.CacheProvider, logger core.Logger, stale time.Duration
 		return nil, err
 	}
 
-	for {
-		if cli.ActiveConnection().GetState() == connectivity.Ready {
-			break
-		}
+	for cli.ActiveConnection().GetState() != connectivity.Ready {
+
 	}
 
 	return &Etcd{
@@ -85,9 +84,9 @@ func (provider *Etcd) Name() string {
 func (provider *Etcd) Uuid() string {
 	return fmt.Sprintf(
 		"%s-%s-%s-%s",
-		strings.Join(provider.Client.Endpoints(), ","),
-		provider.Client.Username,
-		provider.Client.Password,
+		strings.Join(provider.Endpoints(), ","),
+		provider.Username,
+		provider.Password,
 		provider.stale,
 	)
 }
@@ -103,7 +102,6 @@ func (provider *Etcd) ListKeys() []string {
 	keys := []string{}
 
 	result, e := provider.Client.Get(provider.ctx, core.MappingKeyPrefix, clientv3.WithPrefix())
-
 	if e != nil {
 		if !provider.reconnecting {
 			go provider.Reconnect()
@@ -225,9 +223,9 @@ func (provider *Etcd) SetMultiLevel(baseKey, variedKey string, value []byte, var
 		return err
 	}
 
-	rs, err := provider.Client.Grant(context.TODO(), int64(duration.Seconds()))
+	rs, err := provider.Grant(context.TODO(), int64(duration.Seconds()))
 	if err == nil {
-		_, err = provider.Client.Put(provider.ctx, variedKey, compressed.String(), clientv3.WithLease(rs.ID))
+		_, err = provider.Put(provider.ctx, variedKey, compressed.String(), clientv3.WithLease(rs.ID))
 	}
 
 	if err != nil {
@@ -242,8 +240,8 @@ func (provider *Etcd) SetMultiLevel(baseKey, variedKey string, value []byte, var
 
 	mappingKey := core.MappingKeyPrefix + baseKey
 	result := provider.Get(mappingKey)
-	val, e := core.MappingUpdater(variedKey, result, provider.logger, now, now.Add(duration), now.Add(duration+provider.stale), variedHeaders, etag, realKey)
 
+	val, e := core.MappingUpdater(variedKey, result, provider.logger, now, now.Add(duration), now.Add(duration+provider.stale), variedHeaders, etag, realKey)
 	if e != nil {
 		return e
 	}
@@ -263,9 +261,9 @@ func (provider *Etcd) Set(key string, value []byte, duration time.Duration) erro
 		return fmt.Errorf("the connection is not ready: %v", provider.Client.ActiveConnection().GetState())
 	}
 
-	rs, err := provider.Client.Grant(context.TODO(), int64(duration.Seconds()))
+	rs, err := provider.Grant(context.TODO(), int64(duration.Seconds()))
 	if err == nil {
-		_, err = provider.Client.Put(provider.ctx, key, string(value), clientv3.WithLease(rs.ID))
+		_, err = provider.Put(provider.ctx, key, string(value), clientv3.WithLease(rs.ID))
 	}
 
 	if err != nil {
@@ -299,7 +297,6 @@ func (provider *Etcd) DeleteMany(key string) {
 	}
 
 	rgKey, e := regexp.Compile(key)
-
 	if e != nil {
 		return
 	}
@@ -321,7 +318,7 @@ func (provider *Etcd) Init() error {
 
 // Reset method will reset or close provider.
 func (provider *Etcd) Reset() error {
-	return provider.Client.Close()
+	return provider.Close()
 }
 
 func (provider *Etcd) Reconnect() {

etcd/etcd_test.go

@@ -36,6 +36,7 @@ func TestEtcdConnectionFactory(t *testing.T) {
 	go asyncCheck()
 
 	instance, err := getEtcdInstance()
+
 	checker <- true
 
 	if nil != err {

etcd/go.mod

@@ -5,7 +5,7 @@ go 1.22.1
 replace github.com/darkweak/storages/core => ../core
 
 require (
-	github.com/darkweak/storages/core v0.0.15
+	github.com/darkweak/storages/core v0.0.16
 	github.com/pierrec/lz4/v4 v4.1.22
 	go.etcd.io/etcd/client/v3 v3.5.18
 	go.uber.org/zap v1.27.0