Merge pull request #9296 from hashicorp/b-remove-namespace-from-scale…

…-request Remove Namespace field from JobScaleRequest
hashicorp · Nov 9, 2020 · 6881346 · 6881346
2 parents 3854916 + b9991a3
commit 6881346
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/command/agent/job_endpoint.go b/command/agent/job_endpoint.go
@@ -495,15 +495,13 @@ func (s *HTTPServer) jobScaleAction(resp http.ResponseWriter, req *http.Request,
 		return nil, CodedError(400, err.Error())
 	}
 
-	namespace := args.Target[structs.ScalingTargetNamespace]
 	targetJob := args.Target[structs.ScalingTargetJob]
 	if targetJob != "" && targetJob != jobName {
 		return nil, CodedError(400, "job ID in payload did not match URL")
 	}
 
 	scaleReq := structs.JobScaleRequest{
 		JobID:          jobName,
-		Namespace:      namespace,
 		Target:         args.Target,
 		Count:          args.Count,
 		PolicyOverride: args.PolicyOverride,

diff --git a/nomad/structs/structs.go b/nomad/structs/structs.go
@@ -693,13 +693,12 @@ type JobPlanRequest struct {
 // JobScaleRequest is used for the Job.Scale endpoint to scale one of the
 // scaling targets in a job
 type JobScaleRequest struct {
-	Namespace string
-	JobID     string
-	Target    map[string]string
-	Count     *int64
-	Message   string
-	Error     bool
-	Meta      map[string]interface{}
+	JobID   string
+	Target  map[string]string
+	Count   *int64
+	Message string
+	Error   bool
+	Meta    map[string]interface{}
 	// PolicyOverride is set when the user is attempting to override any policies
 	PolicyOverride bool
 	WriteRequest