diff options
| author | Eric Ju <eju@gitlab.com> | 2023-12-14 21:42:10 +0300 |
|---|---|---|
| committer | Eric Ju <eju@gitlab.com> | 2023-12-14 21:42:10 +0300 |
| commit | 5c5997348a8c65070f277b6247178e8f058c2852 (patch) | |
| tree | 69618d090be394279b70da1f41646c44b1378d5f | |
| parent | 2893c46338b2d070bfd8559d09e6c781131fb27f (diff) | |
commit: Fix incorrect GRPC return code in GetTreeEntries
GetTreeEntries returns an InvalidArgument error when a path is not
found. NotFound would likely be a better fit for this error.
| -rw-r--r-- | internal/gitaly/service/commit/get_tree_entries.go | 2 | ||||
| -rw-r--r-- | internal/gitaly/service/commit/get_tree_entries_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/internal/gitaly/service/commit/get_tree_entries.go b/internal/gitaly/service/commit/get_tree_entries.go index df1748f40..d3c8758e9 100644 --- a/internal/gitaly/service/commit/get_tree_entries.go +++ b/internal/gitaly/service/commit/get_tree_entries.go @@ -134,7 +134,7 @@ func (s *server) sendTreeEntries( if errors.Is(err, git.ErrReferenceNotFound) { // Since we rely on repo.ResolveRevision, it could either be an invalid revision // or an invalid path. - return structerr.NewInvalidArgument("invalid revision or path").WithDetail(&gitalypb.GetTreeEntriesError{ + return structerr.NewNotFound("invalid revision or path").WithDetail(&gitalypb.GetTreeEntriesError{ Error: &gitalypb.GetTreeEntriesError_ResolveTree{ ResolveTree: &gitalypb.ResolveRevisionError{ Revision: []byte(revision), diff --git a/internal/gitaly/service/commit/get_tree_entries_test.go b/internal/gitaly/service/commit/get_tree_entries_test.go index 02b27bcaa..025a9c67a 100644 --- a/internal/gitaly/service/commit/get_tree_entries_test.go +++ b/internal/gitaly/service/commit/get_tree_entries_test.go @@ -858,7 +858,7 @@ func TestGetTreeEntries(t *testing.T) { Recursive: true, }, expectedErr: testhelper.WithInterceptedMetadataItems( - structerr.NewInvalidArgument("invalid revision or path").WithDetail(&gitalypb.GetTreeEntriesError{ + structerr.NewNotFound("invalid revision or path").WithDetail(&gitalypb.GetTreeEntriesError{ Error: &gitalypb.GetTreeEntriesError_ResolveTree{ ResolveTree: &gitalypb.ResolveRevisionError{ Revision: []byte(commitID), @@ -929,7 +929,7 @@ func TestGetTreeEntries(t *testing.T) { Recursive: true, }, expectedErr: testhelper.WithInterceptedMetadataItems( - structerr.NewInvalidArgument("invalid revision or path").WithDetail(&gitalypb.GetTreeEntriesError{ + structerr.NewNotFound("invalid revision or path").WithDetail(&gitalypb.GetTreeEntriesError{ Error: &gitalypb.GetTreeEntriesError_ResolveTree{ ResolveTree: &gitalypb.ResolveRevisionError{ Revision: []byte("does-not-exist"), |