all: lint fixes

- use newer build constraint format
- run go fmt ./...
- fix uses of deprecated ioutil package
- don't shadow builtin identifier "max"
- ovsdb/internal/jsonrpc: ignore gosec rule G102 for test helper

Author: anitgandhi

ovs/action.go

@@ -456,7 +456,7 @@ func (a *outputFieldAction) GoString() string {
 // applies multipath link selection `algorithm` (with parameter `arg`)
 // to choose one of `n_links` output links numbered 0 through n_links
 // minus 1, and stores the link into `dst`, which must be a field or
-// subfield in the syntax described under ``Field Specifications’’
+// subfield in the syntax described under “Field Specifications’’
 // above.
 // https://www.openvswitch.org/support/dist-docs/ovs-actions.7.txt
 func Multipath(fields string, basis int, algorithm string, nlinks int, arg int, dst string) Action {

ovs/client.go

@@ -18,7 +18,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os/exec"
 	"strings"
@@ -145,7 +144,7 @@ func shellPipe(stdin io.Reader, cmd string, args ...string) ([]byte, error) {
 	}
 
 	mr := io.MultiReader(stdout, stderr)
-	b, err := ioutil.ReadAll(mr)
+	b, err := io.ReadAll(mr)
 	if err != nil {
 		return nil, err
 	}

ovs/datapath_test.go

@@ -265,7 +265,7 @@ func TestGetCTLimits(t *testing.T) {
 				}
 			case handleError:
 				if err != nil && err.Error() != tt.err {
-					t.Errorf(err.Error())
+					t.Error(err.Error())
 				}
 			default:
 				t.Log("pass")
@@ -346,7 +346,7 @@ func TestGetCTLimitsWithBinary(t *testing.T) {
 				}
 			case handleError:
 				if err != nil && err.Error() != tt.err {
-					t.Errorf(err.Error())
+					t.Error(err.Error())
 				}
 
 			default:
@@ -426,7 +426,7 @@ func TestCtSetLimitsArgsToString(t *testing.T) {
 			got, err := ctSetLimitsArgsToString(tt.zone)
 			if err != nil {
 				if err.Error() != tt.err {
-					t.Errorf(err.Error())
+					t.Error(err.Error())
 				}
 			}
 			if got != tt.want1 && got != tt.want2 {

ovs/matchparser.go

@@ -116,23 +116,23 @@ func parseMatch(key string, value string) (Match, error) {
 }
 
 // parseClampInt calls strconv.Atoi on s, and then ensures that s is less than
-// or equal to the integer specified by max.
-func parseClampInt(s string, max int) (int, error) {
+// or equal to the integer specified by upper.
+func parseClampInt(s string, upper int) (int, error) {
 	t, err := strconv.Atoi(s)
 	if err != nil {
 		return 0, err
 	}
-	if t > max {
-		return 0, fmt.Errorf("integer %d too large; %d > %d", t, t, max)
+	if t > upper {
+		return 0, fmt.Errorf("integer %d too large; %d > %d", t, t, upper)
 	}
 
 	return t, nil
 }
 
 // parseIntMatch parses an integer Match value from the input key and value,
-// with a maximum possible value of max.
-func parseIntMatch(key string, value string, max int) (Match, error) {
-	t, err := parseClampInt(value, max)
+// with a maximum possible value of upper.
+func parseIntMatch(key string, value string, upper int) (Match, error) {
+	t, err := parseClampInt(value, upper)
 	if err != nil {
 		return nil, err
 	}
@@ -176,8 +176,8 @@ func parseIntMatch(key string, value string, max int) (Match, error) {
 }
 
 // parsePort parses a port or port/mask Match value from the input key and value,
-// with a maximum possible value of max.
-func parsePort(key string, value string, max int) (Match, error) {
+// with a maximum possible value of upper.
+func parsePort(key string, value string, upper int) (Match, error) {
 
 	var values []uint64
 	//Split the string
@@ -186,7 +186,7 @@ func parsePort(key string, value string, max int) (Match, error) {
 	//If input is just port
 	switch len(ss) {
 	case 1:
-		val, err := parseClampInt(value, max)
+		val, err := parseClampInt(value, upper)
 		if err != nil {
 			return nil, err
 		}
@@ -200,8 +200,8 @@ func parsePort(key string, value string, max int) (Match, error) {
 				return nil, err
 			}
 			// Return error if val > 65536 (uint16)
-			if val > uint64(max) {
-				return nil, fmt.Errorf("integer %d too large; %d > %d", val, val, max)
+			if val > uint64(upper) {
+				return nil, fmt.Errorf("integer %d too large; %d > %d", val, val, upper)
 			}
 
 			values = append(values, val)

ovs/portstats.go

@@ -64,8 +64,9 @@ type PortStatsTransmit struct {
 
 // UnmarshalText unmarshals a PortStats from textual form as output by
 // 'ovs-ofctl dump-ports':
-//    port  1: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0
-//             tx pkts=0, bytes=0, drop=0, errs=0, coll=0
+//
+//	port  1: rx pkts=0, bytes=0, drop=0, errs=0, frame=0, over=0, crc=0
+//	         tx pkts=0, bytes=0, drop=0, errs=0, coll=0
 func (p *PortStats) UnmarshalText(b []byte) error {
 	// Make a copy per documentation for encoding.TextUnmarshaler.
 	s := string(b)

ovs/table.go

@@ -39,8 +39,9 @@ type Table struct {
 
 // UnmarshalText unmarshals a Table from textual form as output by
 // 'ovs-ofctl dump-tables':
-//  0: classifier: wild=0x3fffff, max=1000000, active=0
-//                 lookup=0, matched=0
+//
+//	0: classifier: wild=0x3fffff, max=1000000, active=0
+//	               lookup=0, matched=0
 func (t *Table) UnmarshalText(b []byte) error {
 	// Make a copy per documentation for encoding.TextUnmarshaler.
 	s := string(b)

ovsdb/internal/jsonrpc/testconn.go

@@ -51,7 +51,7 @@ func TestConn(t *testing.T, fn TestFunc) (*Conn, chan<- *Response, func()) {
 func TestNetConn(t *testing.T, fn TestFunc) (net.Conn, chan<- *Response, func()) {
 	t.Helper()
 
-	l, err := net.Listen("tcp", ":0")
+	l, err := net.Listen("tcp", ":0") // #nosec G102
 	if err != nil {
 		t.Fatalf("failed to listen: %v", err)
 	}

ovsnl/client_linux_integration_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//+build linux
+//go:build linux
 
 package ovsnl_test
 

ovsnl/client_linux_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//+build linux
+//go:build linux
 
 package ovsnl
 

ovsnl/datapath_linux_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//+build linux
+//go:build linux
 
 package ovsnl