Skip to content

Commit eb424a8

Browse files
authored
Add golangci-lint (#1228)
1 parent ae12fff commit eb424a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+637
-325
lines changed

.github/workflows/build-test.yml

+4
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ jobs:
3535
uses: actions/setup-go@v5
3636
with:
3737
go-version: '1.21'
38+
- name: golangci-lint
39+
uses: golangci/golangci-lint-action@v6
40+
with:
41+
version: v1.60
3842
- name: Format, Lint
3943
shell: bash
4044
run: ./ci/build.sh

.golangci.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
run:
2+
tests: true
3+
4+
issues:
5+
exclude-rules:
6+
# we own this driver so we need to test this functions
7+
- path: statement_test.go
8+
text: "Drivers should implement StmtExecContext instead"
9+
- path: statement_test.go
10+
text: "Drivers should implement StmtQueryContext instead"

aaa_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@ import (
77
func TestShowServerVersion(t *testing.T) {
88
runDBTest(t, func(dbt *DBTest) {
99
rows := dbt.mustQuery("SELECT CURRENT_VERSION()")
10-
defer rows.Close()
10+
defer func() {
11+
assertNilF(t, rows.Close())
12+
}()
1113

1214
var version string
1315
rows.Next()
14-
rows.Scan(&version)
16+
assertNilF(t, rows.Scan(&version))
1517
println(version)
1618
})
1719
}

async.go

+4-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ func (sr *snowflakeRestful) processAsync(
4040
go GoroutineWrapper(
4141
ctx,
4242
func() {
43-
sr.getAsync(ctx, headers, sr.getFullURL(respd.Data.GetResultURL, nil), timeout, res, rows, cfg)
43+
err := sr.getAsync(ctx, headers, sr.getFullURL(respd.Data.GetResultURL, nil), timeout, res, rows, cfg)
44+
if err != nil {
45+
logger.Errorf("error while calling getAsync. %v", err)
46+
}
4447
},
4548
)
4649
return respd, nil

auth.go

-1
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ func authenticate(
371371
}
372372
code, err := strconv.Atoi(respd.Code)
373373
if err != nil {
374-
code = -1
375374
return nil, err
376375
}
377376
return nil, (&SnowflakeError{

authexternalbrowser.go

+13-7
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const (
3636

3737
// Builds a response to show to the user after successfully
3838
// getting a response from Snowflake.
39-
func buildResponse(application string) bytes.Buffer {
39+
func buildResponse(application string) (bytes.Buffer, error) {
4040
body := fmt.Sprintf(successHTML, application)
4141
t := &http.Response{
4242
Status: "200 OK",
@@ -50,8 +50,8 @@ func buildResponse(application string) bytes.Buffer {
5050
Header: make(http.Header),
5151
}
5252
var b bytes.Buffer
53-
t.Write(&b)
54-
return b
53+
err := t.Write(&b)
54+
return b, err
5555
}
5656

5757
// This opens a socket that listens on all available unicast
@@ -135,7 +135,6 @@ func getIdpURLProofKey(
135135
sr.TokenAccessor.SetTokens("", "", -1)
136136
code, err := strconv.Atoi(respd.Code)
137137
if err != nil {
138-
code = -1
139138
return "", "", err
140139
}
141140
return "", "", &SnowflakeError{
@@ -311,10 +310,17 @@ func doAuthenticateByExternalBrowser(
311310
buf.Grow(bufSize)
312311
}
313312
if encodedSamlResponse != "" {
314-
httpResponse := buildResponse(application)
315-
c.Write(httpResponse.Bytes())
313+
httpResponse, err := buildResponse(application)
314+
if err != nil && errAccept == nil {
315+
errAccept = err
316+
}
317+
if _, err = c.Write(httpResponse.Bytes()); err != nil && errAccept == nil {
318+
errAccept = err
319+
}
320+
}
321+
if err := c.Close(); err != nil {
322+
logger.Warnf("error while closing browser connection. %v", err)
316323
}
317-
c.Close()
318324
encodedSamlResponseChan <- encodedSamlResponse
319325
errChan <- errAccept
320326
}(conn)

authexternalbrowser_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ func TestGetTokenFromResponse(t *testing.T) {
5151
}
5252

5353
func TestBuildResponse(t *testing.T) {
54-
resp := buildResponse("Go")
54+
resp, err := buildResponse("Go")
55+
assertNilF(t, err)
5556
bytes := resp.Bytes()
5657
respStr := string(bytes[:])
5758
if !strings.Contains(respStr, "Your identity was confirmed and propagated to Snowflake Go.\nYou can close this window now and go back where you started from.") {

authokta.go

-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ func authenticateBySAML(
9797
sr.TokenAccessor.SetTokens("", "", -1)
9898
code, err := strconv.Atoi(respd.Code)
9999
if err != nil {
100-
code = -1
101100
return nil, err
102101
}
103102
return nil, &SnowflakeError{

0 commit comments

Comments
 (0)