xrpc,knotserver: refactor RefNotFound errors #565

merged
opened by oppi.li targeting master from push-yqnqquktxqpx
+1 -4
knotserver/xrpc/repo_archive.go
··· 40 41 gr, err := git.Open(repoPath, ref) 42 if err != nil { 43 - writeError(w, xrpcerr.NewXrpcError( 44 - xrpcerr.WithTag("RefNotFound"), 45 - xrpcerr.WithMessage("repository or ref not found"), 46 - ), http.StatusNotFound) 47 return 48 } 49
··· 40 41 gr, err := git.Open(repoPath, ref) 42 if err != nil { 43 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 44 return 45 } 46
+1 -4
knotserver/xrpc/repo_blob.go
··· 39 40 gr, err := git.Open(repoPath, ref) 41 if err != nil { 42 - writeError(w, xrpcerr.NewXrpcError( 43 - xrpcerr.WithTag("RefNotFound"), 44 - xrpcerr.WithMessage("repository or ref not found"), 45 - ), http.StatusNotFound) 46 return 47 } 48
··· 39 40 gr, err := git.Open(repoPath, ref) 41 if err != nil { 42 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 43 return 44 } 45
+2 -8
knotserver/xrpc/repo_diff.go
··· 22 23 gr, err := git.Open(repoPath, ref) 24 if err != nil { 25 - writeError(w, xrpcerr.NewXrpcError( 26 - xrpcerr.WithTag("RefNotFound"), 27 - xrpcerr.WithMessage("repository or ref not found"), 28 - ), http.StatusNotFound) 29 return 30 } 31 32 diff, err := gr.Diff() 33 if err != nil { 34 x.Logger.Error("getting diff", "error", err.Error()) 35 - writeError(w, xrpcerr.NewXrpcError( 36 - xrpcerr.WithTag("RefNotFound"), 37 - xrpcerr.WithMessage("failed to generate diff"), 38 - ), http.StatusInternalServerError) 39 return 40 } 41
··· 22 23 gr, err := git.Open(repoPath, ref) 24 if err != nil { 25 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 26 return 27 } 28 29 diff, err := gr.Diff() 30 if err != nil { 31 x.Logger.Error("getting diff", "error", err.Error()) 32 + writeError(w, xrpcerr.RefNotFoundError, http.StatusInternalServerError) 33 return 34 } 35
+1 -4
knotserver/xrpc/repo_languages.go
··· 25 gr, err := git.Open(repoPath, ref) 26 if err != nil { 27 x.Logger.Error("opening repo", "error", err.Error()) 28 - writeError(w, xrpcerr.NewXrpcError( 29 - xrpcerr.WithTag("RefNotFound"), 30 - xrpcerr.WithMessage("repository or ref not found"), 31 - ), http.StatusNotFound) 32 return 33 } 34
··· 25 gr, err := git.Open(repoPath, ref) 26 if err != nil { 27 x.Logger.Error("opening repo", "error", err.Error()) 28 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 29 return 30 } 31
+1 -4
knotserver/xrpc/repo_log.go
··· 32 33 gr, err := git.Open(repoPath, ref) 34 if err != nil { 35 - writeError(w, xrpcerr.NewXrpcError( 36 - xrpcerr.WithTag("RefNotFound"), 37 - xrpcerr.WithMessage("repository or ref not found"), 38 - ), http.StatusNotFound) 39 return 40 } 41
··· 32 33 gr, err := git.Open(repoPath, ref) 34 if err != nil { 35 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 36 return 37 } 38
+1 -4
knotserver/xrpc/repo_tree.go
··· 30 gr, err := git.Open(repoPath, ref) 31 if err != nil { 32 x.Logger.Error("failed to open git repository", "error", err, "path", repoPath, "ref", ref) 33 - writeError(w, xrpcerr.NewXrpcError( 34 - xrpcerr.WithTag("RefNotFound"), 35 - xrpcerr.WithMessage("repository or ref not found"), 36 - ), http.StatusNotFound) 37 return 38 } 39
··· 30 gr, err := git.Open(repoPath, ref) 31 if err != nil { 32 x.Logger.Error("failed to open git repository", "error", err, "path", repoPath, "ref", ref) 33 + writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound) 34 return 35 } 36
+5
xrpc/errors/errors.go
··· 61 WithMessage("failed to access repository"), 62 ) 63 64 var AuthError = func(err error) XrpcError { 65 return NewXrpcError( 66 WithTag("Auth"),
··· 61 WithMessage("failed to access repository"), 62 ) 63 64 + var RefNotFoundError = NewXrpcError( 65 + WithTag("RefNotFound"), 66 + WithMessage("failed to access ref"), 67 + ) 68 + 69 var AuthError = func(err error) XrpcError { 70 return NewXrpcError( 71 WithTag("Auth"),