From 45b6a12e4551b085fae6ee783855d26c43967279 Mon Sep 17 00:00:00 2001 From: Michael Yang Date: Wed, 1 May 2024 12:39:05 -0700 Subject: [PATCH] server: target invalid --- cmd/cmd.go | 2 +- server/routes.go | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/cmd/cmd.go b/cmd/cmd.go index 2315ad1a..eb6ae76f 100644 --- a/cmd/cmd.go +++ b/cmd/cmd.go @@ -1125,7 +1125,7 @@ Environment Variables: RunE: ListHandler, } copyCmd := &cobra.Command{ - Use: "cp SOURCE TARGET", + Use: "cp SOURCE DESTINATION", Short: "Copy a model", Args: cobra.ExactArgs(2), PreRunE: checkServerHeartbeat, diff --git a/server/routes.go b/server/routes.go index b1962d23..917bb2ef 100644 --- a/server/routes.go +++ b/server/routes.go @@ -810,16 +810,13 @@ func (s *Server) CopyModelHandler(c *gin.Context) { src := model.ParseName(r.Source) if !src.IsValid() { - _ = c.Error(fmt.Errorf("source %q is invalid", r.Source)) + c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("source %q is invalid", r.Source)}) + return } dst := model.ParseName(r.Destination) if !dst.IsValid() { - _ = c.Error(fmt.Errorf("destination %q is invalid", r.Destination)) - } - - if len(c.Errors) > 0 { - c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": c.Errors.Errors()}) + c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("destination %q is invalid", r.Source)}) return }