Revert "some minor adjustments for context keys"

This reverts commit 3cbe1d63.

nucleus/gnmi_transport.go

@@ -11,16 +11,10 @@ import (
 	"strings"
 )
 
-// CtxKeyType is a custom type to be used as key in a context.WithValue() or
-// context.Value() call. For more information see:
-// https://www.calhoun.io/pitfalls-of-context-values-and-how-to-avoid-or-mitigate-them/
-type CtxKeyType int
-
+type CtxKeyType string
 const (
-	// CtxKeyOpts context key for gnmi.SubscribeOptions
-	CtxKeyOpts CtxKeyType = iota
-	// CtxKeyConfig is a context key for gnmi.Config
-	CtxKeyConfig
+	CtxKeyOpts CtxKeyType = "opts"
+	CtxKeyConfig = "config"
 )
 
 // Gnmi implements the Transport interface and provides an SBI with the

nucleus/integration_test.go

@@ -109,7 +109,7 @@ func TestGnmi_SetIntegration(t *testing.T) {
 			if err != nil && tt.wantErr {
 				return
 			} else if got.Prefix.Target != address ||
-				got.Response[0].Op != gpb.UpdateResult_UPDATE {
+				got.Response[0].Op != gpb.UpdateResult_UPDATE{
 				t.Errorf("Set() got = %v, want %v", got, tt.want)
 			}
 		})
@@ -271,7 +271,7 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
 				t.Error(err)
 				return
 			}
-			ctx := context.WithValue(context.Background(), CtxKeyOpts, tt.args.opts)
+			ctx := context.WithValue(context.Background(), "opts", tt.args.opts)
 			ctx, cancel := context.WithCancel(ctx)
 			go func() {
 				err = g.Subscribe(ctx)