delete sync.Map

Signed-off-by: Nikita Skrynnik <[email protected]>

.github/workflows/ci.yaml

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

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/iprule/common.go

@@ -31,6 +31,7 @@ import (
 
 	"golang.org/x/sys/unix"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/pkg/errors"
 	"github.com/vishvananda/netlink"
 
@@ -42,7 +43,9 @@ import (
 	link "github.com/networkservicemesh/sdk-kernel/pkg/kernel"
 )
 
-func create(ctx context.Context, conn *networkservice.Connection, tableIDs *Map, nsRTableNextIDToConnID *NetnsRTableNextIDToConnMap) error {
+type policies map[int]*networkservice.PolicyRoute
+
+func create(ctx context.Context, conn *networkservice.Connection, tableIDs *genericsync.Map[string, policies], nsRTableNextIDToConnID *genericsync.Map[NetnsRTableNextID, string]) error {
 	if mechanism := kernel.ToMechanism(conn.GetMechanism()); mechanism != nil && mechanism.GetVLAN() == 0 {
 		// Construct the netlink handle for the target namespace for this kernel interface
 		netlinkHandle, err := link.GetNetlinkHandle(mechanism.GetNetNSURL())
@@ -102,7 +105,7 @@ func create(ctx context.Context, conn *networkservice.Connection, tableIDs *Map,
 	return nil
 }
 
-func addPolicy(ctx context.Context, netlinkHandle *netlink.Handle, policy *networkservice.PolicyRoute, l netlink.Link, ps policies, tableIDs *Map, tableID int, connID string, nsrtid NetnsRTableNextID, nsRTableNextIDToConnID *NetnsRTableNextIDToConnMap) error {
+func addPolicy(ctx context.Context, netlinkHandle *netlink.Handle, policy *networkservice.PolicyRoute, l netlink.Link, ps policies, tableIDs *genericsync.Map[string, policies], tableID int, connID string, nsrtid NetnsRTableNextID, nsRTableNextIDToConnID *genericsync.Map[NetnsRTableNextID, string]) error {
 	// release the lock if something fails
 	defer nsRTableNextIDToConnID.Delete(nsrtid)
 	// If policy doesn't contain any route - add default
@@ -265,7 +268,7 @@ func routeAdd(ctx context.Context, handle *netlink.Handle, l netlink.Link, route
 	return nil
 }
 
-func del(ctx context.Context, conn *networkservice.Connection, tableIDs *Map, nsRTableNextIDToConnID *NetnsRTableNextIDToConnMap) error {
+func del(ctx context.Context, conn *networkservice.Connection, tableIDs *genericsync.Map[string, policies], nsRTableNextIDToConnID *genericsync.Map[NetnsRTableNextID, string]) error {
 	if mechanism := kernel.ToMechanism(conn.GetMechanism()); mechanism != nil && mechanism.GetVLAN() == 0 {
 		netlinkHandle, err := link.GetNetlinkHandle(mechanism.GetNetNSURL())
 		if err != nil {

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/iprule/heal.go

@@ -26,6 +26,7 @@ package iprule
 import (
 	"context"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel"
 	"github.com/networkservicemesh/sdk/pkg/tools/log"
@@ -35,7 +36,7 @@ import (
 	link "github.com/networkservicemesh/sdk-kernel/pkg/kernel"
 )
 
-func recoverTableIDs(ctx context.Context, conn *networkservice.Connection, tableIDs *Map) error {
+func recoverTableIDs(ctx context.Context, conn *networkservice.Connection, tableIDs *genericsync.Map[string, policies]) error {
 	if mechanism := kernel.ToMechanism(conn.GetMechanism()); mechanism != nil && mechanism.GetVLAN() == 0 {
 		_, ok := tableIDs.Load(conn.GetId())
 		if ok {

pkg/kernel/networkservice/connectioncontextkernel/ipcontext/iprule/server.go

@@ -26,6 +26,7 @@ package iprule
 import (
 	"context"
 
+	"github.com/edwarnicke/genericsync"
 	"github.com/golang/protobuf/ptypes/empty"
 	"github.com/networkservicemesh/api/pkg/api/networkservice"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
@@ -34,11 +35,11 @@ import (
 )
 
 type ipruleServer struct {
-	tables Map
+	tables genericsync.Map[string, policies]
 	// Protecting route and rule setting with this sync.Map
 	// The next table ID is calculated based on a dump
 	// other connection from same client can add new table in parallel
-	nsRTableNextIDToConnID NetnsRTableNextIDToConnMap
+	nsRTableNextIDToConnID genericsync.Map[NetnsRTableNextID, string]
 }
 
 // NewServer creates a new server chain element setting ip rules