fix: make linter happy, cleanup

Author: santhoshmprabhu

cns/ipam/interfaces.go

@@ -6,6 +6,6 @@ import (
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 )
 
-type IpamStateReconciler interface {
+type StateReconciler interface {
 	ReconcileIPAMState(ncRequests []*cns.CreateNetworkContainerRequest, podInfoByIP map[string]cns.PodInfo, nnc *v1alpha.NodeNetworkConfig) cnstypes.ResponseCode
 }

cns/nodesubnet/initialization.go

@@ -11,7 +11,7 @@ import (
 	"golang.org/x/exp/maps"
 )
 
-func ReconcileInitialCNSState(ctx context.Context, ipamReconciler ipam.IpamStateReconciler, podInfoByIPProvider cns.PodInfoByIPProvider) (int, error) {
+func ReconcileInitialCNSState(_ context.Context, ipamReconciler ipam.StateReconciler, podInfoByIPProvider cns.PodInfoByIPProvider) (int, error) {
 	// Get previous PodInfo state from podInfoByIPProvider
 	podInfoByIP, err := podInfoByIPProvider.PodInfoByIP()
 	if err != nil {

cns/nodesubnet/initialization_test.go

@@ -1,7 +1,6 @@
 package nodesubnet_test
 
 import (
-	"context"
 	"net"
 	"testing"
 
@@ -70,7 +69,7 @@ func TestNewCNSPodInfoProvider(t *testing.T) {
 		name       string
 		store      store.KeyValueStore
 		wantErr    bool
-		reconciler ipam.IpamStateReconciler
+		reconciler ipam.StateReconciler
 		exp        int
 	}{
 		{
@@ -99,12 +98,3 @@ func TestNewCNSPodInfoProvider(t *testing.T) {
 		})
 	}
 }
-
-// testContext creates a context from the provided testing.T that will be
-// canceled if the test suite is terminated.
-func testContext(t *testing.T) (context.Context, context.CancelFunc) {
-	if deadline, ok := t.Deadline(); ok {
-		return context.WithDeadline(context.Background(), deadline)
-	}
-	return context.WithCancel(context.Background())
-}

cns/restserver/util.go

@@ -194,11 +194,7 @@ func (service *HTTPRestService) saveNetworkContainerGoalState(req cns.CreateNetw
 		fallthrough
 	case cns.JobObject:
 		fallthrough
-	case cns.COW, cns.BackendNICNC:
-		fallthrough
-	case cns.NodeSubnet:
-		fallthrough
-	case cns.WebApps:
+	case cns.COW, cns.BackendNICNC, cns.NodeSubnet, cns.WebApps:
 		switch service.state.OrchestratorType {
 		case cns.Kubernetes:
 			fallthrough
@@ -232,9 +228,7 @@ func (service *HTTPRestService) saveNetworkContainerGoalState(req cns.CreateNetw
 
 			logger.Printf("service.state.ContainerIDByOrchestratorContext[%s] is %+v", orchestratorContext, *service.state.ContainerIDByOrchestratorContext[orchestratorContext])
 
-		case cns.KubernetesCRD:
-			fallthrough
-		case cns.KubernetesNodeSubnet:
+		case cns.KubernetesCRD, cns.KubernetesNodeSubnet:
 			// Validate and Update the SecondaryIpConfig state
 			returnCode, returnMesage := service.updateIPConfigsStateUntransacted(req, existingSecondaryIPConfigs, hostVersion)
 			if returnCode != 0 {