Moved to using a generic map instead of generated maps

.github/workflows/ci.yaml

@@ -16,6 +16,8 @@ jobs:
 
   golangci-lint:
     uses: networkservicemesh/.github/.github/workflows/golangci-lint.yaml@main
+    with:
+      linter-version: v1.51.1
 
   exclude-fmt-errorf:
     uses: networkservicemesh/.github/.github/workflows/exclude-fmt-errorf.yaml@main

.golangci.yml

@@ -1,7 +1,7 @@
 ---
 run:
   # concurrency: 6
-  go: "1.17"
+  go: "1.19"
   timeout: 2m
   issues-exit-code: 1
   tests: true

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/antonfisher/nested-logrus-formatter v1.3.1
 	github.com/benbjohnson/clock v1.3.0
 	github.com/edwarnicke/exechelper v1.0.2
+	github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29
 	github.com/edwarnicke/grpcfd v1.1.2
 	github.com/edwarnicke/serialize v1.0.7
 	github.com/fsnotify/fsnotify v1.5.4

go.sum

@@ -96,6 +96,8 @@ github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1
 github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I=
 github.com/edwarnicke/exechelper v1.0.2 h1:dD49Ui2U0FBFxxhalnKw6vLS0P0TkgnXBRvKL/xmC5w=
 github.com/edwarnicke/exechelper v1.0.2/go.mod h1:/T271jtNX/ND4De6pa2aRy2+8sNtyCDB1A2pp4M+fUs=
+github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29 h1:4/2wgileNvQB4HfJbq7u4FFLKIfc38a6P0S/51ZGgX8=
+github.com/edwarnicke/genericsync v0.0.0-20220910010113-61a344f9bc29/go.mod h1:3m+ZfVq+z0pTLW798jmqnifMsalrVLIKmfXaMFvqSuc=
 github.com/edwarnicke/grpcfd v1.1.2 h1:2b8kCABQ1+JjSKGDoHadqSW7whCeTXMqtyo6jmB5B8k=
 github.com/edwarnicke/grpcfd v1.1.2/go.mod h1:rHihB9YvNMixz8rS+ZbwosI2kj65VLkeyYAI2M+/cGA=
 github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf/go.mod h1:XvbCO/QGsl3X8RzjBMoRpkm54FIAZH5ChK2j+aox7pw=

pkg/networkservice/common/begin/client.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 Cisco and/or its affiliates.
+// Copyright (c) 2021-2023 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,6 +19,7 @@ package begin
 import (
 	"context"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
@@ -30,7 +31,7 @@ import (
 )
 
 type beginClient struct {
-	clientMap
+	genericsync.Map[string, *eventFactoryClient]
 }
 
 // NewClient - creates a new begin chain element

pkg/networkservice/common/begin/server.go

@@ -1,4 +1,4 @@
-// Copyright (c) 2021-2022 Cisco and/or its affiliates.
+// Copyright (c) 2021-2023 Cisco and/or its affiliates.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -19,6 +19,7 @@ package begin
 import (
 	"context"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/pkg/errors"
 	"google.golang.org/protobuf/types/known/emptypb"
@@ -29,7 +30,7 @@ import (
 )
 
 type beginServer struct {
-	serverMap
+	genericsync.Map[string, *eventFactoryServer]
 }
 
 // NewServer - creates a new begin chain element

pkg/networkservice/common/externalips/server.go

@@ -1,5 +1,7 @@
 // Copyright (c) 2020-2021 Doc.ai and/or its affiliates.
 //
+// Copyright (c) 2023 Cisco and/or its affiliates.
+//
 // SPDX-License-Identifier: Apache-2.0
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,6 +24,7 @@ import (
 	"net"
 	"sync/atomic"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/ghodss/yaml"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
@@ -59,8 +62,8 @@ func NewServer(chainCtx context.Context, options ...Option) networkservice.Netwo
 	result := &externalIPsServer{
 		chainCtx: chainCtx,
 	}
-	result.externalToInternalMap.Store(new(stringMap))
-	result.internalToExternalMap.Store(new(stringMap))
+	result.externalToInternalMap.Store(new(genericsync.Map[string, string]))
+	result.internalToExternalMap.Store(new(genericsync.Map[string, string]))
 	for _, o := range options {
 		o(result)
 	}
@@ -86,7 +89,7 @@ func NewServer(chainCtx context.Context, options ...Option) networkservice.Netwo
 }
 
 func replaceFunc(v atomic.Value) func(ip net.IP) net.IP {
-	m := v.Load().(*stringMap)
+	m := v.Load().(*genericsync.Map[string, string])
 	return func(ip net.IP) net.IP {
 		key := ip.String()
 		value, _ := m.Load(key)
@@ -109,7 +112,7 @@ func (e *externalIPsServer) build(ips map[string]string) error {
 			return err
 		}
 	}
-	internalIPs, externalIPs := new(stringMap), new(stringMap)
+	internalIPs, externalIPs := new(genericsync.Map[string, string]), new(genericsync.Map[string, string])
 	for k, v := range ips {
 		internalIPs.Store(k, v)
 		externalIPs.Store(v, k)