Bump go 1.19.6

This bump up go into 1.19.6 and fixes lint errors generated
in CI after upgrading go version.

Signed-off-by: Periyasamy Palanisamy <[email protected]>

Author: pperiyasamy

.github/workflows/ci.yml

@@ -12,10 +12,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
 
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v2
+    - name: Set up Go 1.19.6
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.18
+        go-version: 1.19.6
       id: go
 
     - name: Install benchstat
@@ -82,10 +82,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Set up Go 1.18
-      uses: actions/setup-go@v1
+    - name: Set up Go 1.19.6
+      uses: actions/setup-go@v3
       with:
-        go-version: 1.18
+        go-version: 1.19.6
       id: go
 
     - name: Check out code into the Go module directory

cache/doc.go

@@ -3,7 +3,7 @@ Package cache provides a cache of model.Model elements that can be used in an OV
 
 The cache can be accessed using a simple API:
 
-    cache.Table("Open_vSwitch").Row("<ovs-uuid>")
+	cache.Table("Open_vSwitch").Row("<ovs-uuid>")
 
 It implements the ovsdb.NotificationHandler interface
 such that it can be populated automatically by

client/api_test_model.go

@@ -128,7 +128,7 @@ func (*testLogicalSwitch) Table() string {
 	return "Logical_Switch"
 }
 
-//LogicalSwitchPort struct defines an object in Logical_Switch_Port table
+// LogicalSwitchPort struct defines an object in Logical_Switch_Port table
 type testLogicalSwitchPort struct {
 	UUID             string            `ovsdb:"_uuid"`
 	Up               *bool             `ovsdb:"up"`

client/doc.go

@@ -4,30 +4,29 @@ Package client connects to, monitors and interacts with OVSDB servers (RFC7047).
 This package uses structs, that contain the 'ovs' field tag to determine which field goes to
 which column in the database. We refer to pointers to this structs as Models. Example:
 
-   type MyLogicalSwitch struct {
-   	UUID   string            `ovsdb:"_uuid"` // _uuid tag is mandatory
-   	Name   string            `ovsdb:"name"`
-   	Ports  []string          `ovsdb:"ports"`
-   	Config map[string]string `ovsdb:"other_config"`
-   }
+	type MyLogicalSwitch struct {
+		UUID   string            `ovsdb:"_uuid"` // _uuid tag is mandatory
+		Name   string            `ovsdb:"name"`
+		Ports  []string          `ovsdb:"ports"`
+		Config map[string]string `ovsdb:"other_config"`
+	}
 
 Based on these Models a Database Model (see ClientDBModel type) is built to represent
 the entire OVSDB:
 
-   clientDBModel, _ := client.NewClientDBModel("OVN_Northbound",
-       map[string]client.Model{
-   	"Logical_Switch": &MyLogicalSwitch{},
-   })
-
+	clientDBModel, _ := client.NewClientDBModel("OVN_Northbound",
+	    map[string]client.Model{
+		"Logical_Switch": &MyLogicalSwitch{},
+	})
 
 The ClientDBModel represents the entire Database (or the part of it we're interested in).
 Using it, the libovsdb.client package is able to properly encode and decode OVSDB messages
 and store them in Model instances.
 A client instance is created by simply specifying the connection information and the database model:
 
-     ovs, _ := client.Connect(context.Background(), clientDBModel)
+	ovs, _ := client.Connect(context.Background(), clientDBModel)
 
-Main API
+# Main API
 
 After creating a OvsdbClient using the Connect() function, we can use a number of CRUD-like
 to interact with the database:
@@ -43,7 +42,7 @@ and passed to client.Transact().
 Others, such as List() and Get(), interact with the client's internal cache and are able to
 return Model instances (or a list thereof) directly.
 
-Conditions
+# Conditions
 
 Some API functions (Create() and Get()), can be run directly. Others, require us to use
 a ConditionalAPI. The ConditionalAPI injects RFC7047 Conditions into ovsdb Operations as well as
@@ -111,15 +110,15 @@ cache element, an operation will be created matching on the "_uuid" column. The
 quite large depending on the cache size and the provided function. Most likely there is a way to express the
 same condition using Where() or WhereAll() which will be more efficient.
 
-Get
+# Get
 
 Get() operation is a simple operation capable of retrieving one Model based on some of its schema indexes. E.g:
 
 	ls := &LogicalSwitch{UUID:"myUUID"}
 	err := ovs.Get(ls)
 	fmt.Printf("Name of the switch is: &s", ls.Name)
 
-List
+# List
 
 List() searches the cache and populates a slice of Models. It can be used directly or using WhereCache()
 
@@ -131,7 +130,7 @@ List() searches the cache and populates a slice of Models. It can be used direct
 	    	return strings.HasPrefix(ls.Name, "ext_")
 	}).List(lsList)
 
-Create
+# Create
 
 Create returns a list of operations to create the models provided. E.g:
 
