You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by ra...@apache.org on 2020/04/27 14:28:52 UTC

[trafficcontrol] branch master updated: Fixed hiding query parameter parsing errors from client (#4664)

This is an automated email from the ASF dual-hosted git repository.

rawlin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git


The following commit(s) were added to refs/heads/master by this push:
     new d737a6c  Fixed hiding query parameter parsing errors from client (#4664)
d737a6c is described below

commit d737a6c76e532001da63812eb9b93bcfe19f57df
Author: ocket8888 <oc...@apache.org>
AuthorDate: Mon Apr 27 08:28:44 2020 -0600

    Fixed hiding query parameter parsing errors from client (#4664)
---
 .../traffic_ops_golang/invalidationjobs/invalidationjobs.go    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go b/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go
index c2ae40c..70c393f 100644
--- a/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go
+++ b/traffic_ops/traffic_ops_golang/invalidationjobs/invalidationjobs.go
@@ -34,6 +34,7 @@ import (
 	"github.com/apache/trafficcontrol/lib/go-log"
 	"github.com/apache/trafficcontrol/lib/go-rfc"
 	"github.com/apache/trafficcontrol/lib/go-tc"
+	"github.com/apache/trafficcontrol/lib/go-util"
 	"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/api"
 	"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/dbhelpers"
 	"github.com/apache/trafficcontrol/traffic_ops/traffic_ops_golang/tenant"
@@ -206,14 +207,7 @@ func (job *InvalidationJob) Read() ([]interface{}, error, error, int) {
 
 	where, orderBy, pagination, queryValues, errs := dbhelpers.BuildWhereAndOrderByAndPagination(job.APIInfo().Params, queryParamsToSQLCols)
 	if len(errs) > 0 {
-		var b strings.Builder
-		b.WriteString("Reading jobs:")
-		for _, err := range errs {
-			b.WriteString("\n\t")
-			b.WriteString(err.Error())
-		}
-
-		return nil, nil, errors.New(b.String()), http.StatusInternalServerError
+		return nil, util.JoinErrs(errs), nil, http.StatusBadRequest
 	}
 
 	accessibleTenants, err := tenant.GetUserTenantIDListTx(job.APIInfo().Tx.Tx, job.APIInfo().User.TenantID)