Merge pull request #9 from tomarv2/develop

Pulling refs/heads/develop into main

Author: tomarv2

.github/workflows/pr-lint.yml

@@ -0,0 +1,15 @@
+name: PR lint
+
+on:
+  pull_request:
+    types: ['opened', 'edited', 'reopened', 'synchronize']
+
+jobs:
+  pr-lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: seferov/pr-lint-action@master
+      with:
+        title-regex: '^((Pulling|Update from) refs\/heads\/|(\[tf (plan|apply|destroy|status)\]|\[non tf\])\s(feat|fix|build|chore|ci|docs|style|refactor|perf|test)(\!?): (.{3,250})[^\s*]$)'
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        auto-close-message: 'Closing this pull request since the title does not match %pattern% pattern. Please fix the title and re-open the pull request.'

.github/workflows/stale-actions.yml

@@ -116,36 +116,34 @@ Please refer to examples directory [link](examples) for references.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.1 |
-| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 2.94 |
-| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | 0.3.5 |
+| <a name="requirement_azurerm"></a> [azurerm](#requirement\_azurerm) | ~> 3.21.1 |
+| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | 1.2.1 |
 | <a name="requirement_external"></a> [external](#requirement\_external) | ~> 2.2 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.1 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | ~> 2.94 |
-| <a name="provider_databricks"></a> [databricks](#provider\_databricks) | 0.3.5 |
-| <a name="provider_databricks.created_workspace"></a> [databricks.created\_workspace](#provider\_databricks.created\_workspace) | 0.3.5 |
+| <a name="provider_azurerm"></a> [azurerm](#provider\_azurerm) | ~> 3.21.1 |
+| <a name="provider_databricks.created_workspace"></a> [databricks.created\_workspace](#provider\_databricks.created\_workspace) | 1.2.1 |
 | <a name="provider_external"></a> [external](#provider\_external) | ~> 2.2 |
 | <a name="provider_random"></a> [random](#provider\_random) | ~> 3.1 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | git::[email protected]:tomarv2/terraform-azure-resource-group.git | v0.0.3 |
+| <a name="module_resource_group"></a> [resource\_group](#module\_resource\_group) | git::[email protected]:tomarv2/terraform-azure-resource-group.git | v0.0.10 |
 
 ## Resources
 
 | Name | Type |
 |------|------|
 | [azurerm_databricks_workspace.this](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/databricks_workspace) | resource |
-| [databricks_token.pat](https://registry.terraform.io/providers/databrickslabs/databricks/0.3.5/docs/resources/token) | resource |
+| [databricks_token.pat](https://registry.terraform.io/providers/databricks/databricks/1.2.1/docs/resources/token) | resource |
 | [random_string.naming](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) | resource |
 | [azurerm_client_config.current](https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/data-sources/client_config) | data source |
-| [databricks_current_user.me](https://registry.terraform.io/providers/databrickslabs/databricks/0.3.5/docs/data-sources/current_user) | data source |
 | [external_external.current_user](https://registry.terraform.io/providers/hashicorp/external/latest/docs/data-sources/external) | data source |
 
 ## Inputs
@@ -165,6 +163,7 @@ Please refer to examples directory [link](examples) for references.
 | <a name="input_public_network_access_enabled"></a> [public\_network\_access\_enabled](#input\_public\_network\_access\_enabled) | Allow public access for accessing workspace. Set value to false to access workspace only via private link endpoint. Possible values include true or false. Defaults to true. Changing this forces a new resource to be created | `bool` | `true` | no |
 | <a name="input_region"></a> [region](#input\_region) | The region where the resources are created | `string` | `"westus2"` | no |
 | <a name="input_resource_group_name"></a> [resource\_group\_name](#input\_resource\_group\_name) | Resource Group name | `string` | `null` | no |
+| <a name="input_resource_group_settings"></a> [resource\_group\_settings](#input\_resource\_group\_settings) | n/a | `any` | n/a | yes |
 | <a name="input_sku"></a> [sku](#input\_sku) | 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 | `string` | `"standard"` | no |
 | <a name="input_teamid"></a> [teamid](#input\_teamid) | (Required) Name of the team/group e.g. devops, dataengineering. Should not be changed after running 'tf apply' | `string` | n/a | yes |
 | <a name="input_workspace_name"></a> [workspace\_name](#input\_workspace\_name) | Specifies the name of the Databricks Workspace resource. Changing this forces a new resource to be created | `string` | `null` | no |

README.md

@@ -1,9 +1,17 @@
 module "azure_databricks" {
   source = "../../"
 
-  resource_group_name = "demo-resource_group"
+  resource_group_settings = [
+    {
+      name     = "demo1"
+      location = "westus2"
+  }]
   # ---------------------------------------------
   # Note: Do not change teamid and prjid once set.
   teamid = var.teamid
   prjid  = var.prjid
 }
+
+provider "azurerm" {
+  features {}
+}

examples/azure_databricks/main.tf

@@ -5,18 +5,18 @@ data "external" "current_user" {
   program = ["az", "account", "show", "--query", "user"]
 }
 
+/*
 data "databricks_current_user" "me" {
   depends_on = [azurerm_databricks_workspace.this]
 }
+*/
 
 module "resource_group" {
-  source = "git::[email protected]:tomarv2/terraform-azure-resource-group.git?ref=v0.0.3"
+  source = "git::[email protected]:tomarv2/terraform-azure-resource-group.git?ref=v0.0.10"
 
-  deploy_resource_group = var.deploy_resource_group != false ? true : false
-  resource_group_name   = var.resource_group_name != null ? var.resource_group_name : "${var.teamid}-${var.prjid}"
-
-  # ------------------------------------------------
-  # Do not change the teamid, prjid once set.
+  resource_group_settings = var.resource_group_settings
   teamid = var.teamid
   prjid  = var.prjid
 }
+
+variable "resource_group_settings" {}

main.tf

@@ -3,6 +3,8 @@ resource "databricks_token" "pat" {
 
   comment          = "Terraform managed: ${var.teamid}-${var.prjid}"
   lifetime_seconds = var.databricks_token_lifetime_seconds
+
+  depends_on = [azurerm_databricks_workspace.this]
 }
 
 provider "databricks" {

pat_token.tf

@@ -2,11 +2,11 @@ terraform {
   required_version = ">= 1.0.1"
   required_providers {
     azurerm = {
-      version = "~> 2.94"
+      version = "~> 3.21.1"
     }
     databricks = {
-      source  = "databrickslabs/databricks"
-      version = "0.3.5"
+      source  = "databricks/databricks"
+      version = "1.2.1"
     }
     random = {
       version = "~> 3.1"

providers.tf

@@ -1,6 +1,6 @@
 resource "azurerm_databricks_workspace" "this" {
   name                                  = var.workspace_name != null ? var.workspace_name : "${var.teamid}-${var.prjid}"
-  resource_group_name                   = var.deploy_resource_group != false ? join("", module.resource_group.*.resource_group_name) : var.resource_group_name
+  resource_group_name                   = module.resource_group.resource_group_name[0]
   location                              = var.region
   sku                                   = var.sku
   managed_resource_group_name           = "${local.prefix}-workspace-rg"