diff options
| author | James Fargher <proglottis@gmail.com> | 2022-03-14 03:09:45 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2022-03-14 03:09:45 +0300 |
| commit | 3e152f5c73c61d6d0a17a5103077de4b049f233d (patch) | |
| tree | 6f7c68c890c59f70d25750b76e2cb9d57adfe045 | |
| parent | c62615c15090e5627f8f5fc62661f7360130c5d1 (diff) | |
| parent | ce2e5ead35c404ecf3bfa7443637e9a3b5aed231 (diff) | |
Merge branch 'smh-extend-invalid-source-repository' into 'master'
Extend invalid metadata deletion logic to repos existin on target
Closes #4083
See merge request gitlab-org/gitaly!4396
| -rw-r--r-- | internal/gitaly/service/repository/replicate.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/repository/replicate_test.go | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/internal/gitaly/service/repository/replicate.go b/internal/gitaly/service/repository/replicate.go index b2da1d4ae..847c4ece8 100644 --- a/internal/gitaly/service/repository/replicate.go +++ b/internal/gitaly/service/repository/replicate.go @@ -70,7 +70,7 @@ func (s *server) ReplicateRepository(ctx context.Context, in *gitalypb.Replicate return nil, helper.ErrInternalf("checking for repo existence: %w", err) } if !request.GetExists() { - return nil, helper.ErrNotFoundf("source repository does not exist") + return nil, ErrInvalidSourceRepository } outgoingCtx := metadata.IncomingToOutgoing(ctx) diff --git a/internal/gitaly/service/repository/replicate_test.go b/internal/gitaly/service/repository/replicate_test.go index 7b87f8923..07d011d18 100644 --- a/internal/gitaly/service/repository/replicate_test.go +++ b/internal/gitaly/service/repository/replicate_test.go @@ -26,7 +26,6 @@ import ( "gitlab.com/gitlab-org/gitaly/v14/internal/gitaly/service/ssh" "gitlab.com/gitlab-org/gitaly/v14/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v14/internal/gitaly/transaction" - "gitlab.com/gitlab-org/gitaly/v14/internal/helper" "gitlab.com/gitlab-org/gitaly/v14/internal/helper/text" "gitlab.com/gitlab-org/gitaly/v14/internal/metadata" "gitlab.com/gitlab-org/gitaly/v14/internal/metadata/featureflag" @@ -324,7 +323,7 @@ func testReplicateRepositoryBadRepository(t *testing.T, ctx context.Context) { desc: "source invalid", invalidSource: true, error: func(t testing.TB, actual error) { - testhelper.RequireGrpcError(t, actual, helper.ErrNotFoundf("source repository does not exist")) + testhelper.RequireGrpcError(t, actual, ErrInvalidSourceRepository) }, }, { |