diff options
| author | Toon Claes <toon@gitlab.com> | 2021-01-04 21:46:29 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-01-04 21:46:29 +0300 |
| commit | 445770c4879866351d7ce76adad6bcda6a802012 (patch) | |
| tree | 7d9dba55eee99335f5f544041c370a9612a4f86c | |
| parent | b43eeb6df9058112468f1e1373f1e51f85bb810a (diff) | |
| parent | edb4782d102a835f210cd135b546fef80e082902 (diff) | |
Merge branch 'avar/fix-lint-issues-for-c1064ad30' into 'master'
Fix lint issues with c1064ad30
See merge request gitlab-org/gitaly!2974
| -rw-r--r-- | internal/praefect/coordinator_test.go | 3 | ||||
| -rw-r--r-- | internal/praefect/datastore/repository_store.go | 3 | ||||
| -rw-r--r-- | internal/praefect/datastore/repository_store_mock.go | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/internal/praefect/coordinator_test.go b/internal/praefect/coordinator_test.go index 627e137dd..78310eed1 100644 --- a/internal/praefect/coordinator_test.go +++ b/internal/praefect/coordinator_test.go @@ -684,7 +684,8 @@ func TestStreamDirector_repo_creation(t *testing.T) { replEventWait.Add(1) // expected only one event to be created // this call creates new events in the queue and simulates usual flow of the update operation - streamParams.RequestFinalizer() + err = streamParams.RequestFinalizer() + require.NoError(t, err) replEventWait.Wait() // wait until event persisted (async operation) events, err := queueInterceptor.Dequeue(ctx, "praefect", "praefect-internal-2", 10) diff --git a/internal/praefect/datastore/repository_store.go b/internal/praefect/datastore/repository_store.go index 6c7fe27ce..d3cf1e514 100644 --- a/internal/praefect/datastore/repository_store.go +++ b/internal/praefect/datastore/repository_store.go @@ -73,6 +73,7 @@ type RepositoryExistsError struct { // Is checks whether the other errors is of the same type. func (err RepositoryExistsError) Is(other error) bool { + //nolint:errorlint _, ok := other.(RepositoryExistsError) return ok } @@ -294,6 +295,8 @@ AND storage = ANY($3) return sourceGeneration, nil } +//nolint:stylecheck +//nolint:golint func (rs *PostgresRepositoryStore) CreateRepository(ctx context.Context, virtualStorage, relativePath, storage string) error { const q = ` WITH repo AS ( diff --git a/internal/praefect/datastore/repository_store_mock.go b/internal/praefect/datastore/repository_store_mock.go index 84e08c79a..5809be6ee 100644 --- a/internal/praefect/datastore/repository_store_mock.go +++ b/internal/praefect/datastore/repository_store_mock.go @@ -50,6 +50,8 @@ func (m MockRepositoryStore) SetGeneration(ctx context.Context, virtualStorage, return m.SetGenerationFunc(ctx, virtualStorage, relativePath, storage, generation) } +//nolint:stylecheck +//nolint:golint func (m MockRepositoryStore) CreateRepository(ctx context.Context, virtualStorage, relativePath, storage string) error { if m.CreateRepositoryFunc == nil { return nil |