Enabled maligned, staticcheck and errcheck linters #206

kmuratov · 2019-04-17T10:30:34Z

enabled maligned linter
enabled staticcheck linter
enabled errcheck linter
added some fixes for golint

coveralls · 2019-04-17T14:39:31Z

Pull Request Test Coverage Report for Build 389

47 of 94 (50.0%) changed or added relevant lines in 7 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage decreased (-1.3%) to 51.722%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
database/firebird/firebird.go	3	5	60.0%
testing/docker.go	0	5	0.0%
migration.go	3	9	33.33%
testing/testing.go	0	8	0.0%
migrate.go	34	60	56.67%

Totals
Change from base Build 373:	-1.3%
Covered Lines:	751
Relevant Lines:	1452

💛 - Coveralls

dhui

Wow, thanks so much for fixing all of the issues found when enabling the other linters!

This PR is mostly ready to be merged. There are just fixes that could be a bit better.

.golangci.yml

database/util.go

database/cockroachdb/cockroachdb_test.go

database/clickhouse/clickhouse.go

database/ql/ql_test.go

migration.go

source/file/file_test.go

source/godoc_vfs/vfs_test.go

source/stub/stub.go

dhui · 2019-04-18T07:07:26Z

testing/docker.go

-			}

-			return uint(port.Int()), binding.HostIP, uint(hostPortUint), nil
+		hostPortUint, err := strconv.ParseUint(bindings[0].HostPort, 10, 64)


Let's keep the current behavior of searching through the available bindings.
Most tests use dktest instead of this so this won't affect any existing db driver tests, but I'd like to preserve past functionality.

There were issues with assuming that the first binding exists and that the binding data format is consistent.

Thank you, I see now. Using of only the first binding confused me.
I'll rollback it and add nolint.

But if you wish I can replace it with this one (it might be more explicit):

