Skip to content

fix: lint errors #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CallumNZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: lint errors #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws/keyspaces/keyspaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func generateAuthenticator() (gocql.Authenticator, error) {
if err != nil {
return nil, err
}
var auth sigv4.AwsAuthenticator = sigv4.NewAwsAuthenticator()
auth := sigv4.NewAwsAuthenticator()
auth.Region = cfg.Region
auth.AccessKeyId = creds.AccessKeyID
auth.SecretAccessKey = creds.SecretAccessKey
Expand Down
20 changes: 15 additions & 5 deletions aws/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,9 @@ func (s *S3) GetWithContext(
if err != nil {
return 0, err
}
defer result.Body.Close()
defer func() {
_ = result.Body.Close()
}()

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

Expand All @@ -180,7 +182,9 @@ func (s *S3) GetByteRange(bucket, key, version, byteRange string, b *bytes.Buffe
if err != nil {
return err
}
defer result.Body.Close()
defer func() {
_ = result.Body.Close()
}()

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

Expand All @@ -201,7 +205,9 @@ func (s *S3) GetWithLastModified(bucket, key, version string, b *bytes.Buffer) (
if err != nil {
return time.Time{}, err
}
defer result.Body.Close()
defer func() {
_ = result.Body.Close()
}()

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

Expand All @@ -221,7 +227,9 @@ func (s *S3) LastModified(bucket, key, version string) (time.Time, error) {
if err != nil {
return time.Time{}, err
}
defer result.Body.Close()
defer func() {
_ = result.Body.Close()
}()

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

if s.uploader == nil {
return errors.New("error uploading to s3, uploader not initialised")
Expand Down
60 changes: 32 additions & 28 deletions aws/s3/s3_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ const (
// helper functions

func setAwsEnv() {
os.Setenv("AWS_REGION", testRegion)
os.Setenv("AWS_SECRET_ACCESS_KEY", "test")
os.Setenv("AWS_ACCESS_KEY_ID", "test")
os.Setenv("AWS_ENDPOINT_URL", customAWSEndpoint)
os.Setenv("AWS_S3_DISABLE_CHECKSUM", "true")
_ = os.Setenv("AWS_REGION", testRegion)
_ = os.Setenv("AWS_SECRET_ACCESS_KEY", "test")
_ = os.Setenv("AWS_ACCESS_KEY_ID", "test")
_ = os.Setenv("AWS_ENDPOINT_URL", customAWSEndpoint)
_ = os.Setenv("AWS_S3_DISABLE_CHECKSUM", "true")
}

func setup() {
Expand Down Expand Up @@ -79,21 +79,21 @@ func teardown() {

func awsCmdPopulateBucket() {
// create test data
tmpDir, _ := os.MkdirTemp("", "")
defer os.RemoveAll(tmpDir)
testFile, _ := os.CreateTemp("", "data-*.txt")
defer func() {
_ = os.Remove(testFile.Name())
}()

testDataFilepath := filepath.Join(tmpDir, "data.txt")
testFile, _ := os.Create(testDataFilepath)
_, _ = testFile.WriteString(testObjectData)
testFile.Close()
_ = testFile.Close()

// populate bucket
if err := exec.Command(
if err := exec.Command( //nolint:gosec
"aws", "s3api",
"put-object",
"--bucket", testBucket,
"--key", testObjectKey,
"--body", testDataFilepath,
"--body", testFile.Name(),
"--metadata", fmt.Sprintf("%v=%v", testMetaKey, testMetaValue),
).Run(); err != nil {

Expand All @@ -102,7 +102,7 @@ func awsCmdPopulateBucket() {
}

func awsCmdBucketExists(bucket string) bool {
if err := exec.Command(
if err := exec.Command( //nolint:gosec
"aws", "s3api",
"head-bucket",
"--bucket", bucket,
Expand All @@ -113,7 +113,7 @@ func awsCmdBucketExists(bucket string) bool {
}

func awsCmdExists(key string) bool {
if err := exec.Command(
if err := exec.Command( //nolint:gosec
"aws", "s3api",
"head-object",
"--bucket", testBucket,
Expand All @@ -126,7 +126,7 @@ func awsCmdExists(key string) bool {
}

func awsCmdPutKey(key string) {
if err := exec.Command(
if err := exec.Command( //nolint:gosec
"aws", "s3api",
"put-object",
"--bucket", testBucket,
Expand All @@ -140,16 +140,18 @@ func awsCmdPutKey(key string) {
func awsCmdPutKeys(keys []string) {
// create test data
tmpDir, _ := os.MkdirTemp("", "")
defer os.RemoveAll(tmpDir)
defer func() {
_ = os.RemoveAll(tmpDir)
}()

for _, k := range keys {
testDataFilepath := filepath.Join(tmpDir, k)
testFile, _ := os.Create(testDataFilepath)
testFile, _ := os.Create(testDataFilepath) //nolint:gosec
_, _ = testFile.WriteString(testObjectData)
testFile.Close()
_ = testFile.Close()
}
// sync to bucket
cmd := exec.Command(
cmd := exec.Command( //nolint:gosec
"aws", "s3",
"sync", tmpDir, fmt.Sprintf("s3://%v", testBucket),
)
Expand Down Expand Up @@ -200,21 +202,21 @@ func awsCmdMeta() awsMeta {
}

func awsCmdGetTestObject() string {
tmpDir, _ := os.MkdirTemp("", "")
defer os.RemoveAll(tmpDir)

testDataFilepath := filepath.Join(tmpDir, "data.txt")
testFile, _ := os.CreateTemp("", "data-*.txt")
defer func() {
_ = os.Remove(testFile.Name())
}()

if err := exec.Command(
if err := exec.Command( //nolint:gosec
"aws", "s3api",
"get-object",
"--bucket", testBucket,
"--key", testObjectKey,
testDataFilepath).Run(); err != nil {
testFile.Name()).Run(); err != nil {
panic(err)
}

testFileContents, _ := os.ReadFile(testDataFilepath)
testFileContents, _ := os.ReadFile(testFile.Name())
return string(testFileContents)
}

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

// ARRANGE
os.Unsetenv("AWS_REGION")
err = os.Unsetenv("AWS_REGION")
require.Nil(t, err)

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

// ARRANGE
os.Unsetenv("AWS_REGION")
err = os.Unsetenv("AWS_REGION")
require.Nil(t, err)

// ACTION
_, err = NewWithMaxRetries(2)
Expand Down
16 changes: 8 additions & 8 deletions cfg/cfg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,21 +36,21 @@ func PostgresEnv() (Postgres, error) {

switch "" {
case p.Host:
return Postgres{}, errors.New("DB_HOST env var must be set.")
return Postgres{}, errors.New("DB_HOST env var must be set")
case p.User:
return Postgres{}, errors.New("DB_USER env var must be set.")
return Postgres{}, errors.New("DB_USER env var must be set")
case p.Password:
return Postgres{}, errors.New("DB_PASSWD env var must be set.")
return Postgres{}, errors.New("DB_PASSWD env var must be set")
case p.Name:
return Postgres{}, errors.New("DB_NAME env var must be set.")
return Postgres{}, errors.New("DB_NAME env var must be set")
case p.SSLMode:
return Postgres{}, errors.New("DB_SSLMODE env var must be set.")
return Postgres{}, errors.New("DB_SSLMODE env var must be set")
case c:
return Postgres{}, errors.New("DB_CONN_TIMEOUT env var must be set.")
return Postgres{}, errors.New("DB_CONN_TIMEOUT env var must be set")
case idle:
return Postgres{}, errors.New("DB_MAX_IDLE_CONNS env var must be set.")
return Postgres{}, errors.New("DB_MAX_IDLE_CONNS env var must be set")
case open:
return Postgres{}, errors.New("DB_MAX_OPEN_CONNS env var must be set.")
return Postgres{}, errors.New("DB_MAX_OPEN_CONNS env var must be set")
}

var err error
Expand Down
32 changes: 16 additions & 16 deletions cfg/cfg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
)

func TestPostgresEnv(t *testing.T) {
os.Setenv("DB_HOST", "")
os.Setenv("DB_USER", "")
os.Setenv("DB_PASSWD", "")
os.Setenv("DB_NAME", "")
os.Setenv("DB_SSLMODE", "")
os.Setenv("DB_CONN_TIMEOUT", "")
os.Setenv("DB_MAX_IDLE_CONNS", "")
os.Setenv("DB_MAX_OPEN_CONNS", "")
_ = os.Setenv("DB_HOST", "")
_ = os.Setenv("DB_USER", "")
_ = os.Setenv("DB_PASSWD", "")
_ = os.Setenv("DB_NAME", "")
_ = os.Setenv("DB_SSLMODE", "")
_ = os.Setenv("DB_CONN_TIMEOUT", "")
_ = os.Setenv("DB_MAX_IDLE_CONNS", "")
_ = os.Setenv("DB_MAX_OPEN_CONNS", "")

var err error

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

os.Setenv("DB_HOST", "host")
_ = os.Setenv("DB_HOST", "host")

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

os.Setenv("DB_USER", "user")
_ = os.Setenv("DB_USER", "user")

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

os.Setenv("DB_PASSWD", "passwd")
_ = os.Setenv("DB_PASSWD", "passwd")

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

os.Setenv("DB_NAME", "name")
_ = os.Setenv("DB_NAME", "name")

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

os.Setenv("DB_SSLMODE", "false")
_ = os.Setenv("DB_SSLMODE", "false")

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

os.Setenv("DB_CONN_TIMEOUT", "30")
_ = os.Setenv("DB_CONN_TIMEOUT", "30")

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

os.Setenv("DB_MAX_IDLE_CONNS", "1")
_ = os.Setenv("DB_MAX_IDLE_CONNS", "1")

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

os.Setenv("DB_MAX_OPEN_CONNS", "2")
_ = os.Setenv("DB_MAX_OPEN_CONNS", "2")

p, err := cfg.PostgresEnv()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion health/check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ func Check(ctx context.Context, servicePath string, timeout time.Duration) ([]by
}
defer func() {
_, _ = io.Copy(io.Discard, resp.Body)
resp.Body.Close()
_ = resp.Body.Close()
}()

body, err := io.ReadAll(resp.Body)
Expand Down
12 changes: 6 additions & 6 deletions map180/bbox.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,25 +65,25 @@ func newBbox(boundingBox string) (b bbox, err error) {

b.llx, err = strconv.ParseFloat(s[0], 64)
if err != nil {
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
return
}

b.lly, err = strconv.ParseFloat(s[1], 64)
if err != nil {
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
return
}

b.urx, err = strconv.ParseFloat(s[2], 64)
if err != nil {
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
return
}

b.ury, err = strconv.ParseFloat(s[3], 64)
if err != nil {
err = fmt.Errorf("Invalid boundingBox: %s", boundingBox)
err = fmt.Errorf("invalid boundingBox: %s", boundingBox)
return
}

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

err = db.QueryRow(`with p as (
select st_transform(st_setsrid(st_makepoint($1, $2), 4326), 3857) as pt
select st_transform(st_setsrid(st_makepoint($1, $2), 4326), 3857) as pt
)
select ST_X(pt), ST_Y(pt) from p;`, b.urx, b.ury).Scan(&m.urx, &m.ury)
if err != nil {
Expand Down
Loading
Loading