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

azurerm_kusto_cluster - Support for virtual_network_configuration #7369

Merged
merged 2 commits into from
Jun 23, 2020
Merged

azurerm_kusto_cluster - Support for virtual_network_configuration #7369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
210a0b9
Support for Kusto Cluster VNET Configuration
jrauschenbusch May 25, 2020
9cf1970
Merge branch 'master' into r-kusto-cluster-virtual-network-configuration
mbfrahry Jun 22, 2020
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
77 changes: 77 additions & 0 deletions azurerm/internal/services/kusto/kusto_cluster_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,31 @@ func resourceArmKustoCluster() *schema.Resource {
Optional: true,
},

"virtual_network_configuration": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"subnet_id": {
Type: schema.TypeString,
Required: true,
ValidateFunc: azure.ValidateResourceID,
},
"engine_public_ip_id": {
Type: schema.TypeString,
Required: true,
ValidateFunc: azure.ValidateResourceID,
},
"data_management_public_ip_id": {
Type: schema.TypeString,
Required: true,
ValidateFunc: azure.ValidateResourceID,
},
},
},
},

"uri": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -161,6 +186,11 @@ func resourceArmKustoClusterCreateUpdate(d *schema.ResourceData, meta interface{
EnablePurge: utils.Bool(d.Get("enable_purge").(bool)),
}

if v, ok := d.GetOk("virtual_network_configuration"); ok {
vnet := expandKustoClusterVNET(v.([]interface{}))
clusterProperties.VirtualNetworkConfiguration = vnet
}

t := d.Get("tags").(map[string]interface{})

kustoCluster := kusto.Cluster{
Expand Down Expand Up @@ -239,6 +269,7 @@ func resourceArmKustoClusterRead(d *schema.ResourceData, meta interface{}) error
d.Set("enable_disk_encryption", clusterProperties.EnableDiskEncryption)
d.Set("enable_streaming_ingest", clusterProperties.EnableStreamingIngest)
d.Set("enable_purge", clusterProperties.EnablePurge)
d.Set("virtual_network_configuration", flatteKustoClusterVNET(clusterProperties.VirtualNetworkConfiguration))
d.Set("uri", clusterProperties.URI)
d.Set("data_ingestion_uri", clusterProperties.DataIngestionURI)
}
Expand Down Expand Up @@ -309,6 +340,23 @@ func expandKustoClusterSku(d *schema.ResourceData) (*kusto.AzureSku, error) {
return azureSku, nil
}

func expandKustoClusterVNET(input []interface{}) *kusto.VirtualNetworkConfiguration {
if len(input) == 0 || input[0] == nil {
return nil
}

vnet := input[0].(map[string]interface{})
subnetID := vnet["subnet_id"].(string)
enginePublicIPID := vnet["engine_public_ip_id"].(string)
dataManagementPublicIPID := vnet["data_management_public_ip_id"].(string)

return &kusto.VirtualNetworkConfiguration{
SubnetID: &subnetID,
EnginePublicIPID: &enginePublicIPID,
DataManagementPublicIPID: &dataManagementPublicIPID,
}
}

func flattenKustoClusterSku(sku *kusto.AzureSku) []interface{} {
if sku == nil {
return []interface{}{}
Expand All @@ -324,3 +372,32 @@ func flattenKustoClusterSku(sku *kusto.AzureSku) []interface{} {

return []interface{}{s}
}

func flatteKustoClusterVNET(vnet *kusto.VirtualNetworkConfiguration) []interface{} {
if vnet == nil {
return []interface{}{}
}

subnetID := ""
if vnet.SubnetID != nil {
subnetID = *vnet.SubnetID
}

enginePublicIPID := ""
if vnet.EnginePublicIPID != nil {
enginePublicIPID = *vnet.EnginePublicIPID
}

dataManagementPublicIPID := ""
if vnet.DataManagementPublicIPID != nil {
dataManagementPublicIPID = *vnet.DataManagementPublicIPID
}

output := map[string]interface{}{
"subnet_id": subnetID,
"engine_public_ip_id": enginePublicIPID,
"data_management_public_ip_id": dataManagementPublicIPID,
}

return []interface{}{output}
}
108 changes: 108 additions & 0 deletions azurerm/internal/services/kusto/tests/kusto_cluster_resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,29 @@ func TestAccAzureRMKustoCluster_identitySystemAssigned(t *testing.T) {
})
}

func TestAccAzureRMKustoCluster_vnet(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_kusto_cluster", "test")

resource.ParallelTest(t, resource.TestCase{
PreCheck: func() { acceptance.PreCheck(t) },
Providers: acceptance.SupportedProviders,
CheckDestroy: testCheckAzureRMKustoClusterDestroy,
Steps: []resource.TestStep{
{
Config: testAccAzureRMKustoCluster_vnet(data),
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMKustoClusterExists(data.ResourceName),
resource.TestCheckResourceAttr(data.ResourceName, "virtual_network_configuration.#", "1"),
resource.TestCheckResourceAttrSet(data.ResourceName, "virtual_network_configuration.0.subnet_id"),
resource.TestCheckResourceAttrSet(data.ResourceName, "virtual_network_configuration.0.engine_public_ip_id"),
resource.TestCheckResourceAttrSet(data.ResourceName, "virtual_network_configuration.0.data_management_public_ip_id"),
),
},
jrauschenbusch marked this conversation as resolved.
Show resolved Hide resolved
data.ImportStep(),
},
})
}