for port, bindings := range d.ContainerJSON.NetworkSettings.Ports { if !selectFirst && port.Int() != cPort { // Skip ahead until we find the port we want continue } if len(bindings) == 0 { continue } hostPortUint, err := strconv.ParseUint(bindings[0].HostPort, 10, 64) if err != nil { return 0, "", 0, err } return uint(port.Int()), bindings[0].HostIP, uint(hostPortUint), nil }

dhui

A little bit more cleanup and we're good to go.

Also, don't forget about: #206 (comment)

I'm looking forward to merging this PR!

database/firebird/firebird_test.go

database/mongodb/mongodb_test.go

database/mysql/mysql_test.go

database/postgres/postgres_test.go

database/redshift/redshift_test.go

dhui · 2019-04-19T18:11:04Z

database/mysql/mysql.go

 	if _, err := tx.ExecContext(context.Background(), query); err != nil {
-		tx.Rollback()
+		if errRollback := tx.Rollback(); errRollback != nil {
+			err = multierror.Append(err, errRollback)


Note to self: mark this as a backwards incompatible change in the release notes

e.g. rollback errors are now handled so OrigErr may be a multierror

migration.go

source/file/file_test.go

migration.go

database/util.go

dhui · 2019-04-22T17:43:57Z

migrate.go

 			}

 			ret <- migr
+			// nolint: errcheck


I think we could send the error on the ret channel since runMigrations has a type assertion and handles the error case.

For now, let's just log the error for now to avoid any changes in behavior.
My guess is that any buffering errors will result in errors down stream.

The logging may actually help debug a lot of the reported file error issues!

database/mysql/mysql_test.go

migrate.go

dhui · 2019-04-25T23:34:39Z

I've also noticed that the unittests for this PR haven't ever passed e.g. even subsequent re-runs/retries have failed. I wonder if it's b/c we're erroring on Firebird close now in isReady() function in the tests.

Previously, the Firebird db tests were failing intermittently.

dhui · 2019-04-26T15:30:54Z

database/util.go

+const advisoryLockIDSalt uint = 1486364155

 // GenerateAdvisoryLockId inspired by rails migrations, see https://goo.gl/8o9bCT
+// nolint: golint


I meant that this should be on the same line as the function declaration. e.g. func GenerateAdvisoryLockId(databaseName string, additionalNames ...string) (string, error) { // nolint: golint

dhui · 2019-04-26T15:31:36Z

testing/docker.go

 			}
-
+			// nolint: staticcheck
 			return uint(port.Int()), binding.HostIP, uint(hostPortUint), nil


Likewise, this should be on the same line: return uint(port.Int()), binding.HostIP, uint(hostPortUint), nil // nolint: staticcheck

dhui · 2019-04-26T15:34:42Z

database/firebird/firebird_test.go

 	specs = []dktesting.ContainerSpec{
-		{ImageName: "jacobalberty/firebird:2.5-ss", Options: opts},
-		{ImageName: "jacobalberty/firebird:3.0", Options: opts},
+		{ImageName: "jacobalberty/firebird:2.5.8-ss", Options: opts},


It might be better to drop support for 2.5 until tests pass consistently

dhui · 2019-04-26T15:37:08Z

database/firebird/firebird_test.go

-		{ImageName: "jacobalberty/firebird:2.5-ss", Options: opts},
-		{ImageName: "jacobalberty/firebird:3.0", Options: opts},
+		{ImageName: "jacobalberty/firebird:2.5.8-ss", Options: opts},
+		{ImageName: "jacobalberty/firebird:3.0.4", Options: opts},


Let's leave the the version as 3.0.
https://hub.docker.com/r/jacobalberty/firebird/tags

It looks like only a single tag is updated per release: https://github.com/jacobalberty/firebird-docker/blob/master/hooks/post_push

dhui · 2019-04-26T20:38:40Z

The Firebird test failures are unrelated to this PR. To unblock this PR, I'm going to remove official support for Firebird. For more info, see: #49 (comment)

kmuratov · 2019-04-26T20:46:48Z

That's fine. Thank you for all your reviews and comments.

kmuratov added 6 commits March 29, 2019 20:32

Enabled maligned check

ad9d800

Enabled staticcheck

e932b05

Fixes for golint

75f1059

Enabled errcheck linter

faafed1

Added fixes for error check

6f0acbf

Merge branch 'master' into issue-125

54998e5

kmuratov changed the title ~~Enabled maligned, staticcheck and errcheck linters~~ WIP: Enabled maligned, staticcheck and errcheck linters Apr 17, 2019

Kirill Muratov added 3 commits April 17, 2019 16:17

Added errcheck for tests

a501fc3

Fixed test

826b766

Increased golangci-lint deadline for travis

7f72c4c

Kirill Muratov added 2 commits April 17, 2019 17:40

Increased golangci-lint deadline for travis

7e419d3

Merge remote-tracking branch 'origin/issue-125' into issue-125

4662992

kmuratov changed the title ~~WIP: Enabled maligned, staticcheck and errcheck linters~~ Enabled maligned, staticcheck and errcheck linters Apr 17, 2019

dhui requested changes Apr 18, 2019

View reviewed changes

Kirill Muratov added 15 commits April 19, 2019 12:09

Decreased golangci-lint deadline for travis

bcff2ef

Revert for backward compatibility

39dddb5

Using log.Println() instead of fmt.Println()

7e77100

Handling os.RemoveAll() errors

edb3a4e

Using t.Error(error) instead of t.Errorf("%v", err)

1bce95e

Using t.Fatal(error) instead of t.Fatalf("%v", err)

81a642b

Using fmt.Sprint(sum) instead of t.Srintf("%v", sum)

21801e0

Refactoring

47fa45a

Revert for backward compatibility

343b35c

Revert

bbe0f3c

go mod tidy

62bebbf

Added error logging

05e3176

Added error logging

ecb6171

Added error handling

9ad81a3

Added error handling

4ca5c47

Added error logging

e6d53b9

dhui requested changes Apr 19, 2019

View reviewed changes

Kirill Muratov added 4 commits April 22, 2019 14:55

Fix error logging

ee02b64

Added error handling

4348dab

Fix

ed6965b

Added logging for migr.Buffer()

303b059

dhui requested changes Apr 25, 2019

View reviewed changes

Kirill Muratov added 4 commits April 26, 2019 13:19

Fixes

96f0e41

Firebird test disabled

a7ca9da

Fixed nolint comment

ae47e06

Updated firebird docker image version

08edc83

dhui requested changes Apr 26, 2019

View reviewed changes

kmuratov added 2 commits April 26, 2019 21:58

Disabled test for firebird 2.5

84081f4

Fixed // nolint

395b28e

dhui approved these changes Apr 26, 2019

View reviewed changes

dhui merged commit 6c96ef0 into golang-migrate:master Apr 26, 2019

renovate bot mentioned this pull request May 29, 2021

fix(deps): update module github.com/golang-migrate/migrate to v4 - autoclosed advenjourney/advenjourney#20

Closed

1 task

Enabled maligned, staticcheck and errcheck linters #206

Enabled maligned, staticcheck and errcheck linters #206

Uh oh!

Conversation

kmuratov commented Apr 17, 2019

Uh oh!

coveralls commented Apr 17, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 389

💛 - Coveralls

Uh oh!

dhui left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dhui left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dhui commented Apr 25, 2019

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

dhui commented Apr 26, 2019

Uh oh!

kmuratov commented Apr 26, 2019

Uh oh!

Uh oh!

coveralls commented Apr 17, 2019 •

edited

Loading