Merge pull request #523 from networkservicemesh/reliable-watch

Improve reliability of chain element 'etcd'

.golangci.yml

@@ -168,3 +168,7 @@ issues:
         - goheader
         - dupl
         - revive
+    # It's ok to have dupl code in tests files
+    - path: ".*.test.go"
+      linters:
+        - dupl

go.mod

@@ -3,6 +3,7 @@ module github.com/networkservicemesh/sdk-k8s
 go 1.20
 
 require (
+	github.com/edwarnicke/serialize v1.0.7
 	github.com/fsnotify/fsnotify v1.5.4
 	github.com/golang/protobuf v1.5.3
 	github.com/google/uuid v1.3.1
@@ -33,7 +34,6 @@ require (
 	github.com/edwarnicke/exechelper v1.0.2 // indirect
 	github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 // indirect
 	github.com/edwarnicke/grpcfd v1.1.4 // indirect
-	github.com/edwarnicke/serialize v1.0.7 // indirect
 	github.com/emicklei/go-restful/v3 v3.9.0 // indirect
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect

pkg/registry/etcd/context.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2023 Cisco and/or its affiliates.
+// Copyright (c) 2023-2024 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -16,7 +16,10 @@
 
 package etcd
 
-import "context"
+import (
+	"context"
+	"time"
+)
 
 type versionKey struct{}
 
@@ -28,3 +31,10 @@ func nseVersionFromContext(ctx context.Context) (string, bool) {
 	version, ok := ctx.Value(versionKey{}).(string)
 	return version, ok
 }
+
+func min(a, b time.Duration) time.Duration {
+	if a > b {
+		return b
+	}
+	return a
+}