diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-07-06 11:18:19 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-07-06 11:18:19 +0300 |
| commit | 16a09c6ee19067dc0e652f1255775beedae649d6 (patch) | |
| tree | 7e42b3f78d3689f42563ab07a8a836198f032a71 | |
| parent | 5152c6aff9823c1840bf08f7148d4247b9de6b9f (diff) | |
| parent | c10e108368171a62310f52b1c52ddfcffe90e00a (diff) | |
Merge branch 'backup_repository_validation' into 'master'
Stop validating vanity repo exists in BackupRepository
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/6017
Merged-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Approved-by: Christian Couder <chriscool@tuxfamily.org>
Approved-by: Patrick Steinhardt <psteinhardt@gitlab.com>
Co-authored-by: James Fargher <jfargher@gitlab.com>
| -rw-r--r-- | internal/gitaly/service/repository/backup_repository.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/repository/backup_repository_test.go | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/internal/gitaly/service/repository/backup_repository.go b/internal/gitaly/service/repository/backup_repository.go index c3b927125..5511e50fa 100644 --- a/internal/gitaly/service/repository/backup_repository.go +++ b/internal/gitaly/service/repository/backup_repository.go @@ -54,7 +54,7 @@ func (s *server) validateBackupRepositoryRequest(in *gitalypb.BackupRepositoryRe return err } if err := s.locator.ValidateRepository(in.GetVanityRepository(), - storage.WithSkipRepositoryExistenceCheck(), + storage.WithSkipStorageExistenceCheck(), ); err != nil { return err } diff --git a/internal/gitaly/service/repository/backup_repository_test.go b/internal/gitaly/service/repository/backup_repository_test.go index 796bb2fda..f272832e9 100644 --- a/internal/gitaly/service/repository/backup_repository_test.go +++ b/internal/gitaly/service/repository/backup_repository_test.go @@ -160,11 +160,16 @@ func TestServerBackupRepository(t *testing.T) { backupLocator, err := backup.ResolveLocator("pointer", backupSink) require.NoError(t, err) + vanityRepo := &gitalypb.Repository{ + StorageName: "does-not-exist", + RelativePath: "@test/repo.git", + } + data := tc.setup(t, ctx, backupSink, backupLocator) response, err := data.client.BackupRepository(ctx, &gitalypb.BackupRepositoryRequest{ Repository: data.repo, - VanityRepository: data.repo, + VanityRepository: vanityRepo, BackupId: data.backupID, }) if tc.expectedErr != nil { @@ -175,7 +180,7 @@ func TestServerBackupRepository(t *testing.T) { require.NoError(t, err) testhelper.ProtoEqual(t, &gitalypb.BackupRepositoryResponse{}, response) - relativePath := strings.TrimSuffix(data.repo.GetRelativePath(), ".git") + relativePath := strings.TrimSuffix(vanityRepo.GetRelativePath(), ".git") bundlePath := filepath.Join(relativePath, data.backupID, "001.bundle") bundle, err := backupSink.GetReader(ctx, bundlePath) |