fixed ebs volume count issue of being 0 and added integration tests f…

…or both azure and aws
databricks · Jun 10, 2020 · b0f123a · b0f123a
1 parent a74bb86
commit b0f123a
Show file tree

Hide file tree

Showing 3 changed files with 270 additions and 1 deletion.
diff --git a/databricks/resource_databricks_cluster.go b/databricks/resource_databricks_cluster.go
@@ -1237,7 +1237,7 @@ func parseSchemaToCluster(d *schema.ResourceData, schemaAttPrefix string) model.
 		}
 		if ebsVolumeCount, ok := awsAttributesMap["ebs_volume_count"]; ok {
 			//val, _ := strconv.ParseInt(ebsVolumeCount.(string), 10, 32)
-			awsAttributes.FirstOnDemand = int32(ebsVolumeCount.(int))
+			awsAttributes.EbsVolumeCount = int32(ebsVolumeCount.(int))
 		}
 		if ebsVolumeSize, ok := awsAttributesMap["ebs_volume_size"]; ok {
 			//val, _ := strconv.ParseInt(ebsVolumeSize.(string), 10, 32)

diff --git a/databricks/resource_databricks_job_aws_test.go b/databricks/resource_databricks_job_aws_test.go
@@ -0,0 +1,143 @@
+package databricks
+
+import (
+	"errors"
+	"fmt"
+	"github.com/databrickslabs/databricks-terraform/client/model"
+	"github.com/databrickslabs/databricks-terraform/client/service"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/stretchr/testify/assert"
+	"strconv"
+	"testing"
+)
+
+func TestAccAwsJobResource(t *testing.T) {
+	//var secretScope model.Secre
+	var job model.Job
+	// generate a random name for each tokenInfo test run, to avoid
+	// collisions from multiple concurrent tests.
+	// the acctest package includes many helpers such as RandStringFromCharSet
+	// See https://godoc.org/github.com/hashicorp/terraform-plugin-sdk/helper/acctest
+
+	resource.Test(t, resource.TestCase{
+		Providers:    testAccProviders,
+		CheckDestroy: testAwsJobResourceDestroy,
+		Steps: []resource.TestStep{
+			{
+				// use a dynamic configuration with the random name from above
+				Config: testAwsJobResourceNewCluster(),
+				// compose a basic test, checking both remote and local values
+				Check: resource.ComposeTestCheckFunc(
+					// query the API to retrieve the tokenInfo object
+					testAwsJobResourceExists("databricks_job.my_job", &job, t),
+					// verify remote values
+					testAwsJobValuesNewCluster(t, &job),
+				),
+				Destroy: false,
+			},
+		},
+	})
+}
+
+func testAwsJobResourceDestroy(s *terraform.State) error {
+	client := testAccProvider.Meta().(*service.DBApiClient)
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "databricks_job" {
+			continue
+		}
+		idInt, err := strconv.ParseInt(rs.Primary.ID, 10, 32)
+		if err != nil {
+			return err
+		}
+		_, err = client.Jobs().Read(idInt)
+		if err != nil {
+			return nil
+		}
+		return errors.New("resource job is not cleaned up")
+	}
+	return nil
+}
+
+// testAccCheckTokenResourceExists queries the API and retrieves the matching Widget.
+func testAwsJobResourceExists(n string, job *model.Job, t *testing.T) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		// find the corresponding state object
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		// retrieve the configured client from the test setup
+		conn := testAccProvider.Meta().(*service.DBApiClient)
+		idInt, err := strconv.ParseInt(rs.Primary.ID, 10, 32)
+		if err != nil {
+			return err
+		}
+		resp, err := conn.Jobs().Read(idInt)
+		if err != nil {
+			return err
+		}
+
+		// If no error, assign the response Widget attribute to the widget pointer
+		*job = resp
+		return nil
+	}
+}
+
+// Assertions are based off of the resource definition defined in function: testAwsJobResourceNewCluster
+func testAwsJobValuesNewCluster(t *testing.T, job *model.Job) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		assert.NotNil(t, job.Settings)
+		assert.NotNil(t, job.Settings.NewCluster)
+		assert.NotNil(t, job.Settings.NewCluster.Autoscale)
+		assert.NotNil(t, job.Settings.NewCluster.AwsAttributes)
+		assert.NotNil(t, job.Settings.NotebookTask)
+		assert.Equal(t, 2, int(job.Settings.NewCluster.Autoscale.MinWorkers))
+		assert.Equal(t, 3, int(job.Settings.NewCluster.Autoscale.MaxWorkers))
+		assert.Equal(t,  "6.4.x-scala2.11", job.Settings.NewCluster.SparkVersion)
+		assert.Equal(t,  model.AwsAvailability(model.AwsAvailabilitySpot), job.Settings.NewCluster.AwsAttributes.Availability)
+		assert.Equal(t,  "us-east-1a", job.Settings.NewCluster.AwsAttributes.ZoneID)
+		assert.Equal(t,  100, int(job.Settings.NewCluster.AwsAttributes.SpotBidPricePercent))
+		assert.Equal(t,  1, int(job.Settings.NewCluster.AwsAttributes.FirstOnDemand))
+		assert.Equal(t,  model.EbsVolumeType(model.EbsVolumeTypeGeneralPurposeSsd), job.Settings.NewCluster.AwsAttributes.EbsVolumeType)
+		assert.Equal(t,  1, int(job.Settings.NewCluster.AwsAttributes.EbsVolumeCount))
+		assert.Equal(t,  32, int(job.Settings.NewCluster.AwsAttributes.EbsVolumeSize))
+		assert.Equal(t,  "r3.xlarge", job.Settings.NewCluster.NodeTypeID)
+		assert.Equal(t,  "/Users/jane.doe@databricks.com/my-demo-notebook", job.Settings.NotebookTask.NotebookPath)
+		assert.Equal(t,  "my-demo-notebook", job.Settings.Name)
+		assert.Equal(t,  3600, int(job.Settings.TimeoutSeconds))
+		assert.Equal(t,  1, int(job.Settings.MaxRetries))
+		assert.Equal(t,  1, int(job.Settings.MaxConcurrentRuns))
+		return nil
+	}
+}
+
+func testAwsJobResourceNewCluster() string {
+	return fmt.Sprintf(`
+								resource "databricks_job" "my_job" {
+								  new_cluster  {
+									autoscale  {
+									  min_workers = 2
+									  max_workers = 3
+									}
+									spark_version = "6.4.x-scala2.11"
+									aws_attributes  {
+									  availability = "SPOT"
+									  zone_id = "us-east-1a"
+									  spot_bid_price_percent = "100"
+									  first_on_demand = 1
+									  ebs_volume_type = "GENERAL_PURPOSE_SSD"
+									  ebs_volume_count = 1
+									  ebs_volume_size = 32
+									}
+									node_type_id = "r3.xlarge"
+								  }
+								  notebook_path = "/Users/jane.doe@databricks.com/my-demo-notebook"
+								  name = "my-demo-notebook"
+								  timeout_seconds = 3600
+								  max_retries = 1
+								  max_concurrent_runs = 1
+								}
+								`)
+}
diff --git a/databricks/resource_databricks_job_azure_test.go b/databricks/resource_databricks_job_azure_test.go
@@ -0,0 +1,126 @@
+package databricks
+
+import (
+	"errors"
+	"fmt"
+	"github.com/databrickslabs/databricks-terraform/client/model"
+	"github.com/databrickslabs/databricks-terraform/client/service"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/terraform"
+	"github.com/stretchr/testify/assert"
+	"strconv"
+	"testing"
+)
+
+func TestAccAzureJobResource(t *testing.T) {
+	//var secretScope model.Secre
+	var job model.Job
+	// generate a random name for each tokenInfo test run, to avoid
+	// collisions from multiple concurrent tests.
+	// the acctest package includes many helpers such as RandStringFromCharSet
+	// See https://godoc.org/github.com/hashicorp/terraform-plugin-sdk/helper/acctest
+
+	resource.Test(t, resource.TestCase{
+		Providers:    testAccProviders,
+		CheckDestroy: testAzureJobResourceDestroy,
+		Steps: []resource.TestStep{
+			{
+				// use a dynamic configuration with the random name from above
+				Config: testAzureJobResourceNewCluster(),
+				// compose a basic test, checking both remote and local values
+				Check: resource.ComposeTestCheckFunc(
+					// query the API to retrieve the tokenInfo object
+					testAzureJobResourceExists("databricks_job.my_job", &job, t),
+					// verify remote values
+					testAzureJobValuesNewCluster(t, &job),
+				),
+				Destroy: false,
+			},
+		},
+	})
+}
+
+func testAzureJobResourceDestroy(s *terraform.State) error {
+	client := testAccProvider.Meta().(*service.DBApiClient)
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "databricks_job" {
+			continue
+		}
+		idInt, err := strconv.ParseInt(rs.Primary.ID, 10, 32)
+		if err != nil {
+			return err
+		}
+		_, err = client.Jobs().Read(idInt)
+		if err != nil {
+			return nil
+		}
+		return errors.New("resource job is not cleaned up")
+	}
+	return nil
+}
+
+// testAccCheckTokenResourceExists queries the API and retrieves the matching Widget.
+func testAzureJobResourceExists(n string, job *model.Job, t *testing.T) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		// find the corresponding state object
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		// retrieve the configured client from the test setup
+		conn := testAccProvider.Meta().(*service.DBApiClient)
+		idInt, err := strconv.ParseInt(rs.Primary.ID, 10, 32)
+		if err != nil {
+			return err
+		}
+		resp, err := conn.Jobs().Read(idInt)
+		if err != nil {
+			return err
+		}
+
+		// If no error, assign the response Widget attribute to the widget pointer
+		*job = resp
+		return nil
+	}
+}
+
+// Assertions are based off of the resource definition defined in function: testAzureJobResourceNewCluster
+func testAzureJobValuesNewCluster(t *testing.T, job *model.Job) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		assert.NotNil(t, job.Settings)
+		assert.NotNil(t, job.Settings.NewCluster)
+		assert.NotNil(t, job.Settings.NewCluster.Autoscale)
+		assert.NotNil(t, job.Settings.NotebookTask)
+		assert.Equal(t, 2, int(job.Settings.NewCluster.Autoscale.MinWorkers))
+		assert.Equal(t, 3, int(job.Settings.NewCluster.Autoscale.MaxWorkers))
+		assert.Equal(t,  "6.4.x-scala2.11", job.Settings.NewCluster.SparkVersion)
+		assert.Equal(t,  "Standard_DS3_v2", job.Settings.NewCluster.NodeTypeID)
+		assert.Equal(t,  "/Users/jane.doe@databricks.com/my-demo-notebook", job.Settings.NotebookTask.NotebookPath)
+		assert.Equal(t,  "my-demo-notebook", job.Settings.Name)
+		assert.Equal(t,  3600, int(job.Settings.TimeoutSeconds))
+		assert.Equal(t,  1, int(job.Settings.MaxRetries))
+		assert.Equal(t,  1, int(job.Settings.MaxConcurrentRuns))
+		return nil
+	}
+}
+
+func testAzureJobResourceNewCluster() string {
+	return fmt.Sprintf(`
+								resource "databricks_job" "my_job" {
+								  new_cluster  {
+									autoscale  {
+									  min_workers = 2
+									  max_workers = 3
+									}
+									spark_version = "6.4.x-scala2.11"
+									node_type_id = "Standard_DS3_v2"
+								  }
+								  notebook_path = "/Users/jane.doe@databricks.com/my-demo-notebook"
+								  name = "my-demo-notebook"
+								  timeout_seconds = 3600
+								  max_retries = 1
+								  max_concurrent_runs = 1
+								}
+								`)
+}