Cleanup code

Author: kenshaw

.golangci.yml

@@ -0,0 +1,37 @@
+version: "2"
+linters:
+  default: all
+  disable:
+    - cyclop
+    - depguard
+    - err113
+    - errcheck
+    - exhaustruct
+    - funlen
+    - gochecknoglobals
+    - gochecknoinits
+    - gocognit
+    - goconst
+    - lll
+    - maintidx
+    - mnd
+    - nestif
+    - nilnil
+    - nlreturn
+    - paralleltest
+    - prealloc
+    - sqlclosecheck
+    - testableexamples
+    - testpackage
+    - varnamelen
+    - wrapcheck
+    - wsl
+  settings:
+    gosec:
+      excludes:
+        - G101
+        - G304
+        - G390
+    gocritic:
+      disabled-checks:
+        - exitAfterDefer

dburl.go

@@ -128,7 +128,8 @@ func Parse(urlstr string) (*URL, error) {
 		// determine scheme for file
 		s := u.opaqueOrPath()
 		switch {
-		case u.Transport != "tcp", strings.Index(u.OriginalScheme, "+") != -1:
+		case u.Transport != "tcp",
+			strings.Contains(u.OriginalScheme, "+"):
 			return nil, ErrInvalidTransportProtocol
 		case s == "":
 			return nil, ErrMissingPath
@@ -386,11 +387,7 @@ var Stat = func(name string) (fs.FileInfo, error) {
 //
 // Used internally to read file headers.
 var OpenFile = func(name string) (fs.File, error) {
-	f, err := os.OpenFile(name, os.O_RDONLY, 0)
-	if err != nil {
-		return nil, err
-	}
-	return f, nil
+	return os.OpenFile(name, os.O_RDONLY, 0)
 }
 
 // BuildURL creates a dsn using the mapped components.
@@ -556,7 +553,6 @@ func getComponent(m map[string]any, v ...string) (string, bool) {
 	if z, ok := getFirst(m, v...); ok {
 		str := fmt.Sprintf("%v", z)
 		return str, str != ""
-
 	}
 	return "", false
 }

dburl_test.go

@@ -57,8 +57,7 @@ func TestBadParse(t *testing.T) {
 		{`databend://`, ErrMissingHost},
 		{`unknown_file.ext3`, ErrInvalidDatabaseScheme},
 	}
-	for i, tt := range tests {
-		test := tt
+	for i, test := range tests {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			testBadParse(t, test.s, test.exp)
 		})
@@ -986,8 +985,7 @@ func TestParse(t *testing.T) {
 		},
 	}
 	m := make(map[string]bool)
-	for i, tt := range tests {
-		test := tt
+	for i, test := range tests {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			if _, ok := m[test.s]; ok {
 				t.Fatalf("%s is already tested", test.s)

dsn.go

@@ -9,7 +9,7 @@ import (
 )
 
 // OdbcIgnoreQueryPrefixes are the query prefixes to ignore when generating the
-// odbc DSN. Used by GenOdbc
+// odbc DSN. Used by [GenOdbc].
 var OdbcIgnoreQueryPrefixes []string
 
 // GenScheme returns a generator that will generate a scheme based on the
@@ -427,7 +427,7 @@ func GenOdbc(u *URL) (string, string, error) {
 	}
 	// build q
 	q := u.Query()
-	q.Set("Driver", "{"+strings.Replace(u.Transport, "+", " ", -1)+"}")
+	q.Set("Driver", "{"+strings.ReplaceAll(u.Transport, "+", " ")+"}")
 	q.Set("Server", host)
 	if port == "" {
 		proto := strings.ToLower(u.Transport)
@@ -458,7 +458,7 @@ func GenOdbc(u *URL) (string, string, error) {
 func GenOleodbc(u *URL) (string, string, error) {
 	props, _, err := GenOdbc(u)
 	if err != nil {
-		return "", "", nil
+		return "", "", err
 	}
 	return `Provider=MSDASQL.1;Extended Properties="` + props + `"`, "", nil
 }
@@ -518,9 +518,10 @@ func GenPresto(u *URL) (string, string, error) {
 	}
 	// force port
 	if z.Port() == "" {
-		if z.Scheme == "http" {
+		switch z.Scheme {
+		case "http":
 			z.Host += ":8080"
-		} else if z.Scheme == "https" {
+		case "https":
 			z.Host += ":8443"
 		}
 	}
@@ -562,16 +563,12 @@ func GenSnowflake(u *URL) (string, string, error) {
 
 // GenSpanner generates a spanner DSN from the passed URL.
 func GenSpanner(u *URL) (string, string, error) {
-	project, instance, dbname := u.Hostname(), "", strings.TrimPrefix(u.Path, "/")
+	project := u.Hostname()
 	if project == "" {
 		return "", "", ErrMissingHost
 	}
-	i := strings.Index(dbname, "/")
-	if i == -1 {
-		return "", "", ErrMissingPath
-	}
-	instance, dbname = dbname[:i], dbname[i+1:]
-	if instance == "" || dbname == "" {
+	instance, dbname, ok := strings.Cut(strings.TrimPrefix(u.Path, "/"), "/")
+	if !ok || instance == "" || dbname == "" {
 		return "", "", ErrMissingPath
 	}
 	return fmt.Sprintf(`projects/%s/instances/%s/databases/%s`, project, instance, dbname), "", nil
@@ -608,13 +605,14 @@ func GenSqlserver(u *URL) (string, string, error) {
 func GenTableStore(u *URL) (string, string, error) {
 	var transport string
 	splits := strings.Split(u.OriginalScheme, "+")
-	if len(splits) == 0 {
+	switch {
+	case len(splits) == 0:
 		return "", "", ErrInvalidDatabaseScheme
-	} else if len(splits) == 1 || splits[1] == "https" {
+	case len(splits) == 1, splits[1] == "https":
 		transport = "https"
-	} else if splits[1] == "http" {
+	case splits[1] == "http":
 		transport = "http"
-	} else {
+	default:
 		return "", "", ErrInvalidTransportProtocol
 	}
 	z := &url.URL{
@@ -708,6 +706,8 @@ func genOptionsOdbc(q url.Values, skipWhenEmpty bool, ignore, ignorePrefixes []s
 // following:
 //
 //	genOptions(u.Query(), "", "=", ";", ",", false)
+//
+//nolint:unparam
 func genOptions(q url.Values, joiner, assign, sep, valSep string, skipWhenEmpty bool, ignore, ignorePrefixes []string) string {
 	if len(q) == 0 {
 		return ""

example_test.go

@@ -12,6 +12,7 @@ func Example() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	defer db.Close()
 	res, err := db.Query("SELECT ...")
 	if err != nil {
 		log.Fatal(err)
@@ -33,6 +34,7 @@ func Example_parse() {
 	if err != nil {
 		log.Fatal(err)
 	}
+	defer db.Close()
 	res, err := db.Query("SELECT ...")
 	if err != nil {
 		log.Fatal(err)

passfile/passfile.go

@@ -53,12 +53,12 @@ func Parse(r io.Reader) ([]Entry, error) {
 		// split and check length
 		v := strings.Split(line, ":")
 		if len(v) != 6 {
-			return nil, &ErrInvalidEntry{i}
+			return nil, &InvalidEntryError{i}
 		}
 		// make sure no blank entries exist
 		for j := range v {
 			if v[j] == "" {
-				return nil, &ErrEmptyField{i, j}
+				return nil, &EmptyFieldError{i, j}
 			}
 		}
 		entries = append(entries, NewEntry(v))
@@ -260,23 +260,23 @@ func (err *FileError) Unwrap() error {
 	return err.Err
 }
 
-// ErrInvalidEntry is the invalid entry error.
-type ErrInvalidEntry struct {
+// InvalidEntryError is the invalid entry error.
+type InvalidEntryError struct {
 	Line int
 }
 
 // Error satisfies the error interface.
-func (err *ErrInvalidEntry) Error() string {
+func (err *InvalidEntryError) Error() string {
 	return fmt.Sprintf("invalid entry at line %d", err.Line)
 }
 
-// ErrEmptyField is the empty field error.
-type ErrEmptyField struct {
+// EmptyFieldError is the empty field error.
+type EmptyFieldError struct {
 	Line  int
 	Field int
 }
 
 // Error satisfies the error interface.
-func (err *ErrEmptyField) Error() string {
+func (err *EmptyFieldError) Error() string {
 	return fmt.Sprintf("line %d has empty field %d", err.Line, err.Field)
 }