From 0758cb3e7d8acf247f1a5e2023fa37ef335e0e39 Mon Sep 17 00:00:00 2001 From: "Claire.Nicholas" Date: Thu, 28 Dec 2023 10:28:32 -0500 Subject: [PATCH] fixing vaders comments --- api/build/restart.go | 6 +++--- api/deployment/get.go | 8 ++++++++ database/deployment/count_repo.go | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/api/build/restart.go b/api/build/restart.go index 08f1f0049..9be4e2e01 100644 --- a/api/build/restart.go +++ b/api/build/restart.go @@ -339,9 +339,9 @@ func RestartBuild(c *gin.Context) { c.JSON(http.StatusCreated, b) - d, err2 := database.FromContext(c).GetDeploymentForRepo(c, r, b.GetDeployNumber()) - if err2 != nil { - logger.Errorf("unable to set get deployment for build %s: %v", entry, err2) + d, err := database.FromContext(c).GetDeploymentForRepo(c, r, b.GetDeployNumber()) + if err != nil { + logger.Errorf("unable to set get deployment for build %s: %v", entry, err) } build := append(d.Builds, b) diff --git a/api/deployment/get.go b/api/deployment/get.go index cbee8ffd6..50fe543b3 100644 --- a/api/deployment/get.go +++ b/api/deployment/get.go @@ -108,5 +108,13 @@ func GetDeployment(c *gin.Context) { dep = d } + if dep == nil { + retErr := fmt.Errorf("invalid deployment parameter provided: %s", deployment) + + util.HandleError(c, http.StatusBadRequest, retErr) + + return + } + c.JSON(http.StatusOK, dep) } diff --git a/database/deployment/count_repo.go b/database/deployment/count_repo.go index 7ce3e06c8..93a7c1ac8 100644 --- a/database/deployment/count_repo.go +++ b/database/deployment/count_repo.go @@ -10,7 +10,7 @@ import ( "github.com/sirupsen/logrus" ) -// CountDeploymentssForRepo gets the count of deployments by repo ID from the database. +// CountDeploymentsForRepo gets the count of deployments by repo ID from the database. func (e *engine) CountDeploymentsForRepo(ctx context.Context, r *library.Repo) (int64, error) { e.logger.WithFields(logrus.Fields{ "org": r.GetOrg(),