fix lint errors

Author: NihaNallappagari

cns/NetworkContainerContract.go

@@ -7,12 +7,13 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Azure/azure-container-networking/cns/types"
-	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
-	"github.com/Azure/azure-container-networking/network/policy"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
+
+	"github.com/Azure/azure-container-networking/cns/types"
+	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
+	"github.com/Azure/azure-container-networking/network/policy"
 )
 
 // Container Network Service DNC Contract
@@ -128,7 +129,7 @@ type CreateNetworkContainerRequest struct {
 	AllowNCToHostCommunication bool
 	EndpointPolicies           []NetworkContainerRequestPolicies
 	NCStatus                   v1alpha.NCStatus
-	SwiftV2PrefixOnNic         bool // Indicates if is swiftv2 nc, PrefixOnNic scenario (isSwiftV2 && nc.Type == VNETBlock)
+	SwiftV2PrefixOnNic         bool                 // Indicates if is swiftv2 nc, PrefixOnNic scenario (isSwiftV2 && nc.Type == VNETBlock)
 	NetworkInterfaceInfo       NetworkInterfaceInfo //nolint // introducing new field for backendnic, to be used later by cni code
 }
 

cns/kubecontroller/nodenetworkconfig/conversion.go

@@ -6,9 +6,10 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/pkg/errors"
+
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
-	"github.com/pkg/errors"
 )
 
 var (
@@ -62,7 +63,7 @@ func CreateNCRequestFromDynamicNC(nc v1alpha.NetworkContainer) (*cns.CreateNetwo
 		NetworkContainerid:   nc.ID,
 		NetworkContainerType: cns.Docker,
 		Version:              strconv.FormatInt(nc.Version, 10), //nolint:gomnd // it's decimal
-		SwiftV2PrefixOnNic:   false, // Dynamic NCs don't use SwiftV2 PrefixOnNic
+		SwiftV2PrefixOnNic:   false,                             // Dynamic NCs don't use SwiftV2 PrefixOnNic
 		IPConfiguration: cns.IPConfiguration{
 			IPSubnet:         subnet,
 			GatewayIPAddress: nc.DefaultGateway,

cns/restserver/internalapi.go

@@ -12,18 +12,19 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"reflect"
+	"runtime"
 	"strconv"
 	"strings"
 	"time"
-	"runtime"
+
+	"github.com/pkg/errors"
 
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/logger"
 	"github.com/Azure/azure-container-networking/cns/nodesubnet"
 	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
-	"github.com/pkg/errors"
 )
 
 const (
@@ -731,13 +732,12 @@ func (service *HTTPRestService) getIMDSNCs(ctx context.Context) (map[string]stri
 
 // Check whether NC is SwiftV2 NIC associated NC and prefix on nic is enabled
 func (service *HTTPRestService) isPrefixonNicSwiftV2() bool {
-	for _, containerStatus := range service.state.ContainerStatus {
-		req := containerStatus.CreateNetworkContainerRequest
+	for i := range service.state.ContainerStatus {
+		req := service.state.ContainerStatus[i].CreateNetworkContainerRequest
 
-		// 
 		if req.SwiftV2PrefixOnNic {
 			return true
 		}
 	}
 	return false
-}
+}

cns/restserver/internalapi_linux.go

@@ -6,13 +6,14 @@ import (
 	"os/exec"
 	"strconv"
 
+	goiptables "github.com/coreos/go-iptables/iptables"
+	"github.com/pkg/errors"
+
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/logger"
 	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Azure/azure-container-networking/iptables"
 	"github.com/Azure/azure-container-networking/network/networkutils"
-	goiptables "github.com/coreos/go-iptables/iptables"
-	"github.com/pkg/errors"
 )
 
 const SWIFTPOSTROUTING = "SWIFT-POSTROUTING"
@@ -183,10 +184,9 @@ func (service *HTTPRestService) setVFForAccelnetNICs() error {
 }
 
 func (service *HTTPRestService) setPrefixOnNICRegistry(enabled bool, infraNicMacAddress string) error {
-	    // Assigning parameters to '_' to avoid unused parameter linting errors.
-    // These parameters are only used in the Windows implementation.
-    _ = enabled
-    _ = infraNicMacAddress
-	logger.Printf("[setPrefixOnNicEnabled winDebug] No-op on Linux platform")
+	// Assigning parameters to '_' to avoid unused parameter linting errors.
+	// These parameters are only used in the Windows implementation.
+	_ = enabled
+	_ = infraNicMacAddress
 	return nil
-}
+}

cns/restserver/internalapi_test.go

@@ -10,12 +10,18 @@ import (
 	"net"
 	"os"
 	"reflect"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
 	"testing"
 	"time"
-	"runtime"
+
+	"github.com/google/uuid"
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/exp/maps"
 
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/common"
@@ -26,11 +32,6 @@ import (
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 	nma "github.com/Azure/azure-container-networking/nmagent"
 	"github.com/Azure/azure-container-networking/store"
-	"github.com/google/uuid"
-	"github.com/pkg/errors"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/exp/maps"
 )
 
 const (
@@ -1684,19 +1685,19 @@ func setupIMDSMockAPIsWithCustomIDs(svc *HTTPRestService, interfaceIDs []string)
 
 // TestSyncHostNCVersionWithWindowsSwiftV2 tests SyncHostNCVersion and verifies it calls Windows SwiftV2 PrefixOnNic scenario
 func TestSyncHostNCVersionWithWindowsSwiftV2(t *testing.T) {
-	svc := getTestService(cns.Kubernetes)
-	
+	testSvc := getTestService(cns.Kubernetes)
+
 	// Set up test NCs with different scenarios
 	regularNCID := "regular-nc-id"
 	swiftV2NCID := "swift-v2-vnet-block-nc"
-	
+
 	// Initialize ContainerStatus map if nil
-	if svc.state.ContainerStatus == nil {
-		svc.state.ContainerStatus = make(map[string]containerstatus)
+	if testSvc.state.ContainerStatus == nil {
+		testSvc.state.ContainerStatus = make(map[string]containerstatus)
 	}
-	
+
 	// Add a regular NC
-	svc.state.ContainerStatus[regularNCID] = containerstatus{
+	testSvc.state.ContainerStatus[regularNCID] = containerstatus{
 		ID: regularNCID,
 		CreateNetworkContainerRequest: cns.CreateNetworkContainerRequest{
 			NetworkContainerid:   regularNCID,
@@ -1706,49 +1707,49 @@ func TestSyncHostNCVersionWithWindowsSwiftV2(t *testing.T) {
 		},
 		HostVersion: "1",
 	}
-	
+
 	// Add a SwiftV2 VNETBlock NC that should trigger Windows registry operations
-	svc.state.ContainerStatus[swiftV2NCID] = containerstatus{
+	testSvc.state.ContainerStatus[swiftV2NCID] = containerstatus{
 		ID: swiftV2NCID,
 		CreateNetworkContainerRequest: cns.CreateNetworkContainerRequest{
 			NetworkContainerid:   swiftV2NCID,
-			SwiftV2PrefixOnNic:   true, 
+			SwiftV2PrefixOnNic:   true,
 			NetworkContainerType: cns.Docker,
 			Version:              "2",
 		},
 		HostVersion: "1",
 	}
-	
+
 	// Set up mock NMAgent with NC versions
 	mockNMA := &fakes.NMAgentClientFake{}
-	mockNMA.GetNCVersionListF = func(ctx context.Context) (nma.NCVersionList, error) {
+	mockNMA.GetNCVersionListF = func(_ context.Context) (nma.NCVersionList, error) {
 		return nma.NCVersionList{
 			Containers: []nma.NCVersion{
 				{
 					NetworkContainerID: regularNCID,
-					Version:           "2",
+					Version:            "2",
 				},
 				{
 					NetworkContainerID: swiftV2NCID,
-					Version:           "2",
+					Version:            "2",
 				},
 			},
 		}, nil
 	}
-	svc.nma = mockNMA
-	
+	testSvc.nma = mockNMA
+
 	// Set up mock IMDS client for Windows SwiftV2 scenario
 	mac1, _ := net.ParseMAC("AA:BB:CC:DD:EE:FF")
 	mac2, _ := net.ParseMAC("11:22:33:44:55:66")
-	
+
 	interfaceMap := map[string]imds.NetworkInterface{
 		"interface1": {
 			InterfaceCompartmentID: "", // Empty for Windows condition
-			MacAddress:            imds.HardwareAddr(mac1),
+			MacAddress:             imds.HardwareAddr(mac1),
 		},
 		"interface2": {
 			InterfaceCompartmentID: "nc-with-compartment-id",
-			MacAddress:            imds.HardwareAddr(mac2),
+			MacAddress:             imds.HardwareAddr(mac2),
 		},
 	}
 	mockIMDS := &mockIMDSAdapter{
@@ -1770,46 +1771,44 @@ func TestSyncHostNCVersionWithWindowsSwiftV2(t *testing.T) {
 			},
 		},
 	}
-	
+
 	// Replace the IMDS client
-	originalIMDS := svc.imdsClient
-	svc.imdsClient = mockIMDS
-	defer func() { svc.imdsClient = originalIMDS }()
-	
+	originalIMDS := testSvc.imdsClient
+	testSvc.imdsClient = mockIMDS
+	defer func() { testSvc.imdsClient = originalIMDS }()
+
 	// Verify preconditions
-	assert.True(t, svc.isPrefixonNicSwiftV2(), "isPrefixonNicSwiftV2() should return true")
+	assert.True(t, testSvc.isPrefixonNicSwiftV2(), "isPrefixonNicSwiftV2() should return true")
 
 	ctx := context.Background()
-	svc.SyncHostNCVersion(ctx, cns.CRD)
-	
+	testSvc.SyncHostNCVersion(ctx, cns.CRD)
+
 	// Verify that NC versions were updated
-	updatedRegularNC := svc.state.ContainerStatus[regularNCID]
-	updatedSwiftV2NC := svc.state.ContainerStatus[swiftV2NCID]
-	
+	updatedRegularNC := testSvc.state.ContainerStatus[regularNCID]
+	updatedSwiftV2NC := testSvc.state.ContainerStatus[swiftV2NCID]
+
 	assert.Equal(t, "2", updatedRegularNC.HostVersion, "Regular NC host version should be updated to 2")
 	assert.Equal(t, "2", updatedSwiftV2NC.HostVersion, "SwiftV2 NC host version should be updated to 2")
-	
-	imdsNCs, err := svc.getIMDSNCs(ctx)
+
+	imdsNCs, err := testSvc.getIMDSNCs(ctx)
 	assert.NoError(t, err, "getIMDSNCs should not return error")
-	
+
 	// Verify IMDS results
 	assert.Contains(t, imdsNCs, "nc-with-compartment-id", "NC with compartment ID should be in results")
 	assert.Equal(t, PrefixOnNicNCVersion, imdsNCs["nc-with-compartment-id"], "NC should have expected version")
-	
+
 	// Log the conditions that would trigger Windows registry operations
 	isWindows := runtime.GOOS == "windows"
-	hasSwiftV2PrefixOnNic := svc.isPrefixonNicSwiftV2()
-	
-	t.Logf("Windows SwiftV2 PrefixOnNic conditions: (runtime.GOOS == 'windows' && service.isPrefixonNicSwiftV2()): %t", 
+	hasSwiftV2PrefixOnNic := testSvc.isPrefixonNicSwiftV2()
+
+	t.Logf("Windows SwiftV2 PrefixOnNic conditions: (runtime.GOOS == 'windows' && service.isPrefixonNicSwiftV2()): %t",
 		isWindows && hasSwiftV2PrefixOnNic)
-	
-	
+
 	// Test with no SwiftV2 NCs
-	delete(svc.state.ContainerStatus, swiftV2NCID)
-	assert.False(t, svc.isPrefixonNicSwiftV2(), "isPrefixonNicSwiftV2() should return false without SwiftV2 NCs")
-	
+	delete(testSvc.state.ContainerStatus, swiftV2NCID)
+	assert.False(t, testSvc.isPrefixonNicSwiftV2(), "isPrefixonNicSwiftV2() should return false without SwiftV2 NCs")
+
 	// Call getIMDSNCs again to verify condition is not triggered
-	_, err2 := svc.getIMDSNCs(ctx)
+	_, err2 := testSvc.getIMDSNCs(ctx)
 	assert.NoError(t, err2, "getIMDSNCs should not return error")
 }
-

cns/restserver/internalapi_windows.go

@@ -5,17 +5,18 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Azure/azure-container-networking/cns"
-	"github.com/Azure/azure-container-networking/cns/logger"
-	"github.com/Azure/azure-container-networking/cns/types"
 	"github.com/Microsoft/hcsshim"
 	"github.com/pkg/errors"
 	"golang.org/x/sys/windows/registry"
+
+	"github.com/Azure/azure-container-networking/cns"
+	"github.com/Azure/azure-container-networking/cns/logger"
+	"github.com/Azure/azure-container-networking/cns/types"
 )
 
 const (
 	// timeout for powershell command to return the interfaces list
-		pwshTimeout             = 120 * time.Second
+	pwshTimeout             = 120 * time.Second
 	hnsRegistryPath         = `SYSTEM\CurrentControlSet\Services\HNS\wcna_state\config`
 	prefixOnNicRegistryPath = `SYSTEM\CurrentControlSet\Services\HNS\wcna_state\config\PrefixOnNic`
 	infraNicIfName          = "eth0"
@@ -137,15 +138,18 @@ func (service *HTTPRestService) setRegistryValue(registryPath, keyName string, v
 	case uint32:
 		err = key.SetDWordValue(keyName, v)
 	case int:
+	case int:
+		if v < 0 || v > int(^uint32(0)) {
+			return fmt.Errorf("int value %d overflows uint32 for registry key %s", v, keyName)
+		}
 		err = key.SetDWordValue(keyName, uint32(v))
 	default:
 		return fmt.Errorf("unsupported value type for registry key %s: %T", keyName, value)
 	}
-
 	if err != nil {
 		return fmt.Errorf("failed to set registry value '%s': %w", keyName, err)
 	}
 
-	logger.Printf("[setRegistryValue] Set %s\\%s = %v", registryPath, keyName, value) 
+	logger.Printf("[setRegistryValue] Set %s\\%s = %v", registryPath, keyName, value)
 	return nil
-}
+}