added a new selector for spark versions and node types (#1127)

Author: alexott

CHANGELOG.md

@@ -6,6 +6,8 @@
 * Fixed issue at `databricks_mount` where new cluster was created for S3 mount even when `cluster_id` was specified ([#1064](https://github.com/databrickslabs/terraform-provider-databricks/issues/1064)).
 * Allow to disable auto-termination for Databricks SQL endpoints ([#900](https://github.com/databrickslabs/terraform-provider-databricks/pull/900)).
 * Added new `gcp_attributes` to `databricks_cluster` and `databricks_instance_pool` ([#1126](https://github.com/databrickslabs/terraform-provider-databricks/pull/1126)).
+* Added exporter functionality for `databricks_ip_access_list` and `databricks_workspace_conf` ([#1125](https://github.com/databrickslabs/terraform-provider-databricks/pull/1125)).
+* Added `graviton` selector for `databricks_node_type` and `databricks_spark_version` data sources ([#1127](https://github.com/databrickslabs/terraform-provider-databricks/pull/1127)).
 
 ## 0.4.9
 

clusters/data_node_type.go

@@ -20,6 +20,7 @@ type NodeTypeRequest struct {
 	Category              string `json:"category,omitempty"`
 	PhotonWorkerCapable   bool   `json:"photon_worker_capable,omitempty"`
 	PhotonDriverCapable   bool   `json:"photon_driver_capable,omitempty"`
+	Graviton              bool   `json:"graviton,omitempty"`
 	IsIOCacheEnabled      bool   `json:"is_io_cache_enabled,omitempty"`
 	SupportPortForwarding bool   `json:"support_port_forwarding,omitempty"`
 }
@@ -97,6 +98,7 @@ type NodeType struct {
 	NodeInstanceType      *NodeInstanceType             `json:"node_instance_type,omitempty"`
 	PhotonWorkerCapable   bool                          `json:"photon_worker_capable,omitempty"`
 	PhotonDriverCapable   bool                          `json:"photon_driver_capable,omitempty"`
+	Graviton              bool                          `json:"is_graviton,omitempty"`
 }
 
 func (a ClustersAPI) defaultSmallestNodeType() string {
@@ -157,6 +159,9 @@ func (a ClustersAPI) GetSmallestNodeType(r NodeTypeRequest) string {
 		if r.PhotonWorkerCapable && nt.PhotonWorkerCapable != r.PhotonWorkerCapable {
 			continue
 		}
+		if r.Graviton && nt.Graviton != r.Graviton {
+			continue
+		}
 		return nt.NodeTypeID
 	}
 	return a.defaultSmallestNodeType()

clusters/data_spark_version.go

@@ -36,6 +36,7 @@ type SparkVersionRequest struct {
 	Scala           string `json:"scala,omitempty" tf:"optional,default:2.12"`
 	SparkVersion    string `json:"spark_version,omitempty" tf:"optional,default:"`
 	Photon          bool   `json:"photon,omitempty" tf:"optional,default:false"`
+	Graviton        bool   `json:"graviton,omitempty"`
 }
 
 // ListSparkVersions returns smallest (or default) node type id given the criteria
@@ -79,6 +80,7 @@ func (sparkVersions SparkVersionsList) LatestSparkVersion(req SparkVersionReques
 				(strings.Contains(version.Version, "-hls-") == req.Genomics) &&
 				(strings.Contains(version.Version, "-gpu-") == req.GPU) &&
 				(strings.Contains(version.Version, "-photon-") == req.Photon) &&
+				(strings.Contains(version.Version, "-aarch64-") == req.Graviton) &&
 				(strings.Contains(version.Description, "Beta") == req.Beta))
 			if matches && req.LongTermSupport {
 				matches = (matches && (strings.Contains(version.Description, "LTS") || strings.Contains(version.Version, "-esr-")))

docs/data-sources/node_type.md

@@ -55,6 +55,7 @@ Data source allows you to pick groups by the following attributes
   * `GPU Accelerated` (AWS, Azure)
 * `photon_worker_capable` - (Optional) Pick only nodes that can run Photon workers. Defaults to *false*.
 * `photon_driver_capable` - (Optional) Pick only nodes that can run Photon driver. Defaults to *false*.
+* `graviton` - (boolean, optional)  if we should limit the search only to nodes with AWS Graviton CPUs. Default to *false*.
 * `is_io_cache_enabled` - (Optional) . Pick only nodes that have IO Cache. Defaults to *false*.
 * `support_port_forwarding` - (Optional) Pick only nodes that support port forwarding. Defaults to *false*.
 

docs/data-sources/spark_version.md

@@ -40,15 +40,16 @@ resource "databricks_cluster" "research" {
 
 Data source allows you to pick groups by the following attributes:
 
-* `latest` - (boolean, optional) if we should return only the latest version if there is more than one result.  Default to `true`. If set to `false` and multiple versions are matching, throws an error
-* `long_term_support` - (boolean, optional) if we should limit the search only to LTS (long term support) & ESR (extended support) versions. Default to `false`
-* `ml` - (boolean, optional) if we should limit the search only to ML runtimes. Default to `false`
-* `genomics` - (boolean, optional)  if we should limit the search only to Genomics (HLS) runtimes. Default to `false`
-* `gpu` - (boolean, optional)  if we should limit the search only to runtimes that support GPUs. Default to `false`
-* `photon` - (boolean, optional)  if we should limit the search only to Photon runtimes. Default to `false`
-* `beta` - (boolean, optional) if we should limit the search only to runtimes that are in Beta stage. Default to `false`
-* `scala` - (string, optional) if we should limit the search only to runtimes that are based on specific Scala version. Default to `2.12`
-* `spark_version` - (string, optional) if we should limit the search only to runtimes that are based on specific Spark version. Default to empty string.  It could be specified as `3`, or `3.0`, or full version, like, `3.0.1`
+* `latest` - (boolean, optional) if we should return only the latest version if there is more than one result.  Default to `true`. If set to `false` and multiple versions are matching, throws an error.
+* `long_term_support` - (boolean, optional) if we should limit the search only to LTS (long term support) & ESR (extended support) versions. Default to `false`.
+* `ml` - (boolean, optional) if we should limit the search only to ML runtimes. Default to `false`.
+* `genomics` - (boolean, optional)  if we should limit the search only to Genomics (HLS) runtimes. Default to `false`.
+* `gpu` - (boolean, optional)  if we should limit the search only to runtimes that support GPUs. Default to `false`.
+* `photon` - (boolean, optional)  if we should limit the search only to Photon runtimes. Default to `false`.
+* `graviton` - (boolean, optional)  if we should limit the search only to runtimes supporting AWS Graviton CPUs. Default to `false`.
+* `beta` - (boolean, optional) if we should limit the search only to runtimes that are in Beta stage. Default to `false`.
+* `scala` - (string, optional) if we should limit the search only to runtimes that are based on specific Scala version. Default to `2.12`.
+* `spark_version` - (string, optional) if we should limit the search only to runtimes that are based on specific Spark version. Default to empty string.  It could be specified as `3`, or `3.0`, or full version, like, `3.0.1`.
 
 ## Attribute Reference
 

exporter/exporter_test.go

@@ -1123,12 +1123,13 @@ func TestImportingIPAccessLists(t *testing.T) {
 			},
 			{
 				Method:   "GET",
-				Resource: "/api/2.0/workspace-conf?keys=enableIpAccessLists%2CmaxTokenLifetimeDays%2CenableTokensConfig",
+				Resource: "/api/2.0/workspace-conf?keys=enableIpAccessLists%2CenableTokensConfig%2CmaxTokenLifetimeDays",
 				Response: map[string]interface{}{
 					"enableIpAccessLists":  "true",
-					"maxTokenLifetimeDays": nil,
+					"maxTokenLifetimeDays": "90",
 					"enableTokensConfig":   "true",
 				},
+				ReuseRequest: true,
 			},
 		},
 		func(ctx context.Context, client *common.DatabricksClient) {

workspace/resource_workspace_conf.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"sort"
 	"strconv"
 	"strings"
 
@@ -38,6 +39,7 @@ func (a WorkspaceConfAPI) Read(conf *map[string]interface{}) error {
 	for k := range *conf {
 		keys = append(keys, k)
 	}
+	sort.Strings(keys)
 	return a.client.Get(a.context, "/workspace-conf", map[string]string{
 		"keys": strings.Join(keys, ","),
 	}, &conf)