func testAccAzureRMKustoCluster_basic(data acceptance.TestData) string {
return fmt.Sprintf(`
provider "azurerm" {
Expand Down Expand Up @@ -339,6 +362,91 @@ func testCheckAzureRMKustoClusterDestroy(s *terraform.State) error {
return nil
}

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

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

resource "azurerm_virtual_network" "test" {
name = "acctestkc%s-vnet"
address_space = ["10.0.0.0/16"]
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
}

resource "azurerm_subnet" "test" {
name = "acctestkc%s-subnet"
resource_group_name = azurerm_resource_group.test.name
virtual_network_name = azurerm_virtual_network.test.name
address_prefixes = ["10.0.1.0/24"]
}

resource "azurerm_network_security_group" "test" {
name = "acctestkc%s-nsg"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
}

resource "azurerm_network_security_rule" "test_allow_management_inbound" {
name = "AllowAzureDataExplorerManagement"
priority = 100
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
source_port_range = "*"
destination_port_range = "443"
source_address_prefix = "AzureDataExplorerManagement"
destination_address_prefix = "VirtualNetwork"
resource_group_name = azurerm_resource_group.test.name
network_security_group_name = azurerm_network_security_group.test.name
}

resource "azurerm_subnet_network_security_group_association" "test" {
subnet_id = azurerm_subnet.test.id
network_security_group_id = azurerm_network_security_group.test.id
}

resource "azurerm_public_ip" "engine_pip" {
name = "acctestkc%s-engine-pip"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku = "Standard"
allocation_method = "Static"
}

resource "azurerm_public_ip" "management_pip" {
name = "acctestkc%s-management-pip"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name
sku = "Basic"
allocation_method = "Static"
}

resource "azurerm_kusto_cluster" "test" {
name = "acctestkc%s"
location = azurerm_resource_group.test.location
resource_group_name = azurerm_resource_group.test.name

sku {
name = "Dev(No SLA)_Standard_D11_v2"
capacity = 1
}

virtual_network_configuration {
subnet_id = azurerm_subnet.test.id
engine_public_ip_id = azurerm_public_ip.engine_pip.id
data_management_public_ip_id = azurerm_public_ip.management_pip.id
}
}
`, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString, data.RandomString)
}

func testCheckAzureRMKustoClusterExists(resourceName string) resource.TestCheckFunc {
return func(s *terraform.State) error {
client := acceptance.AzureProvider.Meta().(*clients.Client).Kusto.ClustersClient
Expand Down
12 changes: 12 additions & 0 deletions website/docs/r/kusto_cluster.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ The following arguments are supported:

* `enable_purge` - (Optional) Specifies if the purge operations are enabled.

* `virtual_network_configuration`- (Optional) A `virtual_network_configuration` block as defined below.

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

---
Expand All @@ -66,6 +68,16 @@ A `sku` block supports the following:

---

A `virtual_network_configuration` block supports the following:

* `subnet_id` - (Required) The subnet resource id.

* `engine_public_ip_id` - (Required) Engine service's public IP address resource id.

* `data_management_public_ip_id` - (Required) Data management's service public IP address resource id.

---

An `identity` block supports the following:

* `type` - (Required) Specifies the type of Managed Service Identity that is configured on this Kusto Cluster. Possible values are: `SystemAssigned` (where Azure will generate a Service Principal for you).
Expand Down