fixed comments

Parallels · May 15, 2024 · beefa62 · beefa62
1 parent 56132f1
commit beefa62
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/catalog/push_metadata.go b/src/catalog/push_metadata.go
@@ -82,7 +82,11 @@ func (s *CatalogManifestService) PushMetadata(ctx basecontext.ApiContext, r *mod
 				break
 			}
 
-			helper.DeleteFile(filepath.Join("/tmp", s.getMetaFilename(manifest.Name)))
+			if err := helper.DeleteFile(filepath.Join("/tmp", s.getMetaFilename(manifest.Name))); err != nil {
+				ctx.LogErrorf("Error deleting metadata file %v: %v", s.getMetaFilename(manifest.Name), err)
+				manifest.AddError(err)
+				break
+			}
 
 			catalogManifest.RequiredClaims = r.RequiredClaims
 			catalogManifest.RequiredRoles = r.RequiredRoles

diff --git a/src/controllers/catalog.go b/src/controllers/catalog.go
@@ -682,6 +682,11 @@ func AddClaimsToCatalogManifestHandler() restapi.ControllerHandler {
 				ReturnApiError(ctx, w, models.NewFromError(err))
 				return
 			}
+		} else {
+			ReturnApiError(ctx, w, models.ApiErrorResponse{
+				Message: "No claims provided",
+				Code:    http.StatusBadRequest,
+			})
 		}
 
 		newManifest, err := dbService.GetCatalogManifestsByCatalogIdVersionAndArch(ctx, catalogId, version, architecture)
@@ -769,6 +774,11 @@ func RemoveClaimsToCatalogManifestHandler() restapi.ControllerHandler {
 				ReturnApiError(ctx, w, models.NewFromError(err))
 				return
 			}
+		} else {
+			ReturnApiError(ctx, w, models.ApiErrorResponse{
+				Message: "No claims provided",
+				Code:    http.StatusBadRequest,
+			})
 		}
 
 		newManifest, err := dbService.GetCatalogManifestsByCatalogIdVersionAndArch(ctx, catalogId, version, architecture)
@@ -856,6 +866,11 @@ func AddRolesToCatalogManifestHandler() restapi.ControllerHandler {
 				ReturnApiError(ctx, w, models.NewFromError(err))
 				return
 			}
+		} else {
+			ReturnApiError(ctx, w, models.ApiErrorResponse{
+				Message: "No roles provided",
+				Code:    http.StatusBadRequest,
+			})
 		}
 
 		newManifest, err := dbService.GetCatalogManifestsByCatalogIdVersionAndArch(ctx, catalogId, version, architecture)
@@ -943,6 +958,11 @@ func RemoveRolesToCatalogManifestHandler() restapi.ControllerHandler {
 				ReturnApiError(ctx, w, models.NewFromError(err))
 				return
 			}
+		} else {
+			ReturnApiError(ctx, w, models.ApiErrorResponse{
+				Message: "No roles provided",
+				Code:    http.StatusBadRequest,
+			})
 		}
 
 		newManifest, err := dbService.GetCatalogManifestsByCatalogIdVersionAndArch(ctx, catalogId, version, architecture)
@@ -1030,6 +1050,11 @@ func AddTagsToCatalogManifestHandler() restapi.ControllerHandler {
 				ReturnApiError(ctx, w, models.NewFromError(err))
 				return
 			}
+		} else {
+			ReturnApiError(ctx, w, models.ApiErrorResponse{
+				Message: "No tags provided",
+				Code:    http.StatusBadRequest,
+			})
 		}
 
 		newManifest, err := dbService.GetCatalogManifestsByCatalogIdVersionAndArch(ctx, catalogId, version, architecture)
@@ -1117,6 +1142,11 @@ func RemoveTagsToCatalogManifestHandler() restapi.ControllerHandler {
 				ReturnApiError(ctx, w, models.NewFromError(err))
 				return
 			}
+		} else {
+			ReturnApiError(ctx, w, models.ApiErrorResponse{
+				Message: "No tags provided",
+				Code:    http.StatusBadRequest,
+			})
 		}
 
 		newManifest, err := dbService.GetCatalogManifestsByCatalogIdVersionAndArch(ctx, catalogId, version, architecture)