Update golangci-lint and turn it on in CI

cmd/schemagen/map_types.go

@@ -74,9 +74,9 @@ func mapScyllaToGoType(s string) string {
 
 		typeStr := "struct {\n"
 		for i, t := range types {
-			typeStr = typeStr + "\t\tField" + strconv.Itoa(i+1) + " " + mapScyllaToGoType(t) + "\n"
+			typeStr += "\t\tField" + strconv.Itoa(i+1) + " " + mapScyllaToGoType(t) + "\n"
 		}
-		typeStr = typeStr + "\t}"
+		typeStr += "\t}"
 
 		return typeStr
 	}
@@ -96,8 +96,8 @@ func typeToString(t interface{}) string {
 		return t.(gocql.NativeType).String()
 	case "gocql.CollectionType":
 		collectionType := t.(gocql.CollectionType).String()
-		collectionType = strings.Replace(collectionType, "(", "<", -1)
-		collectionType = strings.Replace(collectionType, ")", ">", -1)
+		collectionType = strings.ReplaceAll(collectionType, "(", "<")
+		collectionType = strings.ReplaceAll(collectionType, ")", ">")
 		return collectionType
 	default:
 		panic(fmt.Sprintf("Did not expect %v type in user defined type", tType))

cmd/schemagen/schemagen.go

@@ -15,6 +15,7 @@ import (
 	"strings"
 
 	"github.com/gocql/gocql"
+
 	"github.com/scylladb/gocqlx/v2"
 	_ "github.com/scylladb/gocqlx/v2/table"
 )
@@ -31,10 +32,8 @@ var (
 	flagIgnoreIndexes = cmd.Bool("ignore-indexes", false, "don't generate types for indexes")
 )
 
-var (
-	//go:embed keyspace.tmpl
-	keyspaceTmpl string
-)
+//go:embed keyspace.tmpl
+var keyspaceTmpl string
 
 func main() {
 	err := cmd.Parse(os.Args[1:])
@@ -80,7 +79,6 @@ func renderTemplate(md *gocql.KeyspaceMetadata) ([]byte, error) {
 		Funcs(template.FuncMap{"mapScyllaToGoType": mapScyllaToGoType}).
 		Funcs(template.FuncMap{"typeToString": typeToString}).
 		Parse(keyspaceTmpl)
-
 	if err != nil {
 		log.Fatalln("unable to parse models template:", err)
 	}
@@ -169,7 +167,7 @@ func existsInSlice(s []string, v string) bool {
 // The second element contains the name of the type.
 //
 //	[["<my_type,", "my_type"] ["my_other_type>", "my_other_type"]]
-var userTypes = regexp.MustCompile(`(?:<|\s)(\w+)(?:>|,)`) // match all types contained in set<X>, list<X>, tuple<A, B> etc.
+var userTypes = regexp.MustCompile(`(?:<|\s)(\w+)[>,]`) // match all types contained in set<X>, list<X>, tuple<A, B> etc.
 
 // usedInTables reports whether the typeName is used in any of columns of the provided tables.
 func usedInTables(typeName string, tables map[string]*gocql.TableMetadata) bool {

cmd/schemagen/schemagen_test.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/gocql/gocql"
 	"github.com/google/go-cmp/cmp"
+
 	"github.com/scylladb/gocqlx/v2/gocqlxtest"
 )