xrpc,knotserver: refactor RefNotFound errors #565

merged
opened by oppi.li targeting master from push-yqnqquktxqpx
+1 -4
knotserver/xrpc/repo_archive.go
···
gr, err := git.Open(repoPath, ref)
if err != nil {
-
writeError(w, xrpcerr.NewXrpcError(
-
xrpcerr.WithTag("RefNotFound"),
-
xrpcerr.WithMessage("repository or ref not found"),
-
), http.StatusNotFound)
return
}
···
gr, err := git.Open(repoPath, ref)
if err != nil {
+
writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)
return
}
+1 -4
knotserver/xrpc/repo_blob.go
···
gr, err := git.Open(repoPath, ref)
if err != nil {
-
writeError(w, xrpcerr.NewXrpcError(
-
xrpcerr.WithTag("RefNotFound"),
-
xrpcerr.WithMessage("repository or ref not found"),
-
), http.StatusNotFound)
return
}
···
gr, err := git.Open(repoPath, ref)
if err != nil {
+
writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)
return
}
+2 -8
knotserver/xrpc/repo_diff.go
···
gr, err := git.Open(repoPath, ref)
if err != nil {
-
writeError(w, xrpcerr.NewXrpcError(
-
xrpcerr.WithTag("RefNotFound"),
-
xrpcerr.WithMessage("repository or ref not found"),
-
), http.StatusNotFound)
return
}
diff, err := gr.Diff()
if err != nil {
x.Logger.Error("getting diff", "error", err.Error())
-
writeError(w, xrpcerr.NewXrpcError(
-
xrpcerr.WithTag("RefNotFound"),
-
xrpcerr.WithMessage("failed to generate diff"),
-
), http.StatusInternalServerError)
return
}
···
gr, err := git.Open(repoPath, ref)
if err != nil {
+
writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)
return
}
diff, err := gr.Diff()
if err != nil {
x.Logger.Error("getting diff", "error", err.Error())
+
writeError(w, xrpcerr.RefNotFoundError, http.StatusInternalServerError)
return
}
+1 -4
knotserver/xrpc/repo_languages.go
···
gr, err := git.Open(repoPath, ref)
if err != nil {
x.Logger.Error("opening repo", "error", err.Error())
-
writeError(w, xrpcerr.NewXrpcError(
-
xrpcerr.WithTag("RefNotFound"),
-
xrpcerr.WithMessage("repository or ref not found"),
-
), http.StatusNotFound)
return
}
···
gr, err := git.Open(repoPath, ref)
if err != nil {
x.Logger.Error("opening repo", "error", err.Error())
+
writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)
return
}
+1 -4
knotserver/xrpc/repo_log.go
···
gr, err := git.Open(repoPath, ref)
if err != nil {
-
writeError(w, xrpcerr.NewXrpcError(
-
xrpcerr.WithTag("RefNotFound"),
-
xrpcerr.WithMessage("repository or ref not found"),
-
), http.StatusNotFound)
return
}
···
gr, err := git.Open(repoPath, ref)
if err != nil {
+
writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)
return
}
+1 -4
knotserver/xrpc/repo_tree.go
···
gr, err := git.Open(repoPath, ref)
if err != nil {
x.Logger.Error("failed to open git repository", "error", err, "path", repoPath, "ref", ref)
-
writeError(w, xrpcerr.NewXrpcError(
-
xrpcerr.WithTag("RefNotFound"),
-
xrpcerr.WithMessage("repository or ref not found"),
-
), http.StatusNotFound)
return
}
···
gr, err := git.Open(repoPath, ref)
if err != nil {
x.Logger.Error("failed to open git repository", "error", err, "path", repoPath, "ref", ref)
+
writeError(w, xrpcerr.RefNotFoundError, http.StatusNotFound)
return
}
+5
xrpc/errors/errors.go
···
WithMessage("failed to access repository"),
)
var AuthError = func(err error) XrpcError {
return NewXrpcError(
WithTag("Auth"),
···
WithMessage("failed to access repository"),
)
+
var RefNotFoundError = NewXrpcError(
+
WithTag("RefNotFound"),
+
WithMessage("failed to access ref"),
+
)
+
var AuthError = func(err error) XrpcError {
return NewXrpcError(
WithTag("Auth"),