remove dead code (#508)

metal-stack · Mar 4, 2024 · 405ad42 · 405ad42
1 parent 9858b21
commit 405ad42
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/cmd/metal-api/internal/service/image-service.go b/cmd/metal-api/internal/service/image-service.go
@@ -375,10 +375,8 @@ func (r *imageResource) deleteImage(request *restful.Request, response *restful.
 
 	machines := r.machinesByImage(ms, img.ID)
 	if len(machines) > 0 {
-		if err != nil {
-			r.sendError(request, response, httperrors.UnprocessableEntity(fmt.Errorf("image %s is in use by machines:%v", img.ID, machines)))
-			return
-		}
+		r.sendError(request, response, httperrors.UnprocessableEntity(fmt.Errorf("image %s is in use by machines:%v", img.ID, machines)))
+		return
 	}
 
 	err = r.ds.DeleteImage(img)

diff --git a/cmd/metal-api/internal/service/network-service.go b/cmd/metal-api/internal/service/network-service.go
@@ -700,10 +700,8 @@ func (r *networkResource) deleteNetwork(request *restful.Request, response *rest
 	}
 
 	if len(children) != 0 {
-		if err != nil {
-			r.sendError(request, response, defaultError(errors.New("network cannot be deleted because there are children of this network")))
-			return
-		}
+		r.sendError(request, response, defaultError(errors.New("network cannot be deleted because there are children of this network")))
+		return
 	}
 
 	allIPs, err := r.ds.ListIPs()