diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-06-28 08:20:02 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2023-06-28 08:39:04 +0300 |
| commit | b0282ebd240c5a9d34e496bd7de35ca1eecf3ef4 (patch) | |
| tree | e3613bb3ec86e01871d506b770b76a32bdc95eb6 | |
| parent | b1919c1ec2ef38c62ee6563e4eb6c0a93e8eddb7 (diff) | |
praefect/coordinator: Unify ErrRepositoryNotSet errors with Gitaly
The coordinator prefixes most of its errors with "repo scoped", which
makes the errors mismatch those returned by Gitaly. Consequentially,
Praefect does not act as an actually-transparent proxy. This can be
painfully felt in our tests, where we need to distinguish between both
errors.
Drop the prefix and return the error directly to unify the errors that
both Gitaly and Praefect would return.
97 files changed, 210 insertions, 535 deletions
diff --git a/internal/gitaly/service/blob/get_blob_test.go b/internal/gitaly/service/blob/get_blob_test.go index f61c9cd5a..a16a3b863 100644 --- a/internal/gitaly/service/blob/get_blob_test.go +++ b/internal/gitaly/service/blob/get_blob_test.go @@ -158,10 +158,7 @@ func TestGetBlob_invalidRequest(t *testing.T) { Repository: nil, Oid: oid, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid storage name", diff --git a/internal/gitaly/service/blob/get_blobs_test.go b/internal/gitaly/service/blob/get_blobs_test.go index fb23f82d8..2c0629b1e 100644 --- a/internal/gitaly/service/blob/get_blobs_test.go +++ b/internal/gitaly/service/blob/get_blobs_test.go @@ -73,10 +73,7 @@ func TestGetBlobs(t *testing.T) { {Revision: "does-not-exist", Path: []byte("file")}, }, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/blob/lfs_pointers_test.go b/internal/gitaly/service/blob/lfs_pointers_test.go index fe75f4a9f..adc7dff08 100644 --- a/internal/gitaly/service/blob/lfs_pointers_test.go +++ b/internal/gitaly/service/blob/lfs_pointers_test.go @@ -162,10 +162,7 @@ size 12345` desc: "missing repository", setup: func(t *testing.T) setupData { return setupData{ - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, @@ -328,10 +325,7 @@ func TestGetLFSPointers(t *testing.T) { Repository: nil, BlobIds: []string{"f00"}, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty BlobIds", diff --git a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go index 838895ed1..235ca49c2 100644 --- a/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go +++ b/internal/gitaly/service/cleanup/apply_bfg_object_map_stream_test.go @@ -135,10 +135,7 @@ func TestApplyBfgObjectMapStreamFailsOnInvalidInput(t *testing.T) { ObjectMap: []byte("does not matter"), }) require.Nil(t, response) - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) }) } diff --git a/internal/gitaly/service/commit/check_objects_exist_test.go b/internal/gitaly/service/commit/check_objects_exist_test.go index c3bf0b09c..c97f39de5 100644 --- a/internal/gitaly/service/commit/check_objects_exist_test.go +++ b/internal/gitaly/service/commit/check_objects_exist_test.go @@ -40,12 +40,9 @@ func TestCheckObjectsExist(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - requests: []*gitalypb.CheckObjectsExistRequest{{Repository: nil}}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + requests: []*gitalypb.CheckObjectsExistRequest{{Repository: nil}}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "no requests", @@ -62,10 +59,7 @@ func TestCheckObjectsExist(t *testing.T) { Revisions: [][]byte{}, }, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "request without revisions", diff --git a/internal/gitaly/service/commit/commit_messages_test.go b/internal/gitaly/service/commit/commit_messages_test.go index e469a6672..efd786f41 100644 --- a/internal/gitaly/service/commit/commit_messages_test.go +++ b/internal/gitaly/service/commit/commit_messages_test.go @@ -75,10 +75,7 @@ func TestFailedGetCommitMessagesRequest(t *testing.T) { Repository: nil, CommitIds: []string{"5937ac0a7beb003549fc5fd26fc247adbce4a52e"}, }, - err: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + err: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } diff --git a/internal/gitaly/service/commit/commit_signatures_test.go b/internal/gitaly/service/commit/commit_signatures_test.go index 3ddafa13e..28193548b 100644 --- a/internal/gitaly/service/commit/commit_signatures_test.go +++ b/internal/gitaly/service/commit/commit_signatures_test.go @@ -106,10 +106,7 @@ func TestFailedGetCommitSignaturesRequest(t *testing.T) { Repository: nil, CommitIds: []string{"5937ac0a7beb003549fc5fd26fc247adbce4a52e"}, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty CommitIds", diff --git a/internal/gitaly/service/commit/commits_by_message_test.go b/internal/gitaly/service/commit/commits_by_message_test.go index e7ece4373..1a6b39bb9 100644 --- a/internal/gitaly/service/commit/commits_by_message_test.go +++ b/internal/gitaly/service/commit/commits_by_message_test.go @@ -186,12 +186,9 @@ func TestFailedCommitsByMessageRequest(t *testing.T) { ), }, { - desc: "Repository is nil", - request: &gitalypb.CommitsByMessageRequest{Query: "foo"}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository is nil", + request: &gitalypb.CommitsByMessageRequest{Query: "foo"}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Query is missing", diff --git a/internal/gitaly/service/commit/count_commits_test.go b/internal/gitaly/service/commit/count_commits_test.go index 7780a1986..9986a38e9 100644 --- a/internal/gitaly/service/commit/count_commits_test.go +++ b/internal/gitaly/service/commit/count_commits_test.go @@ -184,12 +184,9 @@ func TestFailedCountCommitsRequestDueToValidationError(t *testing.T) { ), }, { - desc: "Repository is nil", - req: &gitalypb.CountCommitsRequest{Repository: nil, Revision: revision}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository is nil", + req: &gitalypb.CountCommitsRequest{Repository: nil, Revision: revision}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Revision is empty and All is false", diff --git a/internal/gitaly/service/commit/count_diverging_commits_test.go b/internal/gitaly/service/commit/count_diverging_commits_test.go index 7896166af..f8b6e1b00 100644 --- a/internal/gitaly/service/commit/count_diverging_commits_test.go +++ b/internal/gitaly/service/commit/count_diverging_commits_test.go @@ -173,12 +173,9 @@ func TestFailedCountDivergentCommitsRequestDueToValidationError(t *testing.T) { expectedErr error }{ { - desc: "Repository not provided", - req: &gitalypb.CountDivergingCommitsRequest{Repository: nil, From: []byte("abcdef"), To: []byte("12345")}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository not provided", + req: &gitalypb.CountDivergingCommitsRequest{Repository: nil, From: []byte("abcdef"), To: []byte("12345")}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Repository doesn't exist", diff --git a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go index f561be683..16543deaa 100644 --- a/internal/gitaly/service/commit/filter_shas_with_signatures_test.go +++ b/internal/gitaly/service/commit/filter_shas_with_signatures_test.go @@ -72,12 +72,9 @@ func TestFilterShasWithSignaturesValidationError(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - req: &gitalypb.FilterShasWithSignaturesRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + req: &gitalypb.FilterShasWithSignaturesRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/commit/find_all_commits_test.go b/internal/gitaly/service/commit/find_all_commits_test.go index d66d0410d..41a2bbc12 100644 --- a/internal/gitaly/service/commit/find_all_commits_test.go +++ b/internal/gitaly/service/commit/find_all_commits_test.go @@ -188,12 +188,9 @@ func TestFailedFindAllCommitsRequest(t *testing.T) { ), }, { - desc: "Repository is nil", - request: &gitalypb.FindAllCommitsRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository is nil", + request: &gitalypb.FindAllCommitsRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Revision is invalid", diff --git a/internal/gitaly/service/commit/find_commit_test.go b/internal/gitaly/service/commit/find_commit_test.go index 5e63ea183..4ab844678 100644 --- a/internal/gitaly/service/commit/find_commit_test.go +++ b/internal/gitaly/service/commit/find_commit_test.go @@ -254,12 +254,9 @@ func TestFailedFindCommitRequest(t *testing.T) { expectedErr error }{ { - desc: "Repository is nil", - repo: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository is nil", + repo: nil, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Invalid repo", diff --git a/internal/gitaly/service/commit/find_commits_test.go b/internal/gitaly/service/commit/find_commits_test.go index 4f6d3a9a6..8cbef97cf 100644 --- a/internal/gitaly/service/commit/find_commits_test.go +++ b/internal/gitaly/service/commit/find_commits_test.go @@ -529,10 +529,7 @@ func TestFailureFindCommitsRequest(t *testing.T) { Repository: nil, Revision: []byte("HEAD"), }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty path string", diff --git a/internal/gitaly/service/commit/isancestor_test.go b/internal/gitaly/service/commit/isancestor_test.go index 8821b29d2..704bbd535 100644 --- a/internal/gitaly/service/commit/isancestor_test.go +++ b/internal/gitaly/service/commit/isancestor_test.go @@ -35,10 +35,7 @@ func TestCommitIsAncestorFailure(t *testing.T) { AncestorId: "b83d6e391c22777fca1ed3012fce84f633d7fed0", ChildId: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { Request: &gitalypb.CommitIsAncestorRequest{ diff --git a/internal/gitaly/service/commit/languages_test.go b/internal/gitaly/service/commit/languages_test.go index 1995519b9..f94937459 100644 --- a/internal/gitaly/service/commit/languages_test.go +++ b/internal/gitaly/service/commit/languages_test.go @@ -113,12 +113,9 @@ func TestCommitLanguages_validateRequest(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - req: &gitalypb.CommitLanguagesRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + req: &gitalypb.CommitLanguagesRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid revision provided", diff --git a/internal/gitaly/service/commit/last_commit_for_path_test.go b/internal/gitaly/service/commit/last_commit_for_path_test.go index 1d2c7d6e8..a76b375ba 100644 --- a/internal/gitaly/service/commit/last_commit_for_path_test.go +++ b/internal/gitaly/service/commit/last_commit_for_path_test.go @@ -107,10 +107,7 @@ func TestFailedLastCommitForPathRequest(t *testing.T) { request: &gitalypb.LastCommitForPathRequest{ Revision: []byte("some-branch"), }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Revision is missing", diff --git a/internal/gitaly/service/commit/list_all_commits_test.go b/internal/gitaly/service/commit/list_all_commits_test.go index 35a7327ee..9d56bef8a 100644 --- a/internal/gitaly/service/commit/list_all_commits_test.go +++ b/internal/gitaly/service/commit/list_all_commits_test.go @@ -154,10 +154,7 @@ func TestListAllCommits_validate(t *testing.T) { req: &gitalypb.ListAllCommitsRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_by_oid_test.go b/internal/gitaly/service/commit/list_commits_by_oid_test.go index a39bb9b85..008de0e29 100644 --- a/internal/gitaly/service/commit/list_commits_by_oid_test.go +++ b/internal/gitaly/service/commit/list_commits_by_oid_test.go @@ -185,12 +185,9 @@ func TestListCommitsByOid_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.ListCommitsByOidRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.ListCommitsByOidRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go index ab970db4c..4800074c9 100644 --- a/internal/gitaly/service/commit/list_commits_by_ref_name_test.go +++ b/internal/gitaly/service/commit/list_commits_by_ref_name_test.go @@ -205,12 +205,9 @@ func TestListCommitsByRefName_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.ListCommitsByRefNameRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.ListCommitsByRefNameRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/commit/list_commits_test.go b/internal/gitaly/service/commit/list_commits_test.go index e155fd843..8ab2874e2 100644 --- a/internal/gitaly/service/commit/list_commits_test.go +++ b/internal/gitaly/service/commit/list_commits_test.go @@ -328,12 +328,9 @@ func TestListCommits_verify(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - req: &gitalypb.ListCommitsRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + req: &gitalypb.ListCommitsRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "no revisions", diff --git a/internal/gitaly/service/commit/list_files_test.go b/internal/gitaly/service/commit/list_files_test.go index 5ae185b53..44a76f0ca 100644 --- a/internal/gitaly/service/commit/list_files_test.go +++ b/internal/gitaly/service/commit/list_files_test.go @@ -52,10 +52,7 @@ func TestListFiles(t *testing.T) { request: &gitalypb.ListFilesRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty repo object", diff --git a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go index bc20a1f18..24ab92333 100644 --- a/internal/gitaly/service/commit/list_last_commits_for_tree_test.go +++ b/internal/gitaly/service/commit/list_last_commits_for_tree_test.go @@ -111,10 +111,7 @@ func TestListLastCommitsForTree(t *testing.T) { Repository: nil, Path: []byte("/"), }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/commit/raw_blame_test.go b/internal/gitaly/service/commit/raw_blame_test.go index b043e76a5..f31096504 100644 --- a/internal/gitaly/service/commit/raw_blame_test.go +++ b/internal/gitaly/service/commit/raw_blame_test.go @@ -94,10 +94,7 @@ func TestFailedRawBlameRequest(t *testing.T) { { description: "No repository provided", repo: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { description: "Invalid repo", diff --git a/internal/gitaly/service/commit/stats_test.go b/internal/gitaly/service/commit/stats_test.go index 9310d6379..173351839 100644 --- a/internal/gitaly/service/commit/stats_test.go +++ b/internal/gitaly/service/commit/stats_test.go @@ -89,12 +89,9 @@ func TestCommitStatsFailure(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - request: &gitalypb.CommitStatsRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + request: &gitalypb.CommitStatsRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "repo not found", diff --git a/internal/gitaly/service/commit/tree_entries_test.go b/internal/gitaly/service/commit/tree_entries_test.go index afc1906eb..034c4c761 100644 --- a/internal/gitaly/service/commit/tree_entries_test.go +++ b/internal/gitaly/service/commit/tree_entries_test.go @@ -141,10 +141,7 @@ func TestGetTreeEntries(t *testing.T) { Revision: []byte(gittest.DefaultObjectHash.EmptyTreeOID), Path: []byte("folder"), }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/commit/tree_entry_test.go b/internal/gitaly/service/commit/tree_entry_test.go index bcb4a3a1d..9ea587e25 100644 --- a/internal/gitaly/service/commit/tree_entry_test.go +++ b/internal/gitaly/service/commit/tree_entry_test.go @@ -179,12 +179,9 @@ func TestFailedTreeEntry(t *testing.T) { ), }, { - name: "Repository is nil", - req: &gitalypb.TreeEntryRequest{Repository: nil, Revision: revision, Path: path}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + name: "Repository is nil", + req: &gitalypb.TreeEntryRequest{Repository: nil, Revision: revision, Path: path}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { name: "Revision is empty", diff --git a/internal/gitaly/service/conflicts/list_conflict_files_test.go b/internal/gitaly/service/conflicts/list_conflict_files_test.go index ba1eb7b36..ccfbd4adb 100644 --- a/internal/gitaly/service/conflicts/list_conflict_files_test.go +++ b/internal/gitaly/service/conflicts/list_conflict_files_test.go @@ -516,12 +516,9 @@ func TestListConflictFiles(t *testing.T) { } return setupData{ - client: client, - request: request, - expectedError: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + client: client, + request: request, + expectedError: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/conflicts/resolve_conflicts_test.go b/internal/gitaly/service/conflicts/resolve_conflicts_test.go index cab98d472..96962f317 100644 --- a/internal/gitaly/service/conflicts/resolve_conflicts_test.go +++ b/internal/gitaly/service/conflicts/resolve_conflicts_test.go @@ -15,6 +15,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v16/internal/git/localrepo" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v16/internal/helper/text" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" @@ -921,10 +922,7 @@ func TestResolveConflicts(t *testing.T) { }, }, skipCommitCheck: true, - expectedError: structerr.NewInvalidArgument(testhelper.GitalyOrPraefect( - "repository not set", - "repo scoped: repository not set", - )), + expectedError: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/diff/commit_test.go b/internal/gitaly/service/diff/commit_test.go index 172d33b03..aa23953d7 100644 --- a/internal/gitaly/service/diff/commit_test.go +++ b/internal/gitaly/service/diff/commit_test.go @@ -1317,12 +1317,9 @@ func TestFailedCommitDiffRequestDueToValidationError(t *testing.T) { ), }, { - desc: "Repository is nil", - req: &gitalypb.CommitDiffRequest{Repository: nil, RightCommitId: rightCommit, LeftCommitId: leftCommit}, - exrErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository is nil", + req: &gitalypb.CommitDiffRequest{Repository: nil, RightCommitId: rightCommit, LeftCommitId: leftCommit}, + exrErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "RightCommitId is empty", diff --git a/internal/gitaly/service/diff/find_changed_paths_test.go b/internal/gitaly/service/diff/find_changed_paths_test.go index 879af0eb2..24df05b91 100644 --- a/internal/gitaly/service/diff/find_changed_paths_test.go +++ b/internal/gitaly/service/diff/find_changed_paths_test.go @@ -960,10 +960,7 @@ func TestFindChangedPathsRequest_failing(t *testing.T) { desc: "Repository not provided", repo: nil, commits: []string{newCommit.String(), oldCommit.String()}, - err: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + err: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Repo not found", diff --git a/internal/gitaly/service/diff/numstat_test.go b/internal/gitaly/service/diff/numstat_test.go index c92eddb19..bd95e6559 100644 --- a/internal/gitaly/service/diff/numstat_test.go +++ b/internal/gitaly/service/diff/numstat_test.go @@ -136,10 +136,7 @@ func TestFailedDiffStatsRequest(t *testing.T) { repo: nil, leftCommitID: "e4003da16c1c2c3fc4567700121b17bf8e591c6c", rightCommitID: "8a0f2ee90d940bfb0ba1e14e8214b0649056e4ab", - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "repository not found", diff --git a/internal/gitaly/service/diff/patch_id_test.go b/internal/gitaly/service/diff/patch_id_test.go index 3deec3601..00b89a1dd 100644 --- a/internal/gitaly/service/diff/patch_id_test.go +++ b/internal/gitaly/service/diff/patch_id_test.go @@ -292,10 +292,7 @@ func TestGetPatchID(t *testing.T) { OldRevision: []byte("HEAD~1"), NewRevision: []byte("HEAD"), }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/objectpool/alternates_test.go b/internal/gitaly/service/objectpool/alternates_test.go index 853118832..3b2959e6f 100644 --- a/internal/gitaly/service/objectpool/alternates_test.go +++ b/internal/gitaly/service/objectpool/alternates_test.go @@ -114,12 +114,9 @@ func TestDisconnectGitAlternates_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.DisconnectGitAlternatesRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.DisconnectGitAlternatesRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/objectpool/get_test.go b/internal/gitaly/service/objectpool/get_test.go index 63cf8560a..96772e523 100644 --- a/internal/gitaly/service/objectpool/get_test.go +++ b/internal/gitaly/service/objectpool/get_test.go @@ -75,12 +75,9 @@ func TestGetObjectPool_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.GetObjectPoolRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.GetObjectPoolRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/operations/apply_patch_test.go b/internal/gitaly/service/operations/apply_patch_test.go index 15790e89a..ecd60dfa5 100644 --- a/internal/gitaly/service/operations/apply_patch_test.go +++ b/internal/gitaly/service/operations/apply_patch_test.go @@ -868,13 +868,10 @@ func TestFailedValidationUserApplyPatch(t *testing.T) { expectedErr error }{ { - desc: "missing Repository", - branchName: "new-branch", - user: gittest.TestUser, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "missing Repository", + branchName: "new-branch", + user: gittest.TestUser, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "missing Branch", diff --git a/internal/gitaly/service/operations/branches_test.go b/internal/gitaly/service/operations/branches_test.go index 8c93af9f8..4501e356a 100644 --- a/internal/gitaly/service/operations/branches_test.go +++ b/internal/gitaly/service/operations/branches_test.go @@ -357,10 +357,7 @@ func TestUserCreateBranch_Failure(t *testing.T) { branchName: "shiny-new-branch", startPoint: "", user: gittest.TestUser, - err: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + err: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty start_point", diff --git a/internal/gitaly/service/operations/cherry_pick_test.go b/internal/gitaly/service/operations/cherry_pick_test.go index 87a30d55e..0f26d527a 100644 --- a/internal/gitaly/service/operations/cherry_pick_test.go +++ b/internal/gitaly/service/operations/cherry_pick_test.go @@ -458,10 +458,7 @@ func TestServer_UserCherryPick_failedValidations(t *testing.T) { request: &gitalypb.UserCherryPickRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty user", diff --git a/internal/gitaly/service/operations/commit_files_test.go b/internal/gitaly/service/operations/commit_files_test.go index 77ba2a760..33a6037d2 100644 --- a/internal/gitaly/service/operations/commit_files_test.go +++ b/internal/gitaly/service/operations/commit_files_test.go @@ -1686,12 +1686,9 @@ func testFailedUserCommitFilesRequest(t *testing.T, ctx context.Context) { expectedErr error }{ { - desc: "unset repository", - req: headerRequest(nil, gittest.TestUser, branchName, commitFilesMessage, "", ""), - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "unset repository", + req: headerRequest(nil, gittest.TestUser, branchName, commitFilesMessage, "", ""), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty User", diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go index c48fbb848..4a43a57f8 100644 --- a/internal/gitaly/service/operations/merge_test.go +++ b/internal/gitaly/service/operations/merge_test.go @@ -365,10 +365,7 @@ func testUserMergeBranchFailure(t *testing.T, ctx context.Context) { User: gittest.TestUser, } }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty user", @@ -1178,10 +1175,7 @@ func TestUserFFBranch(t *testing.T) { }, } }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty user", diff --git a/internal/gitaly/service/operations/rebase_test.go b/internal/gitaly/service/operations/rebase_test.go index e451bc424..068c7b0a1 100644 --- a/internal/gitaly/service/operations/rebase_test.go +++ b/internal/gitaly/service/operations/rebase_test.go @@ -782,10 +782,7 @@ func TestUserRebaseConfirmable_failedWithCode(t *testing.T) { buildHeaderRequest: func() *gitalypb.UserRebaseConfirmableRequest { return buildHeaderRequest(nil, gittest.TestUser, "1", rebaseBranchName, branchCommitID, nil, "master") }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "non-existing storage", diff --git a/internal/gitaly/service/operations/revert_test.go b/internal/gitaly/service/operations/revert_test.go index 16f167a9a..71fa4411e 100644 --- a/internal/gitaly/service/operations/revert_test.go +++ b/internal/gitaly/service/operations/revert_test.go @@ -207,10 +207,7 @@ func TestUserRevert(t *testing.T) { request: &gitalypb.UserRevertRequest{ Repository: nil, }, - expectedError: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedError: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/operations/squash_test.go b/internal/gitaly/service/operations/squash_test.go index 80556000b..d401f8868 100644 --- a/internal/gitaly/service/operations/squash_test.go +++ b/internal/gitaly/service/operations/squash_test.go @@ -539,10 +539,7 @@ func TestUserSquash_validation(t *testing.T) { StartSha: startSha, EndSha: endSha, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty User", diff --git a/internal/gitaly/service/operations/submodules_test.go b/internal/gitaly/service/operations/submodules_test.go index 7cad7be53..46053393c 100644 --- a/internal/gitaly/service/operations/submodules_test.go +++ b/internal/gitaly/service/operations/submodules_test.go @@ -261,11 +261,8 @@ func testUserUpdateSubmodule(t *testing.T, ctx context.Context) { Submodule: []byte("sub"), CommitMessage: []byte("Updating Submodule: sub"), }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), - verify: func(t *testing.T) {}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), + verify: func(t *testing.T) {}, } }, }, diff --git a/internal/gitaly/service/operations/tags_test.go b/internal/gitaly/service/operations/tags_test.go index 85da22421..bccb397fe 100644 --- a/internal/gitaly/service/operations/tags_test.go +++ b/internal/gitaly/service/operations/tags_test.go @@ -112,10 +112,7 @@ func TestUserDeleteTag(t *testing.T) { TagName: []byte("mars"), User: gittest.TestUser, }, - expectedError: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedError: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, @@ -1320,10 +1317,7 @@ func TestUserCreateTag_invalidArgument(t *testing.T) { tagName: "shiny-new-tag", targetRevision: "main", user: gittest.TestUser, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty target revision", diff --git a/internal/gitaly/service/ref/branches_test.go b/internal/gitaly/service/ref/branches_test.go index f0607bceb..9b7ef3565 100644 --- a/internal/gitaly/service/ref/branches_test.go +++ b/internal/gitaly/service/ref/branches_test.go @@ -96,12 +96,9 @@ func TestFailedFindBranchRequest(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - repo: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + repo: nil, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty branch name", diff --git a/internal/gitaly/service/ref/delete_refs_test.go b/internal/gitaly/service/ref/delete_refs_test.go index 2d090dc53..c4cdeaef3 100644 --- a/internal/gitaly/service/ref/delete_refs_test.go +++ b/internal/gitaly/service/ref/delete_refs_test.go @@ -262,12 +262,9 @@ func TestDeleteRefs_validation(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - request: &gitalypb.DeleteRefsRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + request: &gitalypb.DeleteRefsRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Invalid repository", @@ -290,10 +287,7 @@ func TestDeleteRefs_validation(t *testing.T) { Repository: nil, ExceptWithPrefix: [][]byte{[]byte("exclude-this")}, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "No prefixes nor refs", diff --git a/internal/gitaly/service/ref/find_all_tags_test.go b/internal/gitaly/service/ref/find_all_tags_test.go index 6b27a5394..da8de92d3 100644 --- a/internal/gitaly/service/ref/find_all_tags_test.go +++ b/internal/gitaly/service/ref/find_all_tags_test.go @@ -446,12 +446,9 @@ func TestFindAllTags_invalidRequest(t *testing.T) { expectedErr error }{ { - desc: "empty request", - request: &gitalypb.FindAllTagsRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "empty request", + request: &gitalypb.FindAllTagsRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid repo", diff --git a/internal/gitaly/service/ref/find_refs_by_oid_test.go b/internal/gitaly/service/ref/find_refs_by_oid_test.go index 31aa0ef41..81d718091 100644 --- a/internal/gitaly/service/ref/find_refs_by_oid_test.go +++ b/internal/gitaly/service/ref/find_refs_by_oid_test.go @@ -240,10 +240,7 @@ func TestFindRefsByOID_validation(t *testing.T) { Repository: nil, Oid: "abcdefg", }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, "no oid": { req: &gitalypb.FindRefsByOIDRequest{ diff --git a/internal/gitaly/service/ref/find_tag_test.go b/internal/gitaly/service/ref/find_tag_test.go index 9df1be8be..d39cac6bc 100644 --- a/internal/gitaly/service/ref/find_tag_test.go +++ b/internal/gitaly/service/ref/find_tag_test.go @@ -302,12 +302,9 @@ func TestFindTag_invalidRequest(t *testing.T) { expectedErr error }{ { - desc: "empty request", - request: &gitalypb.FindTagRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "empty request", + request: &gitalypb.FindTagRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid repo", diff --git a/internal/gitaly/service/ref/list_refs_test.go b/internal/gitaly/service/ref/list_refs_test.go index 68bc12402..150709392 100644 --- a/internal/gitaly/service/ref/list_refs_test.go +++ b/internal/gitaly/service/ref/list_refs_test.go @@ -266,12 +266,9 @@ func TestListRefs_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.ListRefsRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.ListRefsRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "no Patterns", diff --git a/internal/gitaly/service/ref/refexists_test.go b/internal/gitaly/service/ref/refexists_test.go index 1f72d8ebd..f6854c6f6 100644 --- a/internal/gitaly/service/ref/refexists_test.go +++ b/internal/gitaly/service/ref/refexists_test.go @@ -172,12 +172,9 @@ func TestRefExists_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.RefExistsRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.RefExistsRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid ref name", diff --git a/internal/gitaly/service/ref/refnames_containing_test.go b/internal/gitaly/service/ref/refnames_containing_test.go index 3df911110..d84a825ad 100644 --- a/internal/gitaly/service/ref/refnames_containing_test.go +++ b/internal/gitaly/service/ref/refnames_containing_test.go @@ -43,10 +43,7 @@ func TestListTagNamesContainingCommit(t *testing.T) { request: &gitalypb.ListTagNamesContainingCommitRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid commit ID", @@ -161,10 +158,7 @@ func TestListBranchNamesContainingCommit(t *testing.T) { request: &gitalypb.ListBranchNamesContainingCommitRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid commit", diff --git a/internal/gitaly/service/ref/refs_test.go b/internal/gitaly/service/ref/refs_test.go index 6885fb032..7342b2ed1 100644 --- a/internal/gitaly/service/ref/refs_test.go +++ b/internal/gitaly/service/ref/refs_test.go @@ -168,11 +168,8 @@ func TestFindDefaultBranchName(t *testing.T) { desc: "repository not provided", setup: func(t *testing.T, ctx context.Context, cfg config.Cfg) setupData { return setupData{ - request: &gitalypb.FindDefaultBranchNameRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + request: &gitalypb.FindDefaultBranchNameRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, @@ -483,12 +480,9 @@ func TestFindLocalBranches_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - repo: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + repo: nil, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "repository doesn't exist on disk", @@ -680,10 +674,7 @@ func TestInvalidFindAllBranchesRequest(t *testing.T) { { description: "Empty request", request: &gitalypb.FindAllBranchesRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { description: "Invalid repo", diff --git a/internal/gitaly/service/ref/remote_branches_test.go b/internal/gitaly/service/ref/remote_branches_test.go index e40769c06..f6d64430b 100644 --- a/internal/gitaly/service/ref/remote_branches_test.go +++ b/internal/gitaly/service/ref/remote_branches_test.go @@ -111,10 +111,7 @@ func TestInvalidFindAllRemoteBranchesRequest(t *testing.T) { { description: "Empty repo", request: &gitalypb.FindAllRemoteBranchesRequest{RemoteName: "myRemote"}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { description: "Empty remote name", diff --git a/internal/gitaly/service/ref/tag_messages_test.go b/internal/gitaly/service/ref/tag_messages_test.go index f1eb63ffe..f1c6ef130 100644 --- a/internal/gitaly/service/ref/tag_messages_test.go +++ b/internal/gitaly/service/ref/tag_messages_test.go @@ -71,10 +71,7 @@ func TestFailedGetTagMessagesRequest(t *testing.T) { Repository: nil, TagIds: []string{"5937ac0a7beb003549fc5fd26fc247adbce4a52e"}, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } diff --git a/internal/gitaly/service/ref/tag_signatures_test.go b/internal/gitaly/service/ref/tag_signatures_test.go index f651bdbb2..a4a314586 100644 --- a/internal/gitaly/service/ref/tag_signatures_test.go +++ b/internal/gitaly/service/ref/tag_signatures_test.go @@ -203,12 +203,9 @@ func TestGetTagSignatures_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.GetTagSignaturesRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.GetTagSignaturesRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "no tag revisions", diff --git a/internal/gitaly/service/remote/find_remote_root_ref_test.go b/internal/gitaly/service/remote/find_remote_root_ref_test.go index 78811e641..bc8994795 100644 --- a/internal/gitaly/service/remote/find_remote_root_ref_test.go +++ b/internal/gitaly/service/remote/find_remote_root_ref_test.go @@ -64,10 +64,7 @@ func TestFindRemoteRootRef(t *testing.T) { request: &gitalypb.FindRemoteRootRefRequest{ RemoteUrl: "remote-url", }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/remote/update_remote_mirror_test.go b/internal/gitaly/service/remote/update_remote_mirror_test.go index 6a1f58a55..f3007de17 100644 --- a/internal/gitaly/service/remote/update_remote_mirror_test.go +++ b/internal/gitaly/service/remote/update_remote_mirror_test.go @@ -739,10 +739,7 @@ func TestUpdateRemoteMirror_Validations(t *testing.T) { }, } }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "no Remote", diff --git a/internal/gitaly/service/repository/apply_gitattributes_test.go b/internal/gitaly/service/repository/apply_gitattributes_test.go index 25eb55132..abc787348 100644 --- a/internal/gitaly/service/repository/apply_gitattributes_test.go +++ b/internal/gitaly/service/repository/apply_gitattributes_test.go @@ -231,13 +231,10 @@ func TestApplyGitattributes_failure(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - repo: nil, - revision: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + repo: nil, + revision: nil, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "unknown storage provided", diff --git a/internal/gitaly/service/repository/archive_test.go b/internal/gitaly/service/repository/archive_test.go index 96220abac..0eaf2a1d5 100644 --- a/internal/gitaly/service/repository/archive_test.go +++ b/internal/gitaly/service/repository/archive_test.go @@ -112,10 +112,7 @@ func TestGetArchive(t *testing.T) { CommitId: commitID.String(), Format: gitalypb.GetArchiveRequest_ZIP, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty commit ID", diff --git a/internal/gitaly/service/repository/backup_repository_test.go b/internal/gitaly/service/repository/backup_repository_test.go index 441df4a34..796bb2fda 100644 --- a/internal/gitaly/service/repository/backup_repository_test.go +++ b/internal/gitaly/service/repository/backup_repository_test.go @@ -11,6 +11,7 @@ import ( "gitlab.com/gitlab-org/gitaly/v16/internal/git" "gitlab.com/gitlab-org/gitaly/v16/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/config" + "gitlab.com/gitlab-org/gitaly/v16/internal/gitaly/storage" "gitlab.com/gitlab-org/gitaly/v16/internal/structerr" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper" "gitlab.com/gitlab-org/gitaly/v16/internal/testhelper/testserver" @@ -87,10 +88,7 @@ func TestServerBackupRepository(t *testing.T) { backupID: "abc123", } }, - expectedErr: structerr.NewInvalidArgument(testhelper.GitalyOrPraefect( - "repository not set", - "repo scoped: repository not set", - )), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "repository with no branches", diff --git a/internal/gitaly/service/repository/calculate_checksum_test.go b/internal/gitaly/service/repository/calculate_checksum_test.go index 1d5d5f080..a26caff3d 100644 --- a/internal/gitaly/service/repository/calculate_checksum_test.go +++ b/internal/gitaly/service/repository/calculate_checksum_test.go @@ -97,12 +97,9 @@ func TestFailedCalculateChecksum(t *testing.T) { ), }, { - desc: "Repository is nil", - request: &gitalypb.CalculateChecksumRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository is nil", + request: &gitalypb.CalculateChecksumRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } diff --git a/internal/gitaly/service/repository/config_test.go b/internal/gitaly/service/repository/config_test.go index 189f80a81..80f85689f 100644 --- a/internal/gitaly/service/repository/config_test.go +++ b/internal/gitaly/service/repository/config_test.go @@ -77,9 +77,6 @@ func TestGetConfig(t *testing.T) { t.Run("no repository provided", func(t *testing.T) { _, err := getConfig(t, client, nil) - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) }) } diff --git a/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go b/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go index 382d2f08c..c9a8501a1 100644 --- a/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go +++ b/internal/gitaly/service/repository/create_bundle_from_ref_list_test.go @@ -126,10 +126,7 @@ func TestCreateBundleFromRefList_validations(t *testing.T) { request: &gitalypb.CreateBundleFromRefListRequest{ Patterns: [][]byte{[]byte("master")}, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty bundle", diff --git a/internal/gitaly/service/repository/create_bundle_test.go b/internal/gitaly/service/repository/create_bundle_test.go index d798694e7..103b470fb 100644 --- a/internal/gitaly/service/repository/create_bundle_test.go +++ b/internal/gitaly/service/repository/create_bundle_test.go @@ -74,12 +74,9 @@ func TestFailedCreateBundleRequestDueToValidations(t *testing.T) { expectedErr error }{ { - desc: "empty repository", - request: &gitalypb.CreateBundleRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "empty repository", + request: &gitalypb.CreateBundleRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } diff --git a/internal/gitaly/service/repository/create_fork_test.go b/internal/gitaly/service/repository/create_fork_test.go index 11800f3d4..b57eaec9f 100644 --- a/internal/gitaly/service/repository/create_fork_test.go +++ b/internal/gitaly/service/repository/create_fork_test.go @@ -272,12 +272,9 @@ func TestCreateFork_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.CreateForkRequest{Repository: nil, SourceRepository: srcRepo}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.CreateForkRequest{Repository: nil, SourceRepository: srcRepo}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "source repository not provided", diff --git a/internal/gitaly/service/repository/create_repository_from_bundle_test.go b/internal/gitaly/service/repository/create_repository_from_bundle_test.go index 8403df23d..61ff967b9 100644 --- a/internal/gitaly/service/repository/create_repository_from_bundle_test.go +++ b/internal/gitaly/service/repository/create_repository_from_bundle_test.go @@ -254,10 +254,7 @@ func TestCreateRepositoryFromBundle_invalidArgument(t *testing.T) { require.NoError(t, stream.Send(&gitalypb.CreateRepositoryFromBundleRequest{})) _, err = stream.CloseAndRecv() - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) } func TestCreateRepositoryFromBundle_existingRepository(t *testing.T) { diff --git a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go index 416d0b731..a72f6f439 100644 --- a/internal/gitaly/service/repository/create_repository_from_snapshot_test.go +++ b/internal/gitaly/service/repository/create_repository_from_snapshot_test.go @@ -355,12 +355,9 @@ func TestServer_CreateRepositoryFromSnapshot_validate(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - req: &gitalypb.CreateRepositoryFromSnapshotRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + req: &gitalypb.CreateRepositoryFromSnapshotRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } diff --git a/internal/gitaly/service/repository/create_repository_from_url_test.go b/internal/gitaly/service/repository/create_repository_from_url_test.go index 4a732c4a0..29e2e2534 100644 --- a/internal/gitaly/service/repository/create_repository_from_url_test.go +++ b/internal/gitaly/service/repository/create_repository_from_url_test.go @@ -335,12 +335,9 @@ func TestServer_CloneFromURLCommand_validate(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - req: &gitalypb.CreateRepositoryFromURLRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + req: &gitalypb.CreateRepositoryFromURLRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "no URL provided", diff --git a/internal/gitaly/service/repository/create_repository_test.go b/internal/gitaly/service/repository/create_repository_test.go index a294f44d2..eaa1547d4 100644 --- a/internal/gitaly/service/repository/create_repository_test.go +++ b/internal/gitaly/service/repository/create_repository_test.go @@ -213,12 +213,9 @@ func TestCreateRepository_invalidArguments(t *testing.T) { expectedErr error }{ { - desc: "missing repository", - repo: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "missing repository", + repo: nil, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid storage", diff --git a/internal/gitaly/service/repository/fetch_bundle_test.go b/internal/gitaly/service/repository/fetch_bundle_test.go index 04f1e48eb..bf11697eb 100644 --- a/internal/gitaly/service/repository/fetch_bundle_test.go +++ b/internal/gitaly/service/repository/fetch_bundle_test.go @@ -142,10 +142,7 @@ func TestServer_FetchBundle_validation(t *testing.T) { firstRequest: &gitalypb.FetchBundleRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "unknown repo", diff --git a/internal/gitaly/service/repository/fetch_remote_test.go b/internal/gitaly/service/repository/fetch_remote_test.go index a0e72d967..0a9ea74e8 100644 --- a/internal/gitaly/service/repository/fetch_remote_test.go +++ b/internal/gitaly/service/repository/fetch_remote_test.go @@ -691,10 +691,7 @@ func TestFetchRemote(t *testing.T) { request: &gitalypb.FetchRemoteRequest{ RemoteParams: &gitalypb.Remote{Url: remoteRepoPath}, }, - runs: []run{{expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - )}}, + runs: []run{{expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet)}}, } }, }, diff --git a/internal/gitaly/service/repository/fetch_test.go b/internal/gitaly/service/repository/fetch_test.go index 702d63b85..22f8ef245 100644 --- a/internal/gitaly/service/repository/fetch_test.go +++ b/internal/gitaly/service/repository/fetch_test.go @@ -145,10 +145,7 @@ func TestFetchSourceBranch(t *testing.T) { }, } }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "failure due to no source branch", diff --git a/internal/gitaly/service/repository/fsck_test.go b/internal/gitaly/service/repository/fsck_test.go index 73e778dce..c7401ed9a 100644 --- a/internal/gitaly/service/repository/fsck_test.go +++ b/internal/gitaly/service/repository/fsck_test.go @@ -36,11 +36,8 @@ func TestFsck(t *testing.T) { desc: "request is missing repository", setup: func(t *testing.T) setupData { return setupData{ - repo: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + repo: nil, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/repository/fullpath_test.go b/internal/gitaly/service/repository/fullpath_test.go index 9ca7910ef..bc8b05413 100644 --- a/internal/gitaly/service/repository/fullpath_test.go +++ b/internal/gitaly/service/repository/fullpath_test.go @@ -29,10 +29,7 @@ func TestSetFullPath(t *testing.T) { Path: "my/repo", }) require.Nil(t, response) - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) }) t.Run("missing path", func(t *testing.T) { @@ -159,10 +156,7 @@ func TestFullPath(t *testing.T) { Repository: nil, }) require.Nil(t, response) - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) }) t.Run("nonexistent repository", func(t *testing.T) { diff --git a/internal/gitaly/service/repository/get_custom_hooks_test.go b/internal/gitaly/service/repository/get_custom_hooks_test.go index 645ad9115..ff562d52b 100644 --- a/internal/gitaly/service/repository/get_custom_hooks_test.go +++ b/internal/gitaly/service/repository/get_custom_hooks_test.go @@ -208,12 +208,9 @@ func TestGetCustomHooks_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.GetCustomHooksRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.GetCustomHooksRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { @@ -237,12 +234,9 @@ func TestBackupCustomHooks_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.BackupCustomHooksRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.BackupCustomHooksRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/repository/has_local_branches_test.go b/internal/gitaly/service/repository/has_local_branches_test.go index cdc90f2e3..d0b0dc555 100644 --- a/internal/gitaly/service/repository/has_local_branches_test.go +++ b/internal/gitaly/service/repository/has_local_branches_test.go @@ -66,12 +66,9 @@ func TestHasLocalBranches_failure(t *testing.T) { expectedErr error }{ { - desc: "repository nil", - repository: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository nil", + repository: nil, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "repository doesn't exist", diff --git a/internal/gitaly/service/repository/info_attributes_test.go b/internal/gitaly/service/repository/info_attributes_test.go index 67a790d21..3db6c8f59 100644 --- a/internal/gitaly/service/repository/info_attributes_test.go +++ b/internal/gitaly/service/repository/info_attributes_test.go @@ -72,8 +72,5 @@ func TestGetInfoAttributes_validate(t *testing.T) { response, err := client.GetInfoAttributes(ctx, &gitalypb.GetInfoAttributesRequest{Repository: nil}) require.NoError(t, err) _, err = response.Recv() - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) } diff --git a/internal/gitaly/service/repository/license_test.go b/internal/gitaly/service/repository/license_test.go index 19f7c5b48..f27594983 100644 --- a/internal/gitaly/service/repository/license_test.go +++ b/internal/gitaly/service/repository/license_test.go @@ -259,10 +259,7 @@ func TestFindLicense_validate(t *testing.T) { client, serverSocketPath := runRepositoryService(t, cfg) cfg.SocketPath = serverSocketPath _, err := client.FindLicense(ctx, &gitalypb.FindLicenseRequest{Repository: nil}) - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) } func BenchmarkFindLicense(b *testing.B) { diff --git a/internal/gitaly/service/repository/merge_base_test.go b/internal/gitaly/service/repository/merge_base_test.go index 397c4157f..48e367dbe 100644 --- a/internal/gitaly/service/repository/merge_base_test.go +++ b/internal/gitaly/service/repository/merge_base_test.go @@ -93,12 +93,9 @@ func TestFailedFindMergeBaseRequestDueToValidations(t *testing.T) { expectedErr error }{ { - desc: "no repository provided", - req: &gitalypb.FindMergeBaseRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "no repository provided", + req: &gitalypb.FindMergeBaseRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "no enough revisions", diff --git a/internal/gitaly/service/repository/object_format_test.go b/internal/gitaly/service/repository/object_format_test.go index 247a6b7f2..a371ce303 100644 --- a/internal/gitaly/service/repository/object_format_test.go +++ b/internal/gitaly/service/repository/object_format_test.go @@ -36,11 +36,8 @@ func TestObjectFormat(t *testing.T) { desc: "unset repository", setup: func(t *testing.T) setupData { return setupData{ - request: &gitalypb.ObjectFormatRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + request: &gitalypb.ObjectFormatRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/repository/optimize_test.go b/internal/gitaly/service/repository/optimize_test.go index 8842397a9..14820bcfe 100644 --- a/internal/gitaly/service/repository/optimize_test.go +++ b/internal/gitaly/service/repository/optimize_test.go @@ -337,12 +337,9 @@ func TestOptimizeRepository_validation(t *testing.T) { expectedErr error }{ { - desc: "empty repository", - request: &gitalypb.OptimizeRepositoryRequest{}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "empty repository", + request: &gitalypb.OptimizeRepositoryRequest{}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid repository storage", diff --git a/internal/gitaly/service/repository/prune_unreachable_objects_test.go b/internal/gitaly/service/repository/prune_unreachable_objects_test.go index 101ad074c..96b1f183a 100644 --- a/internal/gitaly/service/repository/prune_unreachable_objects_test.go +++ b/internal/gitaly/service/repository/prune_unreachable_objects_test.go @@ -30,10 +30,7 @@ func TestPruneUnreachableObjects(t *testing.T) { t.Run("missing repository", func(t *testing.T) { _, err := client.PruneUnreachableObjects(ctx, &gitalypb.PruneUnreachableObjectsRequest{}) - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) }) t.Run("relative path points to removed repository", func(t *testing.T) { diff --git a/internal/gitaly/service/repository/raw_changes_test.go b/internal/gitaly/service/repository/raw_changes_test.go index f404f20a3..05acb6ae0 100644 --- a/internal/gitaly/service/repository/raw_changes_test.go +++ b/internal/gitaly/service/repository/raw_changes_test.go @@ -185,10 +185,7 @@ func TestGetRawChangesFailures(t *testing.T) { FromRevision: "cfe32cf61b73a0d5e9f13e774abde7ff789b1660", ToRevision: "913c66a37b4a45b9769037c55c2d238bd0942d2e", }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "missing commit", diff --git a/internal/gitaly/service/repository/replicate_test.go b/internal/gitaly/service/repository/replicate_test.go index dd6b3426e..2def918db 100644 --- a/internal/gitaly/service/repository/replicate_test.go +++ b/internal/gitaly/service/repository/replicate_test.go @@ -226,12 +226,9 @@ func TestReplicateRepository(t *testing.T) { // Set up a request with no target repository specified to verify that validation // fails and the RPC returns an error as expected. return setupData{ - source: source, - target: nil, - expectedError: structerr.NewInvalidArgument(testhelper.GitalyOrPraefect( - storage.ErrRepositoryNotSet.Error(), - fmt.Sprintf("repo scoped: %s", storage.ErrRepositoryNotSet.Error()), - )), + source: source, + target: nil, + expectedError: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/repository/repository_info_test.go b/internal/gitaly/service/repository/repository_info_test.go index c3a6c2d09..54e255527 100644 --- a/internal/gitaly/service/repository/repository_info_test.go +++ b/internal/gitaly/service/repository/repository_info_test.go @@ -56,10 +56,7 @@ func TestRepositoryInfo(t *testing.T) { request: &gitalypb.RepositoryInfoRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), } }, }, diff --git a/internal/gitaly/service/repository/search_files_test.go b/internal/gitaly/service/repository/search_files_test.go index f5227b73b..2f830db0e 100644 --- a/internal/gitaly/service/repository/search_files_test.go +++ b/internal/gitaly/service/repository/search_files_test.go @@ -66,10 +66,7 @@ func TestSearchFilesByContent(t *testing.T) { request: &gitalypb.SearchFilesByContentRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "empty request", @@ -285,10 +282,7 @@ func TestSearchFilesByName(t *testing.T) { Query: "foo", Ref: []byte("branch"), }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "invalid filter", diff --git a/internal/gitaly/service/repository/set_custom_hooks_test.go b/internal/gitaly/service/repository/set_custom_hooks_test.go index f48ec9ca7..3823209e1 100644 --- a/internal/gitaly/service/repository/set_custom_hooks_test.go +++ b/internal/gitaly/service/repository/set_custom_hooks_test.go @@ -169,10 +169,7 @@ func TestSetCustomHooks_failedValidation(t *testing.T) { _, client := setupRepositoryServiceWithoutRepo(t) err := tc.streamSender(t, ctx, client) - testhelper.RequireGrpcError(t, testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), err) + testhelper.RequireGrpcError(t, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), err) }) } } diff --git a/internal/gitaly/service/repository/size_test.go b/internal/gitaly/service/repository/size_test.go index b0bd85ae9..289d36e8d 100644 --- a/internal/gitaly/service/repository/size_test.go +++ b/internal/gitaly/service/repository/size_test.go @@ -104,10 +104,7 @@ func TestFailedRepositorySizeRequest(t *testing.T) { { description: "no repository provided", repo: nil, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } diff --git a/internal/gitaly/service/smarthttp/inforefs_test.go b/internal/gitaly/service/smarthttp/inforefs_test.go index 7c5e0df2d..564e5e922 100644 --- a/internal/gitaly/service/smarthttp/inforefs_test.go +++ b/internal/gitaly/service/smarthttp/inforefs_test.go @@ -137,12 +137,9 @@ func TestInfoRefsUploadPack_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.InfoRefsRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.InfoRefsRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "not existing repository", @@ -331,12 +328,9 @@ func TestInfoRefsReceivePack_validate(t *testing.T) { expectedErr error }{ { - desc: "repository not provided", - req: &gitalypb.InfoRefsRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "repository not provided", + req: &gitalypb.InfoRefsRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "not existing repository", diff --git a/internal/gitaly/service/smarthttp/receive_pack_test.go b/internal/gitaly/service/smarthttp/receive_pack_test.go index 9fef88f8b..f341884e6 100644 --- a/internal/gitaly/service/smarthttp/receive_pack_test.go +++ b/internal/gitaly/service/smarthttp/receive_pack_test.go @@ -388,12 +388,9 @@ func TestPostReceivePack_requestValidation(t *testing.T) { ), }, { - desc: "Repository is nil", - request: &gitalypb.PostReceivePackRequest{Repository: nil, GlId: "user-123"}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository is nil", + request: &gitalypb.PostReceivePackRequest{Repository: nil, GlId: "user-123"}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "Empty GlId", diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go index 566b90017..f3ca4f7d1 100644 --- a/internal/gitaly/service/smarthttp/upload_pack_test.go +++ b/internal/gitaly/service/smarthttp/upload_pack_test.go @@ -307,12 +307,9 @@ func testServerPostUploadPackValidation(t *testing.T, ctx context.Context, makeR ), }, { - desc: "unset repository", - request: &gitalypb.PostUploadPackWithSidechannelRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "unset repository", + request: &gitalypb.PostUploadPackWithSidechannelRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { @@ -350,12 +347,9 @@ func testServerPostUploadPackWithSideChannelValidation(t *testing.T, ctx context ), }, { - desc: "Repository no provided", - req: &gitalypb.PostUploadPackWithSidechannelRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + desc: "Repository no provided", + req: &gitalypb.PostUploadPackWithSidechannelRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, } { t.Run(tc.desc, func(t *testing.T) { diff --git a/internal/gitaly/service/ssh/receive_pack_test.go b/internal/gitaly/service/ssh/receive_pack_test.go index ed4c75070..2ab5bbb77 100644 --- a/internal/gitaly/service/ssh/receive_pack_test.go +++ b/internal/gitaly/service/ssh/receive_pack_test.go @@ -68,10 +68,7 @@ func TestReceivePack_validation(t *testing.T) { Repository: nil, GlId: "user-123", }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "missing GlId", diff --git a/internal/gitaly/service/ssh/upload_archive_test.go b/internal/gitaly/service/ssh/upload_archive_test.go index 479421dd9..c21a92438 100644 --- a/internal/gitaly/service/ssh/upload_archive_test.go +++ b/internal/gitaly/service/ssh/upload_archive_test.go @@ -98,12 +98,9 @@ func TestFailedUploadArchiveRequestDueToValidationError(t *testing.T) { ), }, { - Desc: "Repository is nil", - Req: &gitalypb.SSHUploadArchiveRequest{Repository: nil}, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + Desc: "Repository is nil", + Req: &gitalypb.SSHUploadArchiveRequest{Repository: nil}, + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { Desc: "Data exists on first request", diff --git a/internal/gitaly/service/ssh/upload_pack_test.go b/internal/gitaly/service/ssh/upload_pack_test.go index 2a1e304f4..822704e5e 100644 --- a/internal/gitaly/service/ssh/upload_pack_test.go +++ b/internal/gitaly/service/ssh/upload_pack_test.go @@ -491,10 +491,7 @@ func TestUploadPack_validation(t *testing.T) { request: &gitalypb.SSHUploadPackRequest{ Repository: nil, }, - expectedErr: testhelper.GitalyOrPraefect( - structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), - structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet), - ), + expectedErr: structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet), }, { desc: "data in first request", diff --git a/internal/praefect/coordinator.go b/internal/praefect/coordinator.go index 5186f0d0d..0f139b06f 100644 --- a/internal/praefect/coordinator.go +++ b/internal/praefect/coordinator.go @@ -676,7 +676,7 @@ func (c *Coordinator) StreamDirector(ctx context.Context, fullMethodName string, targetRepo, err := mi.TargetRepo(m) if err != nil { if errors.Is(err, protoregistry.ErrRepositoryFieldNotFound) { - return nil, structerr.NewInvalidArgument("repo scoped: %w", storage.ErrRepositoryNotSet) + return nil, structerr.NewInvalidArgument("%w", storage.ErrRepositoryNotSet) } return nil, structerr.New("repo scoped: %w", err) |