@@ -143,7 +142,7 @@ Update returns a list of operations to update the matching rows to match the val
 	ls := &LogicalSwitch{ExternalIDs: map[string]string {"foo": "bar"}}
 	ops, err := ovs.Where(...).Update(&ls, &ls.ExternalIDs}
 
-Mutate
+# Mutate
 
 Mutate returns a list of operations needed to mutate the matching rows as described by the list of Mutation objects. E.g:
 
@@ -154,11 +153,10 @@ Mutate returns a list of operations needed to mutate the matching rows as descri
 		Value:   map[string]string{"foo":"bar"},
 	})
 
-Delete
+# Delete
 
 Delete returns a list of operations needed to delete the matching rows. E.g:
 
 	ops, err := ovs.Where(...).Delete()
-
 */
 package client

cmd/modelgen/main.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"path/filepath"
@@ -56,7 +56,7 @@ func main() {
 	}
 	defer schemaFile.Close()
 
-	schemaBytes, err := ioutil.ReadAll(schemaFile)
+	schemaBytes, err := io.ReadAll(schemaFile)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/print_schema/print_schema.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"log"
 	"os"
 	"runtime"
@@ -53,7 +53,7 @@ func main() {
 	}
 	defer schemaFile.Close()
 
-	schemaBytes, err := ioutil.ReadAll(schemaFile)
+	schemaBytes, err := io.ReadAll(schemaFile)
 	if err != nil {
 		log.Fatal(err)
 	}

go.mod

@@ -1,6 +1,6 @@
 module github.com/ovn-org/libovsdb
 
-go 1.18
+go 1.19
 
 require (
 	github.com/cenkalti/backoff/v4 v4.1.3

mapper/mapper.go

@@ -12,12 +12,14 @@ import (
 // to what column in the database id through field a field tag.
 // The tag used is "ovsdb" and has the following structure
 // 'ovsdb:"${COLUMN_NAME}"'
+//
 //	where COLUMN_NAME is the name of the column and must match the schema
 //
-//Example:
-//  type MyObj struct {
-//  	Name string `ovsdb:"name"`
-//  }
+// Example:
+//
+//	type MyObj struct {
+//		Name string `ovsdb:"name"`
+//	}
 type Mapper struct {
 	Schema ovsdb.DatabaseSchema
 }

model/model.go

@@ -16,12 +16,13 @@ import (
 // The struct may also have non-tagged fields (which will be ignored by the API calls)
 // The Model interface must be implemented by the pointer to such type
 // Example:
-//type MyLogicalRouter struct {
-//	UUID          string            `ovsdb:"_uuid"`
-//	Name          string            `ovsdb:"name"`
-//	ExternalIDs   map[string]string `ovsdb:"external_ids"`
-//	LoadBalancers []string          `ovsdb:"load_balancer"`
-//}
+//
+//	type MyLogicalRouter struct {
+//		UUID          string            `ovsdb:"_uuid"`
+//		Name          string            `ovsdb:"name"`
+//		ExternalIDs   map[string]string `ovsdb:"external_ids"`
+//		LoadBalancers []string          `ovsdb:"load_balancer"`
+//	}
 type Model interface{}
 
 type CloneableModel interface {

modelgen/doc.go

@@ -2,6 +2,5 @@
 Package modelgen provides core functionality to implement Model code generators based on a schema.
 
 It allows to create and customize a text/template that can generate the Model types that libovsdb can work with.
-
 */
 package modelgen

modelgen/generator.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"fmt"
 	"go/format"
-	"io/ioutil"
 	"log"
+	"os"
 	"text/template"
 )
 
@@ -47,11 +47,11 @@ func (g *generator) Generate(filename string, tmpl *template.Template, args inte
 		fmt.Print("\n")
 		return nil
 	}
-	content, err := ioutil.ReadFile(filename)
+	content, err := os.ReadFile(filename)
 	if err == nil && bytes.Equal(content, src) {
 		return nil
 	}
-	return ioutil.WriteFile(filename, src, 0644)
+	return os.WriteFile(filename, src, 0644)
 }
 
 // NewGenerator returns a new Generator

ovsdb/schema.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"os"
 	"strings"
@@ -48,7 +47,7 @@ func (schema DatabaseSchema) Print(w io.Writer) {
 
 // SchemaFromFile returns a DatabaseSchema from a file
 func SchemaFromFile(f *os.File) (DatabaseSchema, error) {
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return DatabaseSchema{}, err
 	}
@@ -124,7 +123,7 @@ of this library, we define an ExtendedType that includes all possible column typ
 atomic fields).
 */
 
-//ExtendedType includes atomic types as defined in the RFC plus Enum, Map and Set
+// ExtendedType includes atomic types as defined in the RFC plus Enum, Map and Set
 type ExtendedType = string
 
 // RefType is used to define the possible RefTypes