Revert "Add support for Databricks Account Console IP Access Lists (#2586)" (#3041)

This reverts commit 40c92d6.

Author: tanmay-db

access/resource_ip_access_list.go

@@ -3,23 +3,24 @@ package access
 import (
 	"context"
 
-	"github.com/databricks/databricks-sdk-go"
 	"github.com/databricks/databricks-sdk-go/service/settings"
 	"github.com/databricks/terraform-provider-databricks/common"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
+type ipAccessListUpdateRequest struct {
+	Label       string            `json:"label"`
+	ListType    settings.ListType `json:"list_type"`
+	IpAddresses []string          `json:"ip_addresses"`
+	Enabled     bool              `json:"enabled,omitempty" tf:"default:true"`
+}
+
 // ResourceIPAccessList manages IP access lists
 func ResourceIPAccessList() *schema.Resource {
-	s := common.StructToSchema(settings.CreateIpAccessList{}, func(s map[string]*schema.Schema) map[string]*schema.Schema {
+	s := common.StructToSchema(ipAccessListUpdateRequest{}, func(s map[string]*schema.Schema) map[string]*schema.Schema {
 		// nolint
-		s["enabled"] = &schema.Schema{
-			Type:     schema.TypeBool,
-			Optional: true,
-			Default:  true,
-		}
 		s["list_type"].ValidateFunc = validation.StringInSlice([]string{"ALLOW", "BLOCK"}, false)
 		s["ip_addresses"].Elem = &schema.Schema{
 			Type:         schema.TypeString,
@@ -30,67 +31,47 @@ func ResourceIPAccessList() *schema.Resource {
 	return common.Resource{
 		Schema: s,
 		Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
 			var iacl settings.CreateIpAccessList
-			var updateIacl settings.UpdateIpAccessList
 			common.DataToStructPointer(d, s, &iacl)
-			common.DataToStructPointer(d, s, &updateIacl)
-			return c.AccountOrWorkspaceRequest(func(acc *databricks.AccountClient) error {
-				status, err := acc.IpAccessLists.Create(ctx, iacl)
-				if err != nil {
-					return err
-				}
-				//need to enable the IP Access List with update
-				if d.Get("enabled").(bool) {
-					updateIacl.IpAccessListId = status.IpAccessList.ListId
-					err = acc.IpAccessLists.Update(ctx, updateIacl)
-					if err != nil {
-						return err
-					}
-				}
-				d.SetId(status.IpAccessList.ListId)
-				return nil
-			}, func(w *databricks.WorkspaceClient) error {
-				status, err := w.IpAccessLists.Create(ctx, iacl)
-				if err != nil {
-					return err
-				}
-				d.SetId(status.IpAccessList.ListId)
-				return nil
-			})
+			status, err := w.IpAccessLists.Create(ctx, iacl)
+			if err != nil {
+				return err
+			}
+			d.SetId(status.IpAccessList.ListId)
+			return nil
 		},
 		Read: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			return c.AccountOrWorkspaceRequest(func(acc *databricks.AccountClient) error {
-				status, err := acc.IpAccessLists.GetByIpAccessListId(ctx, d.Id())
-				if err != nil {
-					return err
-				}
-				common.StructToData(status.IpAccessList, s, d)
-				return nil
-			}, func(w *databricks.WorkspaceClient) error {
-				status, err := w.IpAccessLists.GetByIpAccessListId(ctx, d.Id())
-				if err != nil {
-					return err
-				}
-				common.StructToData(status.IpAccessList, s, d)
-				return nil
-			})
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
+			status, err := w.IpAccessLists.GetByIpAccessListId(ctx, d.Id())
+			if err != nil {
+				return err
+			}
+			common.StructToData(status.IpAccessList, s, d)
+			return nil
 		},
 		Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
 			var iacl settings.UpdateIpAccessList
 			common.DataToStructPointer(d, s, &iacl)
 			iacl.IpAccessListId = d.Id()
-			return c.AccountOrWorkspaceRequest(func(acc *databricks.AccountClient) error {
-				return acc.IpAccessLists.Update(ctx, iacl)
-			}, func(w *databricks.WorkspaceClient) error {
-				return w.IpAccessLists.Update(ctx, iacl)
-			})
+			return w.IpAccessLists.Update(ctx, iacl)
 		},
 		Delete: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
-			return c.AccountOrWorkspaceRequest(func(acc *databricks.AccountClient) error {
-				return acc.IpAccessLists.DeleteByIpAccessListId(ctx, d.Id())
-			}, func(w *databricks.WorkspaceClient) error {
-				return w.IpAccessLists.DeleteByIpAccessListId(ctx, d.Id())
-			})
+			w, err := c.WorkspaceClient()
+			if err != nil {
+				return err
+			}
+			return w.IpAccessLists.DeleteByIpAccessListId(ctx, d.Id())
 		},
 	}.ToResource()
 }