nicer error message

hashicorp · Jan 8, 2021 · cb1c018 · cb1c018
1 parent 59271c6
commit cb1c018
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/nomad/job_endpoint.go b/nomad/job_endpoint.go
@@ -1043,11 +1043,13 @@ func (j *Job) Scale(args *structs.JobScaleRequest, reply *structs.JobRegisterRes
 		if found.Scaling != nil {
 			if *args.Count < found.Scaling.Min {
 				return structs.NewErrRPCCoded(400,
-					"new scaling count cannot be less than the scaling policy minimum")
+					fmt.Sprintf("group count was less than scaling policy minimum: %d < %d",
+						*args.Count, found.Scaling.Min))
 			}
 			if found.Scaling.Max < *args.Count {
 				return structs.NewErrRPCCoded(400,
-					"new scaling count cannot be greater than the scaling policy maximum")
+					fmt.Sprintf("group count was greater than scaling policy maximum: %d > %d",
+						*args.Count, found.Scaling.Max))
 			}
 		}
 

diff --git a/nomad/job_endpoint_test.go b/nomad/job_endpoint_test.go
@@ -6731,7 +6731,7 @@ func TestJobEndpoint_Scale_OutOfBounds(t *testing.T) {
 			structs.ScalingTargetGroup: job.TaskGroups[0].Name,
 		},
 		Count:          helper.Int64ToPtr(pol.Max + 1),
-		Message:        "too high",
+		Message:        "out of bounds",
 		PolicyOverride: false,
 		WriteRequest: structs.WriteRequest{
 			Region:    "global",
@@ -6740,13 +6740,12 @@ func TestJobEndpoint_Scale_OutOfBounds(t *testing.T) {
 	}
 	err = msgpackrpc.CallWithCodec(codec, "Job.Scale", scale, &resp)
 	require.Error(err)
-	require.Contains(err.Error(), "cannot be greater than")
+	require.Contains(err.Error(), "group count was greater than scaling policy maximum: 11 > 10")
 
-	scale.Count = helper.Int64ToPtr(pol.Min - 1)
-	scale.Message = "too low"
+	scale.Count = helper.Int64ToPtr(2)
 	err = msgpackrpc.CallWithCodec(codec, "Job.Scale", scale, &resp)
 	require.Error(err)
-	require.Contains(err.Error(), "cannot be less than")
+	require.Contains(err.Error(), "group count was less than scaling policy minimum: 2 < 3")
 }
 
 func TestJobEndpoint_Scale_NoEval(t *testing.T) {