Fix max_clusters_per_user to databricks_cluster_policy resource (#1956)

🤦 we need to try to get rid from the non-struct schemas

Author: alexott

policies/resource_cluster_policy.go

@@ -20,8 +20,9 @@ type ClusterPolicy struct {
 
 // ClusterPolicyCreate is the endity used for request
 type ClusterPolicyCreate struct {
-	Name       string `json:"name"`
-	Definition string `json:"definition"`
+	Name               string `json:"name"`
+	Definition         string `json:"definition"`
+	MaxClustersPerUser int64  `json:"max_clusters_per_user,omitempty"`
 }
 
 type ClusterPolicyList struct {
@@ -93,6 +94,9 @@ func parsePolicyFromData(d *schema.ResourceData) (*ClusterPolicy, error) {
 	if data, ok := d.GetOk("definition"); ok {
 		clusterPolicy.Definition = data.(string)
 	}
+	if max_clusters, ok := d.GetOk("max_clusters_per_user"); ok {
+		clusterPolicy.MaxClustersPerUser = int64(max_clusters.(int))
+	}
 	return clusterPolicy, nil
 }
 
@@ -113,11 +117,15 @@ func ResourceClusterPolicy() *schema.Resource {
 			},
 			"definition": {
 				Type:     schema.TypeString,
-				Optional: true,
+				Required: true,
 				Description: "Policy definition JSON document expressed in\n" +
 					"Databricks Policy Definition Language.",
 				ValidateFunc: validation.StringIsJSON,
 			},
+			"max_clusters_per_user": {
+				Type:     schema.TypeInt,
+				Optional: true,
+			},
 		},
 		Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
 			clusterPolicy, err := parsePolicyFromData(d)
@@ -135,15 +143,11 @@ func ResourceClusterPolicy() *schema.Resource {
 			if err != nil {
 				return err
 			}
-			if err = d.Set("name", clusterPolicy.Name); err != nil {
-				return err
-			}
-			if err = d.Set("definition", clusterPolicy.Definition); err != nil {
-				return err
-			}
-			if err = d.Set("policy_id", clusterPolicy.PolicyID); err != nil {
-				return err
-			}
+			d.Set("name", clusterPolicy.Name)
+			d.Set("definition", clusterPolicy.Definition)
+			d.Set("policy_id", clusterPolicy.PolicyID)
+			d.SetId(clusterPolicy.PolicyID)
+			d.Set("max_clusters_per_user", clusterPolicy.MaxClustersPerUser)
 			return nil
 		},
 		Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {

policies/resource_cluster_policy_test.go

@@ -20,6 +20,7 @@ func TestResourceClusterPolicyRead(t *testing.T) {
 					Name:               "Dummy",
 					Definition:         "{\"spark_conf.foo\": {\"type\": \"fixed\", \"value\": \"bar\"}}",
 					CreatedAtTimeStamp: 0,
+					MaxClustersPerUser: 5,
 				},
 			},
 		},
@@ -32,6 +33,7 @@ func TestResourceClusterPolicyRead(t *testing.T) {
 	assert.Equal(t, "Dummy", d.Get("name"))
 	assert.Equal(t, "{\"spark_conf.foo\": {\"type\": \"fixed\", \"value\": \"bar\"}}", d.Get("definition"))
 	assert.Equal(t, "abc", d.Get("policy_id"))
+	assert.Equal(t, 5, d.Get("max_clusters_per_user"))
 }
 
 func TestResourceClusterPolicyRead_NotFound(t *testing.T) {
@@ -85,6 +87,7 @@ func TestResourceClusterPolicyCreate(t *testing.T) {
 					Name:               "Dummy",
 					Definition:         "{\"spark_conf.foo\": {\"type\": \"fixed\", \"value\": \"bar\"}}",
 					CreatedAtTimeStamp: 0,
+					MaxClustersPerUser: 3,
 				},
 				Response: ClusterPolicy{
 					PolicyID: "abc",
@@ -98,18 +101,21 @@ func TestResourceClusterPolicyCreate(t *testing.T) {
 					Name:               "Dummy",
 					Definition:         "{\"spark_conf.foo\": {\"type\": \"fixed\", \"value\": \"bar\"}}",
 					CreatedAtTimeStamp: 0,
+					MaxClustersPerUser: 3,
 				},
 			},
 		},
 		Resource: ResourceClusterPolicy(),
 		State: map[string]any{
-			"definition": `{"spark_conf.foo": {"type": "fixed", "value": "bar"}}`,
-			"name":       "Dummy",
+			"definition":            `{"spark_conf.foo": {"type": "fixed", "value": "bar"}}`,
+			"max_clusters_per_user": 3,
+			"name":                  "Dummy",
 		},
 		Create: true,
 	}.Apply(t)
 	assert.NoError(t, err, err)
 	assert.Equal(t, "abc", d.Id())
+	assert.Equal(t, 3, d.Get("max_clusters_per_user"))
 }
 
 func TestResourceClusterPolicyCreate_Error(t *testing.T) {