Merge 96c06e4 into backport/b-fix-api-panic-job-plan/marginally-commu…

…nal-bedbug
hashicorp · Jun 23, 2023 · 95cdfba · 95cdfba
2 parents 5df9943 + 96c06e4
commit 95cdfba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/api/jobs.go b/api/jobs.go
@@ -427,6 +427,9 @@ func (j *Jobs) PlanOpts(job *Job, opts *PlanOptions, q *WriteOptions) (*JobPlanR
 	if job == nil {
 		return nil, nil, errors.New("must pass non-nil job")
 	}
+	if job.ID == nil {
+		return nil, nil, errors.New("job is missing ID")
+	}
 
 	// Setup the request
 	req := &JobPlanRequest{

diff --git a/api/jobs_test.go b/api/jobs_test.go
@@ -1753,6 +1753,12 @@ func TestJobs_Plan(t *testing.T) {
 	_, _, err = jobs.Plan(nil, true, nil)
 	must.Error(t, err)
 
+	// Check that passing a nil job ID fails
+	invalidJob := testJob()
+	invalidJob.ID = nil
+	_, _, err = jobs.Plan(invalidJob, true, nil)
+	must.Error(t, err)
+
 	// Make a plan request
 	planResp, wm, err := jobs.Plan(job, true, nil)
 	must.NoError(t, err)