Update adb-vnet-injection to use azurerm v4 (#148)

* Update adb-vnet-injection to use azurerm 4

Signed-off-by: Niko <[email protected]>

* change subsctipion_id parameter to prompt

Signed-off-by: Niko <[email protected]>

* remove no_public_ip parameter from readme

Signed-off-by: Niko <[email protected]>

---------

Signed-off-by: Niko <[email protected]>

Author: r3stl355

examples/adb-vnet-injection/.terraform.lock.hcl

@@ -39,16 +39,17 @@ Navigate to Azure Portal and verify that all resources were deployed successfull
 
 | Name                                                                         | Version  |
 | ---------------------------------------------------------------------------- | -------- |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm)          | >=3.0.0  |
-| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | >=1.13.0 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm)          | >=4.0.0  |
+| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | >=1.52.0 |
+| <a name="requirement_random"></a> [random](#requirement\_random)             |          |
 
 ## Providers
 
 | Name                                                                   | Version |
 | ---------------------------------------------------------------------- | ------- |
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm)          | 3.49.0  |
-| <a name="provider_databricks"></a> [databricks](#provider\_databricks) | 1.13.0  |
-| <a name="provider_random"></a> [random](#provider\_random)             | 3.4.3   |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm)          | 4.9.0  |
+| <a name="provider_databricks"></a> [databricks](#provider\_databricks) | 1.58.0  |
+| <a name="provider_random"></a> [random](#provider\_random)             | 3.6.3   |
 
 ## Modules
 
@@ -75,10 +76,10 @@ Navigate to Azure Portal and verify that all resources were deployed successfull
 
 | Name                                                                                                                               | Description | Type     | Default             | Required |
 | ---------------------------------------------------------------------------------------------------------------------------------- | ----------- | -------- | ------------------- | :------: |
+| <a name="input_subscription_id"></a> [subscription\_id](#input\_subscription\_id)                                                  | n/a         | `string` |                     |    yes   |
 | <a name="input_cidr"></a> [cidr](#input\_cidr)                                                                                     | n/a         | `string` | `"10.179.0.0/20"`   |    no    |
 | <a name="input_dbfs_prefix"></a> [dbfs\_prefix](#input\_dbfs\_prefix)                                                              | n/a         | `string` | `"dbfs"`            |    no    |
 | <a name="input_global_auto_termination_minute"></a> [global\_auto\_termination\_minute](#input\_global\_auto\_termination\_minute) | n/a         | `number` | `30`                |    no    |
-| <a name="input_no_public_ip"></a> [no\_public\_ip](#input\_no\_public\_ip)                                                         | n/a         | `bool`   | `true`              |    no    |
 | <a name="input_node_type"></a> [node\_type](#input\_node\_type)                                                                    | n/a         | `string` | `"Standard_DS3_v2"` |    no    |
 | <a name="input_rglocation"></a> [rglocation](#input\_rglocation)                                                                   | n/a         | `string` | `"southeastasia"`   |    no    |
 | <a name="input_workspace_prefix"></a> [workspace\_prefix](#input\_workspace\_prefix)                                               | n/a         | `string` | `"adb"`             |    no    |

examples/adb-vnet-injection/README.md

@@ -1,17 +1,3 @@
-# Azure Provider source and version being used
-terraform {
-  required_providers {
-    azurerm = {
-      source  = "hashicorp/azurerm"
-      version = ">=3.0.0"
-    }
-    databricks = {
-      source  = "databricks/databricks"
-      version = ">=1.13.0"
-    }
-  }
-}
-
 resource "random_string" "naming" {
   special = false
   upper   = false

examples/adb-vnet-injection/main.tf

@@ -1,5 +1,21 @@
-# Configure the Microsoft Azure Provider
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = ">=4.0.0"
+    }
+    databricks = {
+      source  = "databricks/databricks"
+      version = ">=1.52.0"
+    }
+    random = {
+      source = "hashicorp/random"
+    }
+  }
+}
+
 provider "azurerm" {
+  subscription_id = var.subscription_id
   features {}
 }
 

examples/adb-vnet-injection/providers.tf

@@ -1,2 +1,3 @@
-dbfs_prefix = "mycustomdbfs"
-cidr        = "10.179.0.0/20"
+subscription_id = "<your Azure Subscription ID here>"
+dbfs_prefix     = "mycustomdbfs"
+cidr            = "10.179.0.0/20"

examples/adb-vnet-injection/terraform.tfvars

@@ -1,7 +1,6 @@
-variable "no_public_ip" {
-  type        = bool
-  default     = true
-  description = "If Secure Cluster Connectivity (No Public IP) should be enabled. Default: true"
+variable "subscription_id" {
+  type        = string
+  description = "Azure Subscription ID to deploy the workspace into"
 }
 
 variable "rglocation" {
@@ -47,3 +46,4 @@ variable "tags" {
 }
 
 
+

examples/adb-vnet-injection/variables.tf

@@ -6,7 +6,6 @@ resource "azurerm_databricks_workspace" "example" {
   tags                = local.tags
 
   custom_parameters {
-    no_public_ip                                         = var.no_public_ip
     virtual_network_id                                   = azurerm_virtual_network.this.id
     private_subnet_name                                  = azurerm_subnet.private.name
     public_subnet_name                                   = azurerm_subnet.public.name