Merge branch 'main' of github.com:go-vela/server into feat/otel-tracing

go-vela · Aug 21, 2024 · c22be46 · c22be46
2 parents e590f23 + 77ee0a7
commit c22be46
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 59 deletions.
diff --git a/api/build/list_org.go b/api/build/list_org.go
@@ -186,7 +186,7 @@ func ListBuildsForOrg(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// See if the user is an org admin to bypass individual permission checks
 	perm, err := scm.FromContext(c).OrgAccess(ctx, u, o)

diff --git a/api/build/list_repo.go b/api/build/list_repo.go
@@ -215,7 +215,7 @@ func ListBuildsForRepo(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// capture before query parameter if present, default to now
 	before, err := strconv.ParseInt(c.DefaultQuery("before", strconv.FormatInt(time.Now().UTC().Unix(), 10)), 10, 64)

diff --git a/api/deployment/list.go b/api/deployment/list.go
@@ -107,7 +107,7 @@ func ListDeployments(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the total number of deployments for the repo
 	t, err := database.FromContext(c).CountDeploymentsForRepo(c, r)

diff --git a/api/hook/list.go b/api/hook/list.go
@@ -109,7 +109,7 @@ func ListHooks(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the list of steps for the build
 	h, t, err := database.FromContext(c).ListHooksForRepo(ctx, r, page, perPage)

diff --git a/api/log/list_build.go b/api/log/list_build.go
@@ -109,7 +109,7 @@ func ListLogsForBuild(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the list of logs for the build
 	bl, t, err := database.FromContext(c).ListLogsForBuild(ctx, b, page, perPage)

diff --git a/api/pipeline/list.go b/api/pipeline/list.go
@@ -113,7 +113,7 @@ func ListPipelines(c *gin.Context) {
 	// ensure per_page isn't above or below allowed values
 	//
 	//nolint:gomnd // ignore magic number
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	p, t, err := database.FromContext(c).ListPipelinesForRepo(ctx, r, page, perPage)
 	if err != nil {

diff --git a/api/repo/list.go b/api/repo/list.go
@@ -95,7 +95,7 @@ func ListRepos(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// capture the sort_by query parameter if present
 	sortBy := util.QueryParameter(c, "sort_by", "name")

diff --git a/api/repo/list_org.go b/api/repo/list_org.go
@@ -117,7 +117,7 @@ func ListReposForOrg(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// capture the sort_by query parameter if present
 	sortBy := util.QueryParameter(c, "sort_by", "name")

diff --git a/api/repo/update.go b/api/repo/update.go
@@ -107,32 +107,14 @@ func UpdateRepo(c *gin.Context) {
 	// update build limit if set
 	if input.GetBuildLimit() > 0 {
 		// allow build limit between 1 - value configured by server
-		r.SetBuildLimit(
-			int64(
-				util.MaxInt(
-					constants.BuildLimitMin,
-					util.MinInt(
-						int(input.GetBuildLimit()),
-						int(maxBuildLimit),
-					), // clamp max
-				), // clamp min
-			),
-		)
+		limit := max(constants.BuildLimitMin, min(input.GetBuildLimit(), maxBuildLimit))
+		r.SetBuildLimit(limit)
 	}
 
 	if input.GetTimeout() > 0 {
 		// update build timeout if set
-		r.SetTimeout(
-			int64(
-				util.MaxInt(
-					constants.BuildTimeoutMin,
-					util.MinInt(
-						int(input.GetTimeout()),
-						constants.BuildTimeoutMax,
-					), // clamp max
-				), // clamp min
-			),
-		)
+		limit := max(constants.BuildTimeoutMin, min(input.GetTimeout(), constants.BuildTimeoutMax))
+		r.SetTimeout(limit)
 	}
 
 	if input.GetCounter() > 0 {

diff --git a/api/schedule/list.go b/api/schedule/list.go
@@ -108,7 +108,7 @@ func ListSchedules(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the list of schedules for the repo
 	s, t, err := database.FromContext(c).ListSchedulesForRepo(ctx, r, page, perPage)

diff --git a/api/secret/list.go b/api/secret/list.go
@@ -173,7 +173,7 @@ func ListSecrets(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the list of secrets
 	s, err := secret.FromContext(c, e).List(ctx, t, o, n, page, perPage, teams)

diff --git a/api/service/list.go b/api/service/list.go
@@ -117,7 +117,7 @@ func ListServices(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the list of services for the build
 	s, t, err := database.FromContext(c).ListServicesForBuild(ctx, b, map[string]interface{}{}, page, perPage)

diff --git a/api/step/list.go b/api/step/list.go
@@ -117,7 +117,7 @@ func ListSteps(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the list of steps for the build
 	s, t, err := database.FromContext(c).ListStepsForBuild(ctx, b, map[string]interface{}{}, page, perPage)

diff --git a/api/user/list.go b/api/user/list.go
@@ -92,7 +92,7 @@ func ListUsers(c *gin.Context) {
 	}
 
 	// ensure per_page isn't above or below allowed values
-	perPage = util.MaxInt(1, util.MinInt(100, perPage))
+	perPage = max(1, min(100, perPage))
 
 	// send API call to capture the list of users
 	users, t, err := database.FromContext(c).ListLiteUsers(ctx, page, perPage)

diff --git a/util/util.go b/util/util.go
@@ -31,30 +31,6 @@ func HandleError(c context.Context, status int, err error) {
 	}
 }
 
-// MaxInt is a helper function to clamp the integer which
-// prevents it from being higher then the provided value.
-//
-// Currently, Go only supports float64 via math. ( max | min ).
-func MaxInt(a, b int) int {
-	if a > b {
-		return a
-	}
-
-	return b
-}
-
-// MinInt is a helper function to clamp the integer which
-// prevents it from being lower then the provided value.
-//
-// Currently, Go only supports float64 via math. ( max | min ).
-func MinInt(a, b int) int {
-	if a < b {
-		return a
-	}
-
-	return b
-}
-
 // FormParameter safely captures a form parameter from the context
 // by removing any new lines and HTML escaping the value.
 func FormParameter(c *gin.Context, parameter string) string {