chore: appease the linter (3/?), the big gofumpt (#987)

* gofumpt -w -s .

* small addtl cleanups after gofumpt

* rerun after rebase

Author: rbtr

aitelemetry/telemetrywrapper.go

@@ -96,7 +96,7 @@ func getMetadata(th *telemetryHandle) {
 		return
 	}
 
-	//acquire write lock before writing metadata to telemetry handle
+	// acquire write lock before writing metadata to telemetry handle
 	th.rwmutex.Lock()
 	th.metadata = metadata
 	th.rwmutex.Unlock()
@@ -188,7 +188,7 @@ func (th *telemetryHandle) TrackLog(report Report) {
 	// Initialize new trace message
 	trace := appinsights.NewTraceTelemetry(report.Message, appinsights.Warning)
 
-	//Override few of existing columns with metadata
+	// Override few of existing columns with metadata
 	trace.Tags.User().SetAuthUserId(runtime.GOOS)
 	trace.Tags.Operation().SetId(report.Context)
 	trace.Tags.Operation().SetParentId(th.appVersion)

aitelemetry/telemetrywrapper_windows.go

@@ -5,6 +5,4 @@ import (
 	"path/filepath"
 )
 
-var (
-	metadataFile = filepath.FromSlash(os.Getenv("TEMP")) + "\\azuremetadata.json"
-)
+var metadataFile = filepath.FromSlash(os.Getenv("TEMP")) + "\\azuremetadata.json"

cni/client/client_integration_test.go

@@ -104,5 +104,4 @@ func TestGetStateWithEmptyStateFile(t *testing.T) {
 	state, err := c.GetEndpointState()
 	require.NoError(t, err)
 	require.Exactly(t, 0, len(state.ContainerInterfaces))
-
 }

cni/ipam/ipam_test.go

@@ -21,18 +21,20 @@ import (
 	"github.com/Azure/azure-container-networking/common"
 )
 
-var ipamQueryUrl = "localhost:42424"
-var ipamQueryResponse = "" +
-	"<Interfaces>" +
-	"	<Interface MacAddress=\"*\" IsPrimary=\"true\">" +
-	"		<IPSubnet Prefix=\"10.0.0.0/16\">" +
-	"			<IPAddress Address=\"10.0.0.4\" IsPrimary=\"true\"/>" +
-	"			<IPAddress Address=\"10.0.0.5\" IsPrimary=\"false\"/>" +
-	"			<IPAddress Address=\"10.0.0.6\" IsPrimary=\"false\"/>" +
-	"			<IPAddress Address=\"10.0.0.7\" IsPrimary=\"false\"/>" +
-	"		</IPSubnet>" +
-	"	</Interface>" +
-	"</Interfaces>"
+var (
+	ipamQueryUrl      = "localhost:42424"
+	ipamQueryResponse = "" +
+		"<Interfaces>" +
+		"	<Interface MacAddress=\"*\" IsPrimary=\"true\">" +
+		"		<IPSubnet Prefix=\"10.0.0.0/16\">" +
+		"			<IPAddress Address=\"10.0.0.4\" IsPrimary=\"true\"/>" +
+		"			<IPAddress Address=\"10.0.0.5\" IsPrimary=\"false\"/>" +
+		"			<IPAddress Address=\"10.0.0.6\" IsPrimary=\"false\"/>" +
+		"			<IPAddress Address=\"10.0.0.7\" IsPrimary=\"false\"/>" +
+		"		</IPSubnet>" +
+		"	</Interface>" +
+		"</Interfaces>"
+)
 
 func TestIpam(t *testing.T) {
 	RegisterFailHandler(Fail)
@@ -73,11 +75,11 @@ var (
 	err         error
 	endpointID1 = uuid.New().String()
 
-	//this usedAddresses map is to test not duplicate IP's
+	// this usedAddresses map is to test not duplicate IP's
 	// have been provided throughout this test execution
 	UsedAddresses = map[string]string{}
 
-	//below is the network,used to test if the IP's provided by IPAM
+	// below is the network,used to test if the IP's provided by IPAM
 	// is in the the space requested.
 	network = net.IPNet{IP: net.ParseIP("10.0.0.0"), Mask: net.CIDRMask(16, 32)}
 
@@ -104,9 +106,7 @@ var (
 	})
 
 	_ = Describe("Test IPAM", func() {
-
 		Context("IPAM start", func() {
-
 			var config common.PluginConfig
 
 			It("Create IPAM plugin", func() {
@@ -127,7 +127,6 @@ var (
 		})
 
 		Describe("Test IPAM ADD and DELETE pool", func() {
-
 			var result *cniTypesCurr.Result
 
 			Context("When ADD with nothing, call for ipam triggering request pool and address", func() {
@@ -153,7 +152,6 @@ var (
 					Expect(err).ShouldNot(HaveOccurred())
 
 					delete(UsedAddresses, result.IPs[0].Address.IP.String())
-
 				})
 			})
 
@@ -167,7 +165,6 @@ var (
 		})
 
 		Describe("Test IPAM ADD and DELETE address", func() {
-
 			Context("When address is given", func() {
 				It("Request pool and address successfully", func() {
 					arg.StdinData = getStdinData("0.4.0", "", "10.0.0.6")
@@ -217,14 +214,13 @@ var (
 
 					AssertProperAddressSpace(result.IPs[0].Address)
 
-					//release the container ID for next test
+					// release the container ID for next test
 					arg.ContainerID = ""
 				})
 			})
 		})
 
 		Describe("Test IPAM DELETE", func() {
-
 			Context("Delete when only container id is given", func() {
 				It("Deleted", func() {
 					arg.StdinData = getStdinData("0.4.0", "10.0.0.0/16", "")
@@ -236,13 +232,11 @@ var (
 					address := UsedAddresses[arg.ContainerID]
 
 					RemoveAddressUsage(address, arg.ContainerID)
-
 				})
 			})
 
 			Context("When address and subnet is given", func() {
 				It("Release address successfully", func() {
-
 					nextAddress := GetNextAddress()
 					arg.StdinData = getStdinData("0.4.0", "10.0.0.0/16", nextAddress)
 					err = plugin.Delete(arg)
@@ -291,15 +285,15 @@ var (
 )
 
 func GetNextAddress() string {
-	//return first value
+	// return first value
 	for a := range UsedAddresses {
 		return a
 	}
 	return ""
 }
 
 func AssertAddressNotInUse(address string) {
-	//confirm if IP is in use by other invocation
+	// confirm if IP is in use by other invocation
 	_, exists := UsedAddresses[address]
 
 	Expect(exists).Should(BeFalse())
@@ -325,7 +319,7 @@ func RemoveAddressUsage(address, containerId string) {
 }
 
 func AssertProperAddressSpace(address net.IPNet) {
-	//validate the IP is part of this network IP space
+	// validate the IP is part of this network IP space
 	Expect(network.Contains(address.IP)).Should(Equal(true))
 	Expect(address.Mask).Should(Equal(network.Mask))
 }

cni/netconfig.go

@@ -28,6 +28,7 @@ type PortMapping struct {
 	Protocol      string `json:"protocol"`
 	HostIp        string `json:"hostIP,omitempty"`
 }
+
 type RuntimeConfig struct {
 	PortMappings []PortMapping    `json:"portMappings,omitempty"`
 	DNS          RuntimeDNSConfig `json:"dns,omitempty"`

cni/network/invoker.go

@@ -13,9 +13,9 @@ import (
 // or simply act as a client to an external ipam, such as azure-cns.
 type IPAMInvoker interface {
 
-	//Add returns two results, one IPv4, the other IPv6.
+	// Add returns two results, one IPv4, the other IPv6.
 	Add(nwCfg *cni.NetworkConfig, args *cniSkel.CmdArgs, subnetPrefix *net.IPNet, options map[string]interface{}) (*cniTypesCurr.Result, *cniTypesCurr.Result, error)
 
-	//Delete calls to the invoker source, and returns error. Returning an error here will fail the CNI Delete call.
+	// Delete calls to the invoker source, and returns error. Returning an error here will fail the CNI Delete call.
 	Delete(address *net.IPNet, nwCfg *cni.NetworkConfig, args *cniSkel.CmdArgs, options map[string]interface{}) error
 }

cni/network/invoker_azure.go

@@ -45,7 +45,7 @@ func (invoker *AzureIPAMInvoker) Add(nwCfg *cni.NetworkConfig, _ *cniSkel.CmdArg
 	result, err = invoker.plugin.DelegateAdd(nwCfg.Ipam.Type, nwCfg)
 	if err != nil {
 		err = invoker.plugin.Errorf("Failed to allocate pool: %v", err)
-		return nil, nil, err	
+		return nil, nil, err
 	}
 
 	defer func() {
@@ -83,7 +83,6 @@ func (invoker *AzureIPAMInvoker) Add(nwCfg *cni.NetworkConfig, _ *cniSkel.CmdArg
 }
 
 func (invoker *AzureIPAMInvoker) Delete(address *net.IPNet, nwCfg *cni.NetworkConfig, _ *cniSkel.CmdArgs, options map[string]interface{}) error {
-
 	if nwCfg == nil {
 		return invoker.plugin.Errorf("nil nwCfg passed to CNI ADD, stack: %+v", string(debug.Stack()))
 	}

cni/network/invoker_cns.go

@@ -48,7 +48,7 @@ func NewCNSInvoker(podName, namespace string) (*CNSIPAMInvoker, error) {
 	}, err
 }
 
-//Add uses the requestipconfig API in cns, and returns ipv4 and a nil ipv6 as CNS doesn't support IPv6 yet
+// Add uses the requestipconfig API in cns, and returns ipv4 and a nil ipv6 as CNS doesn't support IPv6 yet
 func (invoker *CNSIPAMInvoker) Add(nwCfg *cni.NetworkConfig, args *cniSkel.CmdArgs, hostSubnetPrefix *net.IPNet, options map[string]interface{}) (*cniTypesCurr.Result, *cniTypesCurr.Result, error) {
 	// Parse Pod arguments.
 	podInfo := cns.KubernetesPodInfo{

cni/network/network.go

@@ -1201,7 +1201,7 @@ func determineSnat() (bool, bool, error) {
 					}
 
 					jsonStr, _ := json.Marshal(snatConfig)
-					fp, err := os.OpenFile(snatConfigFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.FileMode(0664))
+					fp, err := os.OpenFile(snatConfigFile, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, os.FileMode(0o664))
 					if err == nil {
 						fp.Write(jsonStr)
 						fp.Close()

cni/network/network_windows.go

@@ -29,8 +29,6 @@ var (
 	win1903Version = 18362
 )
 
-
-
 /* handleConsecutiveAdd handles consecutive add calls for infrastructure containers on Windows platform.
  * This is a temporary work around for issue #57253 of Kubernetes.
  * We can delete this if statement once they fix it.
@@ -289,9 +287,7 @@ func getPoliciesFromRuntimeCfg(nwCfg *cni.NetworkConfig) []policy.Policy {
 }
 
 func addIPV6EndpointPolicy(nwInfo network.NetworkInfo) (policy.Policy, error) {
-	var (
-		eppolicy policy.Policy
-	)
+	var eppolicy policy.Policy
 
 	if len(nwInfo.Subnets) < 2 {
 		return eppolicy, fmt.Errorf("network state doesn't have ipv6 subnet")