Fix/ignore outstanding linting issues

mmdbtype/types.go

@@ -9,6 +9,7 @@ import (
 	"math/big"
 	"math/bits"
 	"reflect"
+	//nolint:depguard // sort.Strings is not worth pulling in a new dep for
 	"sort"
 )
 
@@ -705,16 +706,16 @@ const (
 func writeCtrlByte(w writer, t DataType) (int64, error) {
 	size := t.size()
 
-	typeNum := t.typeNum()
+	typeN := t.typeNum()
 
 	var firstByte byte
 	var secondByte byte
 
-	if typeNum < 8 {
-		firstByte = byte(typeNum << 5)
+	if typeN < 8 {
+		firstByte = byte(typeN << 5)
 	} else {
 		firstByte = byte(typeNumExtended << 5)
-		secondByte = byte(typeNum - 7)
+		secondByte = byte(typeN - 7)
 	}
 
 	leftOver := 0
@@ -746,7 +747,7 @@ func writeCtrlByte(w writer, t DataType) (int64, error) {
 	if err != nil {
 		return 0, fmt.Errorf(
 			"writing first ctrl byte (type: %d, size: %d): %w",
-			typeNum,
+			typeN,
 			size,
 			err,
 		)
@@ -758,7 +759,7 @@ func writeCtrlByte(w writer, t DataType) (int64, error) {
 		if err != nil {
 			return numBytes, fmt.Errorf(
 				"writing second ctrl byte (type: %d, size: %d): %w",
-				typeNum,
+				typeN,
 				size,
 				err,
 			)
@@ -772,7 +773,7 @@ func writeCtrlByte(w writer, t DataType) (int64, error) {
 		if err != nil {
 			return numBytes, fmt.Errorf(
 				"writing remaining ctrl bytes (type: %d, size: %d, value: %d): %w",
-				typeNum,
+				typeN,
 				size,
 				v,
 				err,

tree.go

@@ -339,6 +339,7 @@ func (t *Tree) insertStringNetwork(
 	inserterFunc inserter.Func,
 	node *node,
 ) error {
+	//nolint:forbidigo // code predates netip
 	_, ipnet, err := net.ParseCIDR(network)
 	if err != nil {
 		return fmt.Errorf("parsing network (%s): %w", network, err)
@@ -353,6 +354,7 @@ var ipv4AliasNetworks = []string{
 }
 
 func (t *Tree) insertIPv4Aliases() error {
+	//nolint:forbidigo // code predates netip
 	_, ipv4Root, err := net.ParseCIDR("::/96")
 	if err != nil {
 		return fmt.Errorf("parsing IPv4 root: %w", err)

tree_test.go

@@ -486,12 +486,14 @@ func TestTreeInsertAndGet(t *testing.T) {
 					require.NoError(t, err)
 					if test.insertType == "" || test.insertType == "net" {
 						for _, insert := range test.inserts {
+							//nolint:forbidigo // code predates netip
 							_, network, err := net.ParseCIDR(insert.network)
 							require.NoError(t, err)
 
 							require.NoError(t, tree.Insert(network, insert.value))
 						}
 						for _, insert := range test.insertErrors {
+							//nolint:forbidigo // code predates netip
 							_, network, err := net.ParseCIDR(insert.network)
 							require.NoError(t, err)
 
@@ -501,16 +503,20 @@ func TestTreeInsertAndGet(t *testing.T) {
 						}
 					} else if test.insertType == "" || test.insertType == "range" {
 						for _, insert := range test.inserts {
+							//nolint:forbidigo // code predates netip
 							start := net.ParseIP(insert.start)
 							require.NotNil(t, start)
+							//nolint:forbidigo // code predates netip
 							end := net.ParseIP(insert.end)
 							require.NotNil(t, end)
 
 							require.NoError(t, tree.InsertRange(start, end, insert.value))
 						}
 						for _, insert := range test.insertErrors {
+							//nolint:forbidigo // code predates netip
 							start := net.ParseIP(insert.start)
 							require.NotNil(t, start)
+							//nolint:forbidigo // code predates netip
 							end := net.ParseIP(insert.end)
 							require.NotNil(t, end)
 
@@ -522,6 +528,7 @@ func TestTreeInsertAndGet(t *testing.T) {
 					tree.finalize()
 
 					for _, get := range test.gets {
+						//nolint:forbidigo // code predates netip
 						network, value := tree.Get(net.ParseIP(get.ip))
 
 						assert.Equal(t, get.expectedNetwork, network.String(), "network for %s", get.ip)
@@ -579,6 +586,7 @@ func checkMMDB(t *testing.T, buf *bytes.Buffer, gets []testGet, name string) {
 
 		for _, get := range gets {
 			var v any
+			//nolint:forbidigo // code predates netip
 			network, ok, err := reader.LookupNetwork(net.ParseIP(get.ip), &v)
 			require.NoError(t, err)
 
@@ -604,19 +612,22 @@ func TestInsertFunc_RemovalAndLaterInsert(t *testing.T) {
 	)
 	require.NoError(t, err)
 
+	//nolint:forbidigo // code predates netip
 	_, network, err := net.ParseCIDR("::1.1.1.0/120")
 	require.NoError(t, err)
 
 	value := mmdbtype.String("value")
 	require.NoError(t, tree.Insert(network, value))
 
+	//nolint:forbidigo // code predates netip
 	ip := net.ParseIP("::1.1.1.1")
 
 	recNetwork, recValue := tree.Get(ip)
 
 	assert.Equal(t, network, recNetwork)
 	assert.Equal(t, value, recValue)
 
+	//nolint:forbidigo // code predates netip
 	_, removedNetwork, err := net.ParseCIDR("::1.1.1.1/128")
 	require.NoError(t, err)