add environment and environment_key to job settings (#3461)

Author: nordp

jobs/resource_job.go

@@ -158,6 +158,8 @@ type ForEachNestedTask struct {
 	MinRetryIntervalMillis int32                          `json:"min_retry_interval_millis,omitempty"`
 	RetryOnTimeout         bool                           `json:"retry_on_timeout,omitempty" tf:"computed"`
 	Health                 *JobHealth                     `json:"health,omitempty"`
+
+	EnvironmentKey string `json:"environment_key,omitempty"`
 }
 
 func sortWebhookNotifications(wn *jobs.WebhookNotifications) {
@@ -238,6 +240,8 @@ type JobTaskSettings struct {
 	MinRetryIntervalMillis int32                          `json:"min_retry_interval_millis,omitempty"`
 	RetryOnTimeout         bool                           `json:"retry_on_timeout,omitempty" tf:"computed"`
 	Health                 *JobHealth                     `json:"health,omitempty"`
+
+	EnvironmentKey string `json:"environment_key,omitempty"`
 }
 
 type JobCluster struct {
@@ -297,9 +301,10 @@ type JobSettings struct {
 	// END Jobs API 2.0
 
 	// BEGIN Jobs API 2.1
-	Tasks       []JobTaskSettings `json:"tasks,omitempty" tf:"alias:task"`
-	Format      string            `json:"format,omitempty" tf:"computed"`
-	JobClusters []JobCluster      `json:"job_clusters,omitempty" tf:"alias:job_cluster"`
+	Tasks        []JobTaskSettings     `json:"tasks,omitempty" tf:"alias:task"`
+	Format       string                `json:"format,omitempty" tf:"computed"`
+	JobClusters  []JobCluster          `json:"job_clusters,omitempty" tf:"alias:job_cluster"`
+	Environments []jobs.JobEnvironment `json:"environments,omitempty" tf:"alias:environment"`
 	// END Jobs API 2.1
 
 	// BEGIN Jobs + Repo integration preview

jobs/resource_job_test.go

@@ -898,6 +898,79 @@ func TestResourceJobCreate_JobClusters(t *testing.T) {
 	assert.Equal(t, "17", d.Id())
 }
 
+func TestResourceJobCreate_JobCompute(t *testing.T) {
+	d, err := qa.ResourceFixture{
+		Fixtures: []qa.HTTPFixture{
+			{
+				Method:   "POST",
+				Resource: "/api/2.1/jobs/create",
+				ExpectedRequest: JobSettings{
+					Name: "JobEnvironments",
+					Tasks: []JobTaskSettings{
+						{
+							TaskKey:        "b",
+							EnvironmentKey: "j",
+							NotebookTask: &NotebookTask{
+								NotebookPath: "/Stuff",
+							},
+						},
+					},
+					MaxConcurrentRuns: 1,
+					Environments: []jobs.JobEnvironment{
+						{
+							EnvironmentKey: "j",
+							Spec: &compute.Environment{
+								Client: "1",
+								Dependencies: []string{
+									"cowsay",
+									"-r /Workspace/Users/[email protected]/my.whl",
+								},
+							},
+						},
+					},
+				},
+				Response: Job{
+					JobID: 18,
+				},
+			},
+			{
+				Method:   "GET",
+				Resource: "/api/2.1/jobs/get?job_id=18",
+				Response: Job{
+					// good enough for mock
+					Settings: &JobSettings{
+						Tasks: []JobTaskSettings{
+							{
+								TaskKey: "b",
+							},
+						},
+					},
+				},
+			},
+		},
+		Create:   true,
+		Resource: ResourceJob(),
+		HCL: `
+		name = "JobEnvironments"
+		environment {
+			environment_key = "j"
+			spec {
+			  client   	= "1"
+			  dependencies = ["cowsay", "-r /Workspace/Users/[email protected]/my.whl"]
+			}
+		}
+		task {
+			task_key = "b"
+			environment_key = "j"
+			notebook_task {
+				notebook_path = "/Stuff"
+			}
+		}`,
+	}.Apply(t)
+	assert.NoError(t, err)
+	assert.Equal(t, "18", d.Id())
+}
+
 func TestResourceJobCreate_SqlSubscriptions(t *testing.T) {
 	d, err := qa.ResourceFixture{
 		Fixtures: []qa.HTTPFixture{