fixed http endpoints for job.register and job.scalestatus

api/scaling.go

@@ -69,7 +69,7 @@ type ScalingPolicyListStub struct {
 	ModifyIndex uint64
 }
 
-// JobScaleStatusResponse is the payload for a generic scaling action
+// JobScaleStatusResponse is used to return information about job scaling status
 type JobScaleStatusResponse struct {
 	JobID          string
 	JobCreateIndex uint64

command/agent/job_endpoint.go

@@ -473,32 +473,24 @@ func (s *HTTPServer) jobScale(resp http.ResponseWriter, req *http.Request,
 func (s *HTTPServer) jobScaleStatus(resp http.ResponseWriter, req *http.Request,
 	jobName string) (interface{}, error) {
 
-	args := structs.JobSpecificRequest{
+	args := structs.JobScaleStatusRequest{
 		JobID: jobName,
 	}
 	if s.parse(resp, req, &args.Region, &args.QueryOptions) {
 		return nil, nil
 	}
 
-	var out structs.SingleJobResponse
-	if err := s.agent.RPC("Job.GetJob", &args, &out); err != nil {
+	var out structs.JobScaleStatusResponse
+	if err := s.agent.RPC("Job.ScaleStatus", &args, &out); err != nil {
 		return nil, err
 	}
 
 	setMeta(resp, &out.QueryMeta)
-	if out.Job == nil {
+	if out.JobScaleStatus == nil {
 		return nil, CodedError(404, "job not found")
 	}
 
-	status := &api.JobScaleStatusResponse{
-		JobID:          out.Job.ID,
-		JobCreateIndex: out.Job.CreateIndex,
-		JobModifyIndex: out.Job.ModifyIndex,
-		Stopped:        out.Job.Stop,
-		TaskGroups:     nil, // TODO
-	}
-
-	return status, nil
+	return out.JobScaleStatus, nil
 }
 
 func (s *HTTPServer) jobScaleAction(resp http.ResponseWriter, req *http.Request,

command/agent/job_endpoint_test.go

@@ -666,14 +666,14 @@ func TestHTTP_JobDelete(t *testing.T) {
 	})
 }
 
-func TestHTTP_Job_GroupScale(t *testing.T) {
+func TestHTTP_Job_ScaleTaskGroup(t *testing.T) {
 	t.Parallel()
 
 	require := require.New(t)
 
 	httpTest(t, nil, func(s *TestAgent) {
 		// Create the job
-		job, policy := mock.JobWithScalingPolicy()
+		job := mock.Job()
 		args := structs.JobRegisterRequest{
 			Job: job,
 			WriteRequest: structs.WriteRequest{
@@ -682,22 +682,21 @@ func TestHTTP_Job_GroupScale(t *testing.T) {
 			},
 		}
 		var resp structs.JobRegisterResponse
-		if err := s.Agent.RPC("Job.Register", &args, &resp); err != nil {
-			t.Fatalf("err: %v", err)
-		}
-
-		// FINISH: cgbaker: do something with args.reason
+		require.NoError(s.Agent.RPC("Job.Register", &args, &resp))
 
 		newCount := job.TaskGroups[0].Count + 1
 		scaleReq := &api.ScalingRequest{
-			JobID:  job.ID,
-			Value:  newCount,
-			Reason: "testing",
+			Count:  int64(newCount),
+			Reason: helper.StringToPtr("testing"),
+			Target: map[string]string{
+				"Job":   job.ID,
+				"Group": job.TaskGroups[0].Name,
+			},
 		}
 		buf := encodeReq(scaleReq)
 
 		// Make the HTTP request to scale the job group
-		req, err := http.NewRequest("POST", policy.Target, buf)
+		req, err := http.NewRequest("POST", "/v1/job/"+job.ID+"/scale", buf)
 		require.NoError(err)
 		respW := httptest.NewRecorder()
 
@@ -728,14 +727,14 @@ func TestHTTP_Job_GroupScale(t *testing.T) {
 	})
 }
 
-func TestHTTP_Job_GroupScaleStatus(t *testing.T) {
+func TestHTTP_Job_ScaleStatus(t *testing.T) {
 	t.Parallel()
 
 	require := require.New(t)
 
 	httpTest(t, nil, func(s *TestAgent) {
 		// Create the job
-		job, policy := mock.JobWithScalingPolicy()
+		job := mock.Job()
 		args := structs.JobRegisterRequest{
 			Job: job,
 			WriteRequest: structs.WriteRequest{
@@ -749,7 +748,7 @@ func TestHTTP_Job_GroupScaleStatus(t *testing.T) {
 		}
 
 		// Make the HTTP request to scale the job group
-		req, err := http.NewRequest("GET", policy.Target, nil)
+		req, err := http.NewRequest("GET", "/v1/job/"+job.ID+"/scale", nil)
 		require.NoError(err)
 		respW := httptest.NewRecorder()
 
@@ -758,9 +757,9 @@ func TestHTTP_Job_GroupScaleStatus(t *testing.T) {
 		require.NoError(err)
 
 		// Check the response
-		status := obj.(*api.JobScaleStatusResponse)
+		status := obj.(*structs.JobScaleStatus)
 		require.NotEmpty(resp.EvalID)
-		require.Equal(job.TaskGroups[0].Count, status.Value.(int))
+		require.Equal(job.TaskGroups[0].Count, status.TaskGroups[job.TaskGroups[0].Name].Desired)
 
 		// Check for the index
 		require.NotEmpty(respW.Header().Get("X-Nomad-Index"))