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.

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

azurerm_databricks_access_connector : the identity property should be optional rather than required #20342

Merged
merged 3 commits into from
Feb 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func (r AccessConnectorResource) Arguments() map[string]*pluginsdk.Schema {

"resource_group_name": commonschema.ResourceGroupName(),

"identity": commonschema.SystemAssignedIdentityRequired(),
"identity": commonschema.SystemAssignedIdentityOptional(),

"tags": commonschema.Tags(),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,21 @@ func TestAccDatabricksAccessConnector_basic(t *testing.T) {
})
}

func TestAccDatabricksAccessConnector_complete(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_databricks_access_connector", "test")
r := DatabricksAccessConnectorResource{}

data.ResourceTest(t, r, []acceptance.TestStep{
{
Config: r.complete(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

func TestAccDatabricksAccessConnector_requiresImport(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_databricks_access_connector", "test")
r := DatabricksAccessConnectorResource{}
Expand Down Expand Up @@ -59,7 +74,7 @@ func (DatabricksAccessConnectorResource) Exists(ctx context.Context, clients *cl
return utils.Bool(resp.Model != nil), nil
}

func (DatabricksAccessConnectorResource) basic(data acceptance.TestData) string {
func (DatabricksAccessConnectorResource) complete(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
Expand All @@ -81,6 +96,25 @@ resource "azurerm_databricks_access_connector" "test" {
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
}

func (DatabricksAccessConnectorResource) basic(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
features {}
}

resource "azurerm_resource_group" "test" {
name = "acctestRG-databricks-%d"
location = "%s"
}

resource "azurerm_databricks_access_connector" "test" {
name = "acctestDBAC%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
}
`, data.RandomInteger, data.Locations.Primary, data.RandomInteger)
}

func (DatabricksAccessConnectorResource) requiresImport(data acceptance.TestData) string {
template := DatabricksAccessConnectorResource{}.basic(data)
return fmt.Sprintf(`
Expand All @@ -90,9 +124,6 @@ resource "azurerm_databricks_access_connector" "import" {
name = azurerm_databricks_access_connector.test.name
resource_group_name = azurerm_databricks_access_connector.test.resource_group_name
location = azurerm_databricks_access_connector.test.location
identity {
type = "SystemAssigned"
}
}
`, template)
}
15 changes: 9 additions & 6 deletions website/docs/r/databricks_access_connector.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -43,30 +43,33 @@ The following arguments are supported:

* `location` - (Required) Specifies the supported Azure location where the resource has to be created. Changing this forces a new resource to be created.

* `identity` - (Required) An `identity` block as defined below.
* `identity` - (Optional) An `identity` block as defined below.

* `tags` - (Optional) A mapping of tags to assign to the resource.

---

An `identity` block supports the following:

* `type` - (Required) The type of identity to use for this Access Connector. `SystemAssigned` is the only possible value.
* `principal_id` - (Optional) The object id of an existing principal. If not specified, a new system-assigned managed identity is created.
* `tenant_id` - (Optional) The tenant id in which the principal resides.

## Attributes Reference

The following attributes are exported:

* `id` - The ID of the Databricks Access Connector in the Azure management plane.

* `identity` - A list of `identity` blocks containing the system-assigned managed identities as defined below.

---

An `identity` block exports the following:
* `type` - (Required) The type of identity.
* `principal_id` - The Principal Id associated with this system-assigned managed identity.
* `tenant_id` - The Tenant Id associated with this system-assigned managed identity.

* `type` - The type of identity.

* `principal_id` - The Principal ID associated with this system-assigned managed identity.

* `tenant_id` - The Tenant ID associated with this system-assigned managed identity.

## Timeouts

Expand Down