Skip to content

Commit fa4610d

Browse files
CallumNZCallumNZ
committed
fix: lint errors
1 parent 483e320 commit fa4610d

31 files changed

Lines changed: 204 additions & 166 deletions

‎aws/keyspaces/keyspaces.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func generateAuthenticator() (gocql.Authenticator, error) {
131131
if err != nil {
132132
return nil, err
133133
}
134-
var auth sigv4.AwsAuthenticator = sigv4.NewAwsAuthenticator()
134+
auth := sigv4.NewAwsAuthenticator()
135135
auth.Region = cfg.Region
136136
auth.AccessKeyId = creds.AccessKeyID
137137
auth.SecretAccessKey = creds.SecretAccessKey

‎aws/s3/s3.go‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ func (s *S3) GetWithContext(
153153
if err != nil {
154154
return 0, err
155155
}
156-
defer result.Body.Close()
156+
defer func() {
157+
_ = result.Body.Close()
158+
}()
157159

158160
n, err := io.Copy(w, result.Body)
159161

@@ -180,7 +182,9 @@ func (s *S3) GetByteRange(bucket, key, version, byteRange string, b *bytes.Buffe
180182
if err != nil {
181183
return err
182184
}
183-
defer result.Body.Close()
185+
defer func() {
186+
_ = result.Body.Close()
187+
}()
184188

185189
_, err = b.ReadFrom(result.Body)
186190

@@ -201,7 +205,9 @@ func (s *S3) GetWithLastModified(bucket, key, version string, b *bytes.Buffer) (
201205
if err != nil {
202206
return time.Time{}, err
203207
}
204-
defer result.Body.Close()
208+
defer func() {
209+
_ = result.Body.Close()
210+
}()
205211

206212
_, err = b.ReadFrom(result.Body)
207213

@@ -221,7 +227,9 @@ func (s *S3) LastModified(bucket, key, version string) (time.Time, error) {
221227
if err != nil {
222228
return time.Time{}, err
223229
}
224-
defer result.Body.Close()
230+
defer func() {
231+
_ = result.Body.Close()
232+
}()
225233

226234
return aws.ToTime(result.LastModified), nil
227235
}
@@ -538,7 +546,9 @@ func (s *S3) PutStreamWithContext(ctx context.Context, bucket, key string, reade
538546
// putStream is the common code used internally to upload a data stream to
539547
// an S3 bucket using the client's uploader.
540548
func (s *S3) putStream(ctx context.Context, bucket, key string, reader io.ReadCloser) error {
541-
defer reader.Close()
549+
defer func() {
550+
_ = reader.Close()
551+
}()
542552

543553
if s.uploader == nil {
544554
return errors.New("error uploading to s3, uploader not initialised")

‎aws/s3/s3_integration_test.go‎

Lines changed: 32 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ const (
3939
// helper functions
4040

4141
func setAwsEnv() {
42-
os.Setenv("AWS_REGION", testRegion)
43-
os.Setenv("AWS_SECRET_ACCESS_KEY", "test")
44-
os.Setenv("AWS_ACCESS_KEY_ID", "test")
45-
os.Setenv("AWS_ENDPOINT_URL", customAWSEndpoint)
46-
os.Setenv("AWS_S3_DISABLE_CHECKSUM", "true")
42+
_ = os.Setenv("AWS_REGION", testRegion)
43+
_ = os.Setenv("AWS_SECRET_ACCESS_KEY", "test")
44+
_ = os.Setenv("AWS_ACCESS_KEY_ID", "test")
45+
_ = os.Setenv("AWS_ENDPOINT_URL", customAWSEndpoint)
46+
_ = os.Setenv("AWS_S3_DISABLE_CHECKSUM", "true")
4747
}
4848

4949
func setup() {
@@ -79,21 +79,21 @@ func teardown() {
7979

8080
func awsCmdPopulateBucket() {
8181
// create test data
82-
tmpDir, _ := os.MkdirTemp("", "")
83-
defer os.RemoveAll(tmpDir)
82+
testFile, _ := os.CreateTemp("", "data-*.txt")
83+
defer func() {
84+
_ = os.Remove(testFile.Name())
85+
}()
8486

85-
testDataFilepath := filepath.Join(tmpDir, "data.txt")
86-
testFile, _ := os.Create(testDataFilepath)
8787
_, _ = testFile.WriteString(testObjectData)
88-
testFile.Close()
88+
_ = testFile.Close()
8989

9090
// populate bucket
91-
if err := exec.Command(
91+
if err := exec.Command( //nolint:gosec
9292
"aws", "s3api",
9393
"put-object",
9494
"--bucket", testBucket,
9595
"--key", testObjectKey,
96-
"--body", testDataFilepath,
96+
"--body", testFile.Name(),
9797
"--metadata", fmt.Sprintf("%v=%v", testMetaKey, testMetaValue),
9898
).Run(); err != nil {
9999

@@ -102,7 +102,7 @@ func awsCmdPopulateBucket() {
102102
}
103103

104104
func awsCmdBucketExists(bucket string) bool {
105-
if err := exec.Command(
105+
if err := exec.Command( //nolint:gosec
106106
"aws", "s3api",
107107
"head-bucket",
108108
"--bucket", bucket,
@@ -113,7 +113,7 @@ func awsCmdBucketExists(bucket string) bool {
113113
}
114114

115115
func awsCmdExists(key string) bool {
116-
if err := exec.Command(
116+
if err := exec.Command( //nolint:gosec
117117
"aws", "s3api",
118118
"head-object",
119119
"--bucket", testBucket,
@@ -126,7 +126,7 @@ func awsCmdExists(key string) bool {
126126
}
127127

128128
func awsCmdPutKey(key string) {
129-
if err := exec.Command(
129+
if err := exec.Command( //nolint:gosec
130130
"aws", "s3api",
131131
"put-object",
132132
"--bucket", testBucket,
@@ -140,16 +140,18 @@ func awsCmdPutKey(key string) {
140140
func awsCmdPutKeys(keys []string) {
141141
// create test data
142142
tmpDir, _ := os.MkdirTemp("", "")
143-
defer os.RemoveAll(tmpDir)
143+
defer func() {
144+
_ = os.RemoveAll(tmpDir)
145+
}()
144146

145147
for _, k := range keys {
146148
testDataFilepath := filepath.Join(tmpDir, k)
147-
testFile, _ := os.Create(testDataFilepath)
149+
testFile, _ := os.Create(testDataFilepath) //nolint:gosec
148150
_, _ = testFile.WriteString(testObjectData)
149-
testFile.Close()
151+
_ = testFile.Close()
150152
}
151153
// sync to bucket
152-
cmd := exec.Command(
154+
cmd := exec.Command( //nolint:gosec
153155
"aws", "s3",
154156
"sync", tmpDir, fmt.Sprintf("s3://%v", testBucket),
155157
)
@@ -200,21 +202,21 @@ func awsCmdMeta() awsMeta {
200202
}
201203

202204
func awsCmdGetTestObject() string {
203-
tmpDir, _ := os.MkdirTemp("", "")
204-
defer os.RemoveAll(tmpDir)
205-
206-
testDataFilepath := filepath.Join(tmpDir, "data.txt")
205+
testFile, _ := os.CreateTemp("", "data-*.txt")
206+
defer func() {
207+
_ = os.Remove(testFile.Name())
208+
}()
207209

208-
if err := exec.Command(
210+
if err := exec.Command( //nolint:gosec
209211
"aws", "s3api",
210212
"get-object",
211213
"--bucket", testBucket,
212214
"--key", testObjectKey,
213-
testDataFilepath).Run(); err != nil {
215+
testFile.Name()).Run(); err != nil {
214216
panic(err)
215217
}
216218

217-
testFileContents, _ := os.ReadFile(testDataFilepath)
219+
testFileContents, _ := os.ReadFile(testFile.Name())
218220
return string(testFileContents)
219221
}
220222

@@ -255,7 +257,8 @@ func TestCreateS3ClientAndReady(t *testing.T) {
255257
// test bad case
256258

257259
// ARRANGE
258-
os.Unsetenv("AWS_REGION")
260+
err = os.Unsetenv("AWS_REGION")
261+
require.Nil(t, err)
259262

260263
// ACTION
261264
client, err = New()
@@ -279,7 +282,8 @@ func TestCreateS3ClientWithMaxRetries(t *testing.T) {
279282
// test bad case
280283

281284
// ARRANGE
282-
os.Unsetenv("AWS_REGION")
285+
err = os.Unsetenv("AWS_REGION")
286+
require.Nil(t, err)
283287

284288
// ACTION
285289
_, err = NewWithMaxRetries(2)

‎cfg/cfg.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ func PostgresEnv() (Postgres, error) {
3636

3737
switch "" {
3838
case p.Host:
39-
return Postgres{}, errors.New("DB_HOST env var must be set.")
39+
return Postgres{}, errors.New("DB_HOST env var must be set")
4040
case p.User:
41-
return Postgres{}, errors.New("DB_USER env var must be set.")
41+
return Postgres{}, errors.New("DB_USER env var must be set")
4242
case p.Password:
43-
return Postgres{}, errors.New("DB_PASSWD env var must be set.")
43+
return Postgres{}, errors.New("DB_PASSWD env var must be set")
4444
case p.Name:
45-
return Postgres{}, errors.New("DB_NAME env var must be set.")
45+
return Postgres{}, errors.New("DB_NAME env var must be set")
4646
case p.SSLMode:
47-
return Postgres{}, errors.New("DB_SSLMODE env var must be set.")
47+
return Postgres{}, errors.New("DB_SSLMODE env var must be set")
4848
case c:
49-
return Postgres{}, errors.New("DB_CONN_TIMEOUT env var must be set.")
49+
return Postgres{}, errors.New("DB_CONN_TIMEOUT env var must be set")
5050
case idle:
51-
return Postgres{}, errors.New("DB_MAX_IDLE_CONNS env var must be set.")
51+
return Postgres{}, errors.New("DB_MAX_IDLE_CONNS env var must be set")
5252
case open:
53-
return Postgres{}, errors.New("DB_MAX_OPEN_CONNS env var must be set.")
53+
return Postgres{}, errors.New("DB_MAX_OPEN_CONNS env var must be set")
5454
}
5555

5656
var err error

‎cfg/cfg_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ import (
99
)
1010

1111
func TestPostgresEnv(t *testing.T) {
12-
os.Setenv("DB_HOST", "")
13-
os.Setenv("DB_USER", "")
14-
os.Setenv("DB_PASSWD", "")
15-
os.Setenv("DB_NAME", "")
16-
os.Setenv("DB_SSLMODE", "")
17-
os.Setenv("DB_CONN_TIMEOUT", "")
18-
os.Setenv("DB_MAX_IDLE_CONNS", "")
19-
os.Setenv("DB_MAX_OPEN_CONNS", "")
12+
_ = os.Setenv("DB_HOST", "")
13+
_ = os.Setenv("DB_USER", "")
14+
_ = os.Setenv("DB_PASSWD", "")
15+
_ = os.Setenv("DB_NAME", "")
16+
_ = os.Setenv("DB_SSLMODE", "")
17+
_ = os.Setenv("DB_CONN_TIMEOUT", "")
18+
_ = os.Setenv("DB_MAX_IDLE_CONNS", "")
19+
_ = os.Setenv("DB_MAX_OPEN_CONNS", "")
2020

2121
var err error
2222

@@ -28,7 +28,7 @@ func TestPostgresEnv(t *testing.T) {
2828
t.Errorf("expected error starting with DB_HOST... got: %s", err.Error())
2929
}
3030

31-
os.Setenv("DB_HOST", "host")
31+
_ = os.Setenv("DB_HOST", "host")
3232

3333
_, err = cfg.PostgresEnv()
3434
if err == nil {
@@ -38,7 +38,7 @@ func TestPostgresEnv(t *testing.T) {
3838
t.Errorf("expected error starting with DB_USER... got: %s", err.Error())
3939
}
4040

41-
os.Setenv("DB_USER", "user")
41+
_ = os.Setenv("DB_USER", "user")
4242

4343
_, err = cfg.PostgresEnv()
4444
if err == nil {
@@ -48,7 +48,7 @@ func TestPostgresEnv(t *testing.T) {
4848
t.Errorf("expected error starting with DB_NAME... got: %s", err.Error())
4949
}
5050

51-
os.Setenv("DB_PASSWD", "passwd")
51+
_ = os.Setenv("DB_PASSWD", "passwd")
5252

5353
_, err = cfg.PostgresEnv()
5454
if err == nil {
@@ -58,7 +58,7 @@ func TestPostgresEnv(t *testing.T) {
5858
t.Errorf("expected error starting with DB_NAME... got: %s", err.Error())
5959
}
6060

61-
os.Setenv("DB_NAME", "name")
61+
_ = os.Setenv("DB_NAME", "name")
6262

6363
_, err = cfg.PostgresEnv()
6464
if err == nil {
@@ -68,7 +68,7 @@ func TestPostgresEnv(t *testing.T) {
6868
t.Errorf("expected error starting with DB_SSLMODE... got: %s", err.Error())
6969
}
7070

71-
os.Setenv("DB_SSLMODE", "false")
71+
_ = os.Setenv("DB_SSLMODE", "false")
7272

7373
_, err = cfg.PostgresEnv()
7474
if err == nil {
@@ -78,7 +78,7 @@ func TestPostgresEnv(t *testing.T) {
7878
t.Errorf("expected error starting with DB_CONN_TIMEOUT... got: %s", err.Error())
7979
}
8080

81-
os.Setenv("DB_CONN_TIMEOUT", "30")
81+
_ = os.Setenv("DB_CONN_TIMEOUT", "30")
8282

8383
_, err = cfg.PostgresEnv()
8484
if err == nil {
@@ -88,7 +88,7 @@ func TestPostgresEnv(t *testing.T) {
8888
t.Errorf("expected error starting with DB_MAX_IDLE_CONNS... got: %s", err.Error())
8989
}
9090

91-
os.Setenv("DB_MAX_IDLE_CONNS", "1")
91+
_ = os.Setenv("DB_MAX_IDLE_CONNS", "1")
9292

9393
_, err = cfg.PostgresEnv()
9494
if err == nil {
@@ -98,7 +98,7 @@ func TestPostgresEnv(t *testing.T) {
9898
t.Errorf("expected error starting with DB_MAX_OPEN_CONNS... got: %s", err.Error())
9999
}
100100

101-
os.Setenv("DB_MAX_OPEN_CONNS", "2")
101+
_ = os.Setenv("DB_MAX_OPEN_CONNS", "2")
102102

103103
p, err := cfg.PostgresEnv()
104104
if err != nil {

‎health/check.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func Check(ctx context.Context, servicePath string, timeout time.Duration) ([]by
3939
}
4040
defer func() {
4141
_, _ = io.Copy(io.Discard, resp.Body)
42-
resp.Body.Close()
42+
_ = resp.Body.Close()
4343
}()
4444

4545
body, err := io.ReadAll(resp.Body)

‎map180/bbox.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,25 @@ func newBbox(boundingBox string) (b bbox, err error) {
6565

6666
b.llx, err = strconv.ParseFloat(s[0], 64)
6767
if err != nil {
68-
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
68+
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
6969
return
7070
}
7171

7272
b.lly, err = strconv.ParseFloat(s[1], 64)
7373
if err != nil {
74-
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
74+
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
7575
return
7676
}
7777

7878
b.urx, err = strconv.ParseFloat(s[2], 64)
7979
if err != nil {
80-
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
80+
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
8181
return
8282
}
8383

8484
b.ury, err = strconv.ParseFloat(s[3], 64)
8585
if err != nil {
86-
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
86+
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
8787
return
8888
}
8989

@@ -176,15 +176,15 @@ func (b *bbox) newMap3857(width int) (m map3857, err error) {
176176
// tried using st_MakeEnvelope so that only needed to hit DB once
177177
// but it does not do what I for crossing 180
178178
err = db.QueryRow(`with p as (
179-
select st_transform(st_setsrid(st_makepoint($1, $2), 4326), 3857) as pt
179+
select st_transform(st_setsrid(st_makepoint($1, $2), 4326), 3857) as pt
180180
)
181181
select ST_X(pt), ST_Y(pt) from p;`, b.llx, b.lly).Scan(&m.llx, &m.lly)
182182
if err != nil {
183183
return
184184
}
185185

186186
err = db.QueryRow(`with p as (
187-
select st_transform(st_setsrid(st_makepoint($1, $2), 4326), 3857) as pt
187+
select st_transform(st_setsrid(st_makepoint($1, $2), 4326), 3857) as pt
188188
)
189189
select ST_X(pt), ST_Y(pt) from p;`, b.urx, b.ury).Scan(&m.urx, &m.ury)
190190
if err != nil {

0 commit comments

Comments
 (0)