initial commit

Author: tomarv2

.external_modules/[email protected]/tomarv2/terraform-azure-resource-group/v0.0.3

@@ -0,0 +1 @@
+Subproject commit 56b022b7b43f70fc2769de0b596c644e016abc16

.external_modules/[email protected]/tomarv2/terraform-azure-virtual-network/v0.0.2

@@ -0,0 +1 @@
+Subproject commit 51c05d219bfa7e6b23cc7c9c5a47e745e3846b4a

.pre-commit-config.yaml

@@ -24,10 +24,17 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
 
+#  - repo: https://github.com/bridgecrewio/checkov.git
+#    rev: '2.0.769'
+#    hooks:
+#    - id: checkov
+#      verbose: true
+#      args:
+#      - -d . --framework terraform -o output_format json --download-external-modules True
+
   - repo: https://github.com/bridgecrewio/checkov.git
     rev: '2.0.769'
     hooks:
     - id: checkov
       verbose: true
-      args:
-      - -d . --framework terraform -o output_format json
+      args: [-d, '.', --framework, 'terraform', --download-external-modules, 'True']

README.md

@@ -16,20 +16,10 @@
 </p>
 
 ## Terraform module for [Databricks Azure Workspace (Part 1)](https://registry.terraform.io/providers/databrickslabs/databricks/latest/docs/guides/azure-workspace)
+---
 
-> ❗️ **Important**
->
-> :point_right: This Terraform module assumes you have access to: [https://accounts.cloud.databricks.com](https://accounts.cloud.databricks.com)
->
-> :point_right: Databricks account username: `databricks_account_username`
->
-> :point_right: Databricks account password: `databricks_account_password`
->
-> :point_right: Databricks account id, `databricks_account_id` can be found on the top right corner of the page, once you're logged in.
->
-> :point_right: Part 2: Terraform module for [Databricks Workspace management](https://github.com/tomarv2/terraform-databricks-workspace-management)
+## Terraform module for [Databricks AWS Workspace](https://github.com/tomarv2/terraform-databricks-aws-workspace)
 
----
 ![Databricks deployment](https://github.com/tomarv2/terraform-databricks-azure-workspace/raw/main/docs/images/databricks_deployment.png)
 ---
 
@@ -76,7 +66,7 @@ export TF_AZURE_CONTAINER=tfstate # Output of remote_state.sh
 export ARM_ACCESS_KEY=xxxxxxxxxx # Output of remote_state.sh
 ```
 
-- Update [main.tf](examples/azure_databricks_new_vnet/main.tf) file with required values.
+- Update [main.tf](examples/azure_databricks_with_virtual_network/main.tf) file with required values.
 
 - Run and verify the output before deploying:
 ```

examples/azure_databricks/main.tf

@@ -0,0 +1,10 @@
+module "azure_databricks" {
+  source = "../../"
+
+  deploy_resource_group = false
+  resource_group_name   = "demo-resource_group"
+  # ---------------------------------------------
+  # Note: Do not change teamid and prjid once set.
+  teamid = var.teamid
+  prjid  = var.prjid
+}

examples/azure_databricks_new_vnet/outputs.tf renamed to examples/azure_databricks/outputs.tf

@@ -19,5 +19,6 @@ output "databricks_managed_resource_group_name" {
 }
 
 output "databricks_sku" {
-  value = module.azure_databricks.databricks_sku
-}
+  description = "The sku to use for the Databricks Workspace. Possible values are standard, premium, or trial. Changing this can force a new resource to be created in some circumstances"
+  value       = module.azure_databricks.databricks_sku
+}

examples/azure_databricks_new_vnet/variables.tf renamed to examples/azure_databricks/variables.tf

@@ -1,5 +1,5 @@
 module "vnet" {
-  source = "[email protected]:tomarv2/terraform-azure-vnet.git?ref=v0.0.1"
+  source = "[email protected]:tomarv2/terraform-azure-virtual-network.git?ref=v0.0.2"
 
   resource_group_name = "demo-resource_group"
   location            = "westus2"
@@ -11,11 +11,12 @@ module "vnet" {
 }
 
 module "azure_databricks" {
-  source                = "../../"
+  source = "../../"
+
   deploy_resource_group = false
   resource_group_name   = "demo-resource_group"
   custom_parameters = {
-    virtual_network_id = module.vnet.vnet_id
+    virtual_network_id = module.vnet.virtual_network_id
   }
   # ---------------------------------------------
   # Note: Do not change teamid and prjid once set.

examples/azure_databricks_new_vnet/main.tf renamed to examples/azure_databricks_with_virtual_network/main.tf

@@ -0,0 +1,24 @@
+output "resource_group_name" {
+  description = "Resource Group name"
+  value       = module.azure_databricks.resource_group_name
+}
+
+output "databricks_host" {
+  description = "Databricks hosts"
+  value       = module.azure_databricks.databricks_host
+}
+
+output "databricks_workspace_id" {
+  description = "Databricks workspace id"
+  value       = module.azure_databricks.databricks_workspace_id
+}
+
+output "databricks_managed_resource_group_name" {
+  description = "Databricks managed_resource group name"
+  value       = module.azure_databricks.managed_resource_group_name
+}
+
+output "databricks_sku" {
+  description = "The sku to use for the Databricks Workspace. Possible values are standard, premium, or trial. Changing this can force a new resource to be created in some circumstances"
+  value       = module.azure_databricks.databricks_sku
+}

examples/azure_databricks_with_virtual_network/outputs.tf

@@ -0,0 +1,11 @@
+variable "teamid" {
+  description = "(Required) Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply'"
+  type        = string
+  default     = "demo"
+}
+
+variable "prjid" {
+  description = "(Required) Name of the project/stack e.g: mystack, nifieks, demoaci. Should not be changed after running 'tf apply'"
+  type        = string
+  default     = "databricks"
+}