Increase test coverage

Author: nfx

common/reflect_resource.go

@@ -183,7 +183,7 @@ func typeToSchema(v reflect.Value, t reflect.Type, path []string) map[string]*sc
 			elem := typeField.Type.Elem()
 			sv := reflect.New(elem).Elem()
 			if strings.Contains(tfTag, "suppress_diff") {
-				// TODO: we may also suppress count diffs on all json:"..,omitempty" (101 occurences)
+				// TODO: we may also suppress count diffs on all json:"..,omitempty" without tf:"force_new"
 				// find . -type f -name '*.go' -not -path "vendor/*" | xargs grep ',omitempty' | grep '*'
 				blockCount := strings.Join(append(path, fieldName, "#"), ".")
 				scm[fieldName].DiffSuppressFunc = makeEmptyBlockSuppressFunc(blockCount)

common/reflect_resource_test.go

@@ -194,7 +194,7 @@ type Dummy struct {
 	Unique      []Address         `json:"unique,omitempty" tf:"slice_set"`
 	Things      []string          `json:"things,omitempty" tf:"slice_set"`
 	Tags        map[string]string `json:"tags,omitempty" tf:"max_items:5"`
-	Home        *Address          `json:"home,omitempty" tf:"group:v"`
+	Home        *Address          `json:"home,omitempty" tf:"group:v,suppress_diff"`
 	House       *Address          `json:"house,omitempty" tf:"group:v"`
 }
 
@@ -368,6 +368,10 @@ func TestStructToData(t *testing.T) {
 	assert.Equal(t, false, d.Get("enabled"))
 	assert.Equal(t, 2, d.Get("addresses.#"))
 
+	assert.NotNil(t, s["home"].DiffSuppressFunc)
+	assert.True(t, s["home"].DiffSuppressFunc("home.#", "1", "0", d))
+	assert.False(t, s["home"].DiffSuppressFunc("home.#", "1", "1", d))
+
 	{
 		//lint:ignore SA1019 Empty optional string should not be set.
 		_, ok := d.GetOkExists("addresses.0.optional_string")

common/resource_test.go

@@ -56,12 +56,16 @@ func TestUpdate(t *testing.T) {
 		},
 	}.ToResource()
 
+	client := &DatabricksClient{}
+	ctx := context.Background()
 	d := r.TestResourceData()
-	datas, err := r.Importer.StateContext(
-		context.Background(), d,
-		&DatabricksClient{})
+	datas, err := r.Importer.StateContext(ctx, d, client)
 	require.NoError(t, err)
 	assert.Len(t, datas, 1)
 	assert.False(t, r.Schema["foo"].ForceNew)
 	assert.Equal(t, "", d.Id())
+
+	diags := r.UpdateContext(ctx, d, client)
+	assert.True(t, diags.HasError())
+	assert.Equal(t, "nope", diags[0].Summary)
 }

compute/resource_job.go

@@ -266,6 +266,9 @@ func ResourceJob() *schema.Resource {
 				return fmt.Errorf("`always_running` must be specified only with `max_concurrent_runs = 1`")
 			}
 			for _, task := range js.Tasks {
+				if task.NewCluster == nil {
+					continue
+				}
 				err = validateClusterDefinition(*task.NewCluster)
 				if err != nil {
 					return fmt.Errorf("task %s invalid: %w", task.TaskKey, err)

compute/resource_job_test.go

@@ -132,6 +132,7 @@ func TestResourceJobCreate_MultiTask(t *testing.T) {
 							NewCluster: &Cluster{
 								SparkVersion: "a",
 								NodeTypeID:   "b",
+								NumWorkers:   1,
 								AzureAttributes: &AzureAttributes{
 									SpotBidMaxPrice: 0.99,
 								},
@@ -152,7 +153,16 @@ func TestResourceJobCreate_MultiTask(t *testing.T) {
 				Resource: "/api/2.1/jobs/get?job_id=789",
 				Response: Job{
 					// good enough for mock
-					Settings: &JobSettings{},
+					Settings: &JobSettings{
+						Tasks: []JobTaskSettings{
+							{
+								TaskKey: "b",
+							},
+							{
+								TaskKey: "a",
+							},
+						},
+					},
 				},
 			},
 		},
@@ -181,6 +191,7 @@ func TestResourceJobCreate_MultiTask(t *testing.T) {
 			new_cluster {
 				spark_version = "a"
 				node_type_id = "b"
+				num_workers = 1
 				azure_attributes {
 					spot_bid_max_price = 0.99
 				}
@@ -997,8 +1008,29 @@ func TestResourceJobDelete_Error(t *testing.T) {
 	assert.Equal(t, "789", d.Id())
 }
 
+func TestJobsAPIList(t *testing.T) {
+	qa.HTTPFixturesApply(t, []qa.HTTPFixture{
+		{
+			Method:   "GET",
+			Resource: "/api/2.0/jobs/list",
+			Response: JobList{
+				Jobs: []Job{
+					{
+						JobID: 1,
+					},
+				},
+			},
+		},
+	}, func(ctx context.Context, client *common.DatabricksClient) {
+		a := NewJobsAPI(ctx, client)
+		l, err := a.List()
+		require.NoError(t, err)
+		assert.Len(t, l.Jobs, 1)
+	})
+}
+
 func TestJobsAPIRunsList(t *testing.T) {
-	c, s, err := qa.HttpFixtureClient(t, []qa.HTTPFixture{
+	qa.HTTPFixturesApply(t, []qa.HTTPFixture{
 		{
 			Method:   "GET",
 			Resource: "/api/2.0/jobs/runs/list?completed_only=true&job_id=234&limit=1",
@@ -1013,17 +1045,15 @@ func TestJobsAPIRunsList(t *testing.T) {
 				},
 			},
 		},
+	}, func(ctx context.Context, client *common.DatabricksClient) {
+		a := NewJobsAPI(ctx, client)
+		l, err := a.RunsList(JobRunsListRequest{
+			JobID:         234,
+			CompletedOnly: true,
+			Limit:         1,
+			Offset:        0,
+		})
+		require.NoError(t, err)
+		assert.Len(t, l.Runs, 1)
 	})
-	require.NoError(t, err)
-	defer s.Close()
-
-	a := NewJobsAPI(context.Background(), c)
-	l, err := a.RunsList(JobRunsListRequest{
-		JobID:         234,
-		CompletedOnly: true,
-		Limit:         1,
-		Offset:        0,
-	})
-	require.NoError(t, err)
-	assert.Len(t, l.Runs, 1)
 }

qa/testing_test.go

@@ -281,3 +281,32 @@ func TestDiagsToString(t *testing.T) {
 		},
 	}))
 }
+
+func TestResourceCornerCases(t *testing.T) {
+	type dummy struct{}
+	x := map[string]string{
+		"foo": "bar",
+	}
+	ResourceCornerCases(t, common.Resource{
+		Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
+			var b dummy
+			return c.Post(ctx, "/dummy", x, &b)
+		},
+		Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
+			var b dummy
+			return c.Get(ctx, "/dummy", x, &b)
+		},
+		Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
+			return c.Put(ctx, "/dummy", x)
+		},
+		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
+			return c.Delete(ctx, "/dummy", x)
+		},
+		Schema: map[string]*schema.Schema{
+			"foo": {
+				Type:     schema.TypeInt,
+				Required: true,
+			},
+		},
+	}.ToResource(), "x")
+}