Fix linting errors

This commit is contained in:
Dan Sosedoff 2022-11-14 16:10:50 -06:00
parent 580c1093d1
commit 9bfec11b48
No known key found for this signature in database
GPG Key ID: 26186197D282B164
7 changed files with 32 additions and 15 deletions

View File

@ -28,6 +28,9 @@ test-all:
@./script/test_all.sh
@./script/test_cockroach.sh
lint:
golangci-lint run
dev:
go build
@echo "You can now execute ./pgweb"

View File

@ -533,7 +533,7 @@ func DataExport(c *gin.Context) {
if dump.Table != "" {
filename = filename + "_" + dump.Table
}
reg := regexp.MustCompile("[^._\\w]+")
reg := regexp.MustCompile(`[^._\\w]+`)
cleanFilename := reg.ReplaceAllString(filename, "")
c.Header(

View File

@ -139,10 +139,17 @@ func startTestBackend(ctx context.Context, listenAddr string) {
})
server := &http.Server{Addr: listenAddr, Handler: router}
go server.ListenAndServe()
go mustStartServer(server)
select {
case <-ctx.Done():
server.Shutdown(context.Background())
<-ctx.Done()
if err := server.Shutdown(context.Background()); err != nil && err != http.ErrServerClosed {
panic(err)
}
}
func mustStartServer(server *http.Server) {
err := server.ListenAndServe()
if err != nil && err != http.ErrServerClosed {
panic(err)
}
}

View File

@ -221,7 +221,10 @@ func openPage() {
return
}
exec.Command("open", url).Output()
_, err = exec.Command("open", url).Output()
if err != nil {
fmt.Println("Unable to auto-open pgweb URL:", err)
}
}
func Run() {

View File

@ -26,7 +26,7 @@ var (
func mapKeys(data map[string]*Objects) []string {
result := []string{}
for k, _ := range data {
for k := range data {
result = append(result, k)
}
return result
@ -421,8 +421,10 @@ func testHistoryUniqueness(t *testing.T) {
url := fmt.Sprintf("postgres://%s@%s:%s/%s?sslmode=disable", serverUser, serverHost, serverPort, serverDatabase)
client, _ := NewFromUrl(url, nil)
client.Query("SELECT * FROM books WHERE id = 1")
client.Query("SELECT * FROM books WHERE id = 1")
for i := 0; i < 3; i++ {
_, err := client.Query("SELECT * FROM books WHERE id = 1")
assert.NoError(t, err)
}
assert.Equal(t, 1, len(client.History))
assert.Equal(t, "SELECT * FROM books WHERE id = 1", client.History[0].Query)
@ -445,7 +447,8 @@ func testReadOnlyMode(t *testing.T) {
assert.Error(t, err, "query contains keywords not allowed in read-only mode")
// Turn off guard
client.db.Exec("SET default_transaction_read_only=off;")
_, err = client.db.Exec("SET default_transaction_read_only=off;")
assert.NoError(t, err)
_, err = client.Query("\nCREATE TABLE foobar(id integer);\n")
assert.NotNil(t, err)
@ -471,6 +474,7 @@ func TestAll(t *testing.T) {
setupClient()
testNewClientFromUrl(t)
testNewClientFromUrl2(t)
testClientIdleTime(t)
testTest(t)
testInfo(t)

View File

@ -5,6 +5,7 @@ import (
"encoding/csv"
"encoding/json"
"fmt"
"log"
"math"
"strconv"
"time"
@ -88,7 +89,9 @@ func (res *Result) CSV() []byte {
buff := &bytes.Buffer{}
writer := csv.NewWriter(buff)
writer.Write(res.Columns)
if err := writer.Write(res.Columns); err != nil {
log.Printf("result csv write error: %v\n", err)
}
for _, row := range res.Rows {
record := make([]string, len(res.Columns))

View File

@ -11,10 +11,7 @@ import (
func IsPortAvailable(port int) bool {
conn, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%v", port))
if err != nil {
if strings.Index(err.Error(), "connection refused") > 0 {
return true
}
return false
return strings.Index(err.Error(), "connection refused") > 0
}
conn.Close()