making better error messaging

Author: tigranbs

services/container/download.go

@@ -23,11 +23,27 @@ func (s *Service) DownloadHandler(c *gin.Context) {
 	}
 	err := pkg.FillByName(name)
 	if err != nil {
-		c.JSON(500, gin.H{"error": "Error while trying to get package info"})
+		c.JSON(500, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Error while trying to get package info",
+				},
+			},
+		})
 		return
 	}
 	if pkg.ID == uuid.Nil {
-		c.JSON(404, gin.H{"error": "Package not found"})
+		c.JSON(404, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Package not found",
+				},
+			},
+		})
 		return
 	}
 
@@ -36,17 +52,41 @@ func (s *Service) DownloadHandler(c *gin.Context) {
 	}
 	err = asset.FillByDigest(digest)
 	if err != nil {
-		c.JSON(500, gin.H{"error": "Unable to check the DB for package version"})
+		c.JSON(500, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Unable to check the DB for package version",
+				},
+			},
+		})
 		return
 	}
 	if asset.Digest != digest {
-		c.JSON(404, gin.H{"error": "Uploaded asset not found"})
+		c.JSON(404, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Uploaded asset not found",
+				},
+			},
+		})
 		return
 	}
 
 	fileData, err := s.Storage.GetFile(s.PackageFilename(asset.Digest))
 	if err != nil || fileData == nil {
-		c.JSON(404, gin.H{"error": "Not Found"})
+		c.JSON(404, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Not Found",
+				},
+			},
+		})
 		return
 	}
 

services/container/metadata.go

@@ -47,11 +47,27 @@ func (s *Service) pkgVersionMetadata(c *gin.Context) (pkg models.Package[Package
 	}
 	err := pkg.FillByName(name)
 	if err != nil {
-		c.JSON(500, gin.H{"error": "Error while trying to get package info"})
+		c.JSON(500, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Error while trying to get package info",
+				},
+			},
+		})
 		return
 	}
 	if pkg.ID == uuid.Nil {
-		c.JSON(404, gin.H{"error": "Package not found"})
+		c.JSON(404, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Package not found",
+				},
+			},
+		})
 		return
 	}
 	if strings.Contains(tagOrDigest, "sha256:") {
@@ -62,11 +78,27 @@ func (s *Service) pkgVersionMetadata(c *gin.Context) (pkg models.Package[Package
 		pkgVersion, err = pkg.Version(tagOrDigest)
 	}
 	if err != nil {
-		c.JSON(500, gin.H{"error": "Error while trying to get package info"})
+		c.JSON(500, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Error while trying to get package info",
+				},
+			},
+		})
 		return
 	}
 	if pkgVersion.ID == uuid.Nil || pkgVersion.PackageId != pkg.ID {
-		c.JSON(404, gin.H{"error": "Package version not found"})
+		c.JSON(404, gin.H{
+			"errors": []gin.H{
+				{
+					"code":    "DENIED",
+					"message": "authentication required",
+					"detail":  "Package version not found",
+				},
+			},
+		})
 		return
 	}
 	return

services/container/service.go

@@ -74,8 +74,8 @@ func (s *Service) SetAuthHeaderAndAbort(c *gin.Context, message string) {
 			"errors": []gin.H{
 				{
 					"code":    "DENIED",
-					"message": "authentication required",
-					"detail":  "Unable to parse registry host",
+					"message": "Unable to parse registry host",
+					"detail":  "authentication required",
 				},
 			},
 		})
@@ -87,7 +87,7 @@ func (s *Service) SetAuthHeaderAndAbort(c *gin.Context, message string) {
 		"errors": []gin.H{
 			{
 				"code":    "UNAUTHORIZED",
-				"message": "authentication required",
+				"message": message,
 				"detail":  message,
 			},
 		},