diff options
| author | Sami Hiltunen <shiltunen@gitlab.com> | 2020-09-28 11:26:08 +0300 |
|---|---|---|
| committer | Sami Hiltunen <shiltunen@gitlab.com> | 2020-09-28 11:26:08 +0300 |
| commit | 0803fedf07f5b6256e1027d962577db18f7acc1c (patch) | |
| tree | 705f48d9f64ec14f2896c34378418b6cb0f5aaf6 | |
| parent | 69c5d9bad86e9402d5e2b0d7c09e88fd5603b572 (diff) | |
| parent | 1bf8f8bd944b6194a01569861cbb6637281ec2bb (diff) | |
Merge branch 'ps-objectpool-uses-locator' into 'master'
Introduce Locator abstraction to objectpool service
See merge request gitlab-org/gitaly!2589
| -rw-r--r-- | internal/gitaly/service/objectpool/alternates.go | 6 | ||||
| -rw-r--r-- | internal/gitaly/service/objectpool/link_test.go | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/internal/gitaly/service/objectpool/alternates.go b/internal/gitaly/service/objectpool/alternates.go index 04f25ca86..523f83e31 100644 --- a/internal/gitaly/service/objectpool/alternates.go +++ b/internal/gitaly/service/objectpool/alternates.go @@ -32,15 +32,15 @@ func (s *server) DisconnectGitAlternates(ctx context.Context, req *gitalypb.Disc return nil, helper.ErrInvalidArgument(errors.New("no repository")) } - if err := disconnectAlternates(ctx, repo); err != nil { + if err := s.disconnectAlternates(ctx, repo); err != nil { return nil, helper.ErrInternal(err) } return &gitalypb.DisconnectGitAlternatesResponse{}, nil } -func disconnectAlternates(ctx context.Context, repo *gitalypb.Repository) error { - repoPath, err := helper.GetRepoPath(repo) +func (s *server) disconnectAlternates(ctx context.Context, repo *gitalypb.Repository) error { + repoPath, err := s.locator.GetRepoPath(repo) if err != nil { return err } diff --git a/internal/gitaly/service/objectpool/link_test.go b/internal/gitaly/service/objectpool/link_test.go index 31f437f5e..c98c878d5 100644 --- a/internal/gitaly/service/objectpool/link_test.go +++ b/internal/gitaly/service/objectpool/link_test.go @@ -10,7 +10,6 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/git/log" "gitlab.com/gitlab-org/gitaly/internal/git/objectpool" gconfig "gitlab.com/gitlab-org/gitaly/internal/gitaly/config" - "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/internal/storage" "gitlab.com/gitlab-org/gitaly/internal/testhelper" "gitlab.com/gitlab-org/gitaly/proto/go/gitalypb" @@ -172,7 +171,8 @@ func TestLinkNoPool(t *testing.T) { testRepo, _, cleanupFn := testhelper.NewTestRepo(t) defer cleanupFn() - pool, err := objectpool.NewObjectPool(gconfig.NewLocator(gconfig.Config), testRepo.GetStorageName(), testhelper.NewTestObjectPoolName(t)) + locator := gconfig.NewLocator(gconfig.Config) + pool, err := objectpool.NewObjectPool(locator, testRepo.GetStorageName(), testhelper.NewTestObjectPoolName(t)) require.NoError(t, err) // intentionally do not call pool.Create defer pool.Remove(ctx) @@ -185,7 +185,7 @@ func TestLinkNoPool(t *testing.T) { _, err = client.LinkRepositoryToObjectPool(ctx, request) require.NoError(t, err) - poolRepoPath, err := helper.GetRepoPath(pool) + poolRepoPath, err := locator.GetRepoPath(pool) require.NoError(t, err) assert.True(t, storage.IsGitDirectory(poolRepoPath)) |