simplify read by Id

jobs/data_job.go

@@ -20,29 +20,17 @@ func DataSourceJob() *schema.Resource {
 		var list []Job
 		var err error
 		if data.Name != "" {
+			// if name is provided, need to list all jobs ny name
 			list, err = jobsAPI.ListByName(data.Name, true)
 		} else {
-			// if name is not provided, need to list all the jobs and search by id
-			// does not expand tasks to limit the results size
-			list, err = jobsAPI.List()
+			// otherwise, just read the job
+			var job Job
+			job, err = jobsAPI.Read(data.Id)
 			if err != nil {
 				return err
 			}
-			jobName := ""
-			for _, job := range list {
-				currentJob := job // De-referencing the temp variable used by the loop
-				currentJobId := currentJob.ID()
-				if currentJobId == data.Id {
-					jobName = currentJob.Settings.Name
-					break // break the loop after we found the job
-				}
-			}
-			if jobName == "" {
-				return fmt.Errorf("no job found with specified id")
-			}
-
-			// if a matching job id is found, list it by name with expandTasks
-			list, err = jobsAPI.ListByName(jobName, true)
+			data.Job = &job
+			data.Name = job.Settings.Name
 		}
 		if err != nil {
 			return err
@@ -59,7 +47,7 @@ func DataSourceJob() *schema.Resource {
 			}
 		}
 		if data.Job == nil {
-			return fmt.Errorf("no job found with specified name or id")
+			return fmt.Errorf("no job found with specified name")
 		}
 		return nil
 	})

jobs/data_job_test.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"testing"
 
+	"github.com/databricks/terraform-provider-databricks/common"
 	"github.com/databricks/terraform-provider-databricks/qa"
 )
 
@@ -58,7 +59,18 @@ func commonFixtures(name string) []qa.HTTPFixture {
 }
 func TestDataSourceQueryableJobMatchesId(t *testing.T) {
 	qa.ResourceFixture{
-		Fixtures:    append(commonFixtures(""), commonFixtures("Second")...),
+		Fixtures: []qa.HTTPFixture{
+			{
+				Method:   "GET",
+				Resource: "/api/2.0/jobs/get?job_id=234",
+				Response: Job{
+					JobID: 234,
+					Settings: &JobSettings{
+						Name: "Second",
+					},
+				},
+			},
+		},
 		Resource:    DataSourceJob(),
 		Read:        true,
 		New:         true,
@@ -101,16 +113,26 @@ func TestDataSourceQueryableJobNoMatchName(t *testing.T) {
 		NonWritable: true,
 		HCL:         `job_name= "Third"`,
 		ID:          "_",
-	}.ExpectError(t, "no job found with specified name or id")
+	}.ExpectError(t, "no job found with specified name")
 }
 
 func TestDataSourceQueryableJobNoMatchId(t *testing.T) {
 	qa.ResourceFixture{
-		Fixtures:    commonFixtures(""),
+		Fixtures: []qa.HTTPFixture{
+			{
+				Method:   "GET",
+				Resource: "/api/2.0/jobs/get?job_id=567",
+				Response: common.APIErrorBody{
+					ErrorCode: "RESOURCE_DOES_NOT_EXIST",
+					Message:   "Job 567 does not exist.",
+				},
+				Status: 400,
+			},
+		},
 		Resource:    DataSourceJob(),
 		Read:        true,
 		NonWritable: true,
 		HCL:         `job_id= "567"`,
 		ID:          "_",
-	}.ExpectError(t, "no job found with specified id")
+	}.ExpectError(t, "Job 567 does not exist.")
 }