Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix databricks_mws_private_access_settings creation #3439

Merged
merged 4 commits into from
Apr 15, 2024
Merged

Fix databricks_mws_private_access_settings creation #3439

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81971c0
fix creation of `databricks_mws_private_access_settings`
nkvuong Apr 5, 2024
7035d22
more fix
nkvuong Apr 5, 2024
720f90a
doc
nkvuong Apr 5, 2024
2b72d19
remove dup
nkvuong Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/resources/mws_private_access_settings.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ The `databricks_mws_private_access_settings.pas.private_access_settings_id` can
```hcl
resource "databricks_mws_workspaces" "this" {
provider = databricks.mws
account_id = var.databricks_account_id
aws_region = var.region
workspace_name = local.prefix
credentials_id = databricks_mws_credentials.this.credentials_id
Expand All @@ -48,7 +47,6 @@ resource "databricks_mws_workspaces" "this" {
```hcl
resource "databricks_mws_workspaces" "this" {
provider = databricks.mws
account_id = var.databricks_account_id
workspace_name = "gcp-workspace"
location = var.subnet_region
cloud_resource_container {
Expand All @@ -71,7 +69,6 @@ resource "databricks_mws_workspaces" "this" {

The following arguments are available:

* `account_id` - Account Id that could be found in the Accounts Console for [AWS](https://accounts.cloud.databricks.com/) or [GCP](https://accounts.gcp.databricks.com/)
* `private_access_settings_name` - Name of Private Access Settings in Databricks Account
* `public_access_enabled` (Boolean, Optional, `false` by default on AWS, `true` by default on GCP) - If `true`, the [databricks_mws_workspaces](mws_workspaces.md) can be accessed over the [databricks_mws_vpc_endpoint](mws_vpc_endpoint.md) as well as over the public network. In such a case, you could also configure an [databricks_ip_access_list](ip_access_list.md) for the workspace, to restrict the source networks that could be used to access it over the public network. If `false`, the workspace can be accessed only over VPC endpoints, and not over the public network. Once explicitly set, this field becomes mandatory.
* `region` - Region of AWS VPC or the Google Cloud VPC network
Expand Down
29 changes: 15 additions & 14 deletions mws/resource_mws_private_access_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,37 @@ import (
)

func ResourceMwsPrivateAccessSettings() common.Resource {
s := common.StructToSchema(provisioning.PrivateAccessSettings{}, func(s map[string]*schema.Schema) map[string]*schema.Schema {
// nolint
s["private_access_settings_name"].ValidateFunc = validation.StringLenBetween(4, 256)
common.SetRequired(s["private_access_settings_name"])
common.SetRequired(s["region"])
pasSchema := common.StructToSchema(provisioning.PrivateAccessSettings{}, func(m map[string]*schema.Schema) map[string]*schema.Schema {
common.CustomizeSchemaPath(m, "private_access_settings_name").SetValidateFunc(validation.StringLenBetween(4, 256))
common.CustomizeSchemaPath(m, "private_access_settings_name").SetRequired()
common.CustomizeSchemaPath(m, "region").SetRequired()

s["private_access_level"].ValidateFunc = validation.StringInSlice([]string{"ACCOUNT", "ENDPOINT"}, true)
common.SetDefault(s["private_access_level"], "ACCOUNT")
common.CustomizeSchemaPath(m, "private_access_level").SetValidateFunc(validation.StringInSlice([]string{"ACCOUNT", "ENDPOINT"}, true))
common.CustomizeSchemaPath(m, "private_access_settings_id").SetComputed()

s["private_access_settings_id"].Computed = true
common.CustomizeSchemaPath(m, "private_access_level").SetValidateFunc(validation.StringInSlice([]string{"ACCOUNT", "ENDPOINT"}, true))
alexott marked this conversation as resolved.
Show resolved Hide resolved
common.CustomizeSchemaPath(m, "private_access_level").SetDefault("ACCOUNT")

common.AddAccountIdField(s)
return s
common.AddAccountIdField(m)
return m
})
p := common.NewPairSeparatedID("account_id", "private_access_settings_id", "/")
return common.Resource{
Schema: s,
Schema: pasSchema,
Create: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
a, err := c.AccountClientWithAccountIdFromConfig(d)
if err != nil {
return err
}
var pas provisioning.UpsertPrivateAccessSettingsRequest
common.DataToStructPointer(d, s, &pas)
common.DataToStructPointer(d, pasSchema, &pas)
common.SetForceSendFields(&pas, d, []string{"public_access_enabled"})
res, err := a.PrivateAccess.Create(ctx, pas)
if err != nil {
return err
}
d.Set("private_access_settings_id", res.PrivateAccessSettingsId)
d.Set("account_id", res.AccountId)
p.Pack(d)
return nil
},
Expand All @@ -54,15 +55,15 @@ func ResourceMwsPrivateAccessSettings() common.Resource {
if err != nil {
return err
}
return common.StructToData(pas, s, d)
return common.StructToData(pas, pasSchema, d)
},
Update: func(ctx context.Context, d *schema.ResourceData, c *common.DatabricksClient) error {
a, pasID, err := c.AccountClientWithAccountIdFromPair(d, p)
if err != nil {
return err
}
var pas provisioning.UpsertPrivateAccessSettingsRequest
common.DataToStructPointer(d, s, &pas)
common.DataToStructPointer(d, pasSchema, &pas)
common.SetForceSendFields(&pas, d, []string{"public_access_enabled"})
pas.PrivateAccessSettingsId = pasID
return a.PrivateAccess.Replace(ctx, pas)
Expand Down
35 changes: 34 additions & 1 deletion mws/resource_mws_private_access_settings_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ func TestResourcePASCreate(t *testing.T) {
PrivateAccessLevel: "ACCOUNT",
}).Return(&provisioning.PrivateAccessSettings{
PrivateAccessSettingsId: "pas_id",
AccountId: "abc",
}, nil)
e.GetByPrivateAccessSettingsId(mock.Anything, "pas_id").Return(&provisioning.PrivateAccessSettings{
PrivateAccessSettingsId: "pas_id",
Expand All @@ -43,6 +44,36 @@ func TestResourcePASCreate(t *testing.T) {
assert.Equal(t, "abc/pas_id", d.Id())
}

func TestResourcePASCreateWithoutAccountId(t *testing.T) {
d, err := qa.ResourceFixture{
MockAccountClientFunc: func(a *mocks.MockAccountClient) {
e := a.GetMockPrivateAccessAPI().EXPECT()
e.Create(mock.Anything, provisioning.UpsertPrivateAccessSettingsRequest{
Region: "ar",
PrivateAccessSettingsName: "pas_name",
PrivateAccessLevel: "ACCOUNT",
}).Return(&provisioning.PrivateAccessSettings{
PrivateAccessSettingsId: "pas_id",
AccountId: "abc",
}, nil)
e.GetByPrivateAccessSettingsId(mock.Anything, "pas_id").Return(&provisioning.PrivateAccessSettings{
PrivateAccessSettingsId: "pas_id",
Region: "ar",
PrivateAccessSettingsName: "pas_name",
}, nil)
},
Resource: ResourceMwsPrivateAccessSettings(),
AccountID: "abc",
HCL: `
private_access_settings_name = "pas_name"
region = "ar"
`,
Create: true,
}.Apply(t)
assert.NoError(t, err)
assert.Equal(t, "abc/pas_id", d.Id())
}

func TestResourcePASCreate_PublicAccessDisabled(t *testing.T) {
d, err := qa.ResourceFixture{
MockAccountClientFunc: func(a *mocks.MockAccountClient) {
Expand All @@ -55,6 +86,7 @@ func TestResourcePASCreate_PublicAccessDisabled(t *testing.T) {
ForceSendFields: []string{"PublicAccessEnabled"},
}).Return(&provisioning.PrivateAccessSettings{
PrivateAccessSettingsId: "pas_id",
AccountId: "abc",
}, nil)
e.GetByPrivateAccessSettingsId(mock.Anything, "pas_id").Return(&provisioning.PrivateAccessSettings{
PrivateAccessSettingsId: "pas_id",
Expand All @@ -63,7 +95,8 @@ func TestResourcePASCreate_PublicAccessDisabled(t *testing.T) {
ForceSendFields: []string{"PublicAccessEnabled"},
}, nil)
},
Resource: ResourceMwsPrivateAccessSettings(),
Resource: ResourceMwsPrivateAccessSettings(),
AccountID: "abc",
HCL: `
account_id = "abc"
private_access_settings_name = "pas_name"
Expand Down
Loading