Merge pull request #1 from tomarv2/develop

Develop

Author: tomarv2

.external_modules/github.com:tomarv2/terraform-azure-resource-group/v0.0.3

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

…2/terraform-azure-virtual-network/v0.0.2 …2/terraform-azure-virtual-network/v0.0.2.external_modules/[email protected]/tomarv2/terraform-azure-virtual-network/v0.0.2 renamed to .external_modules/github.com:tomarv2/terraform-azure-virtual-network/v0.0.2 .external_modules/[email protected]/tomarv2/terraform-azure-virtual-network/v0.0.2 renamed to .external_modules/github.com:tomarv2/terraform-azure-virtual-network/v0.0.2

@@ -18,6 +18,9 @@ jobs:
 
       - name: Install Python
         uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+          architecture: 'x64'
 
       - name: Build matrix
         id: matrix
@@ -40,6 +43,9 @@ jobs:
 
       - name: Install Python
         uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+          architecture: 'x64'
 
       - name: Terraform min/max versions
         id: minMax
@@ -55,18 +61,6 @@ jobs:
       - name: Install pre-commit dependencies
         run: pip install pre-commit
 
-#      - name: Execute pre-commit
-#        # Run only validate pre-commit check on min version supported
-#        if: ${{ matrix.directory !=  '.' }}
-#        run:
-#          pre-commit run terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*
-#
-#      - name: Execute pre-commit
-#        # Run only validate pre-commit check on min version supported
-#        if: ${{ matrix.directory ==  '.' }}
-#        run:
-#          pre-commit run terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)
-
 
 # Max Terraform version
   getBaseVersion:
@@ -98,6 +92,9 @@ jobs:
 
       - name: Install Python
         uses: actions/setup-python@v2
+        with:
+          python-version: '3.8'
+          architecture: 'x64'
 
       - name: Install Terraform v${{ matrix.version }}
         uses: hashicorp/setup-terraform@v1
@@ -108,7 +105,7 @@ jobs:
         run: |
           pip install pre-commit
           pip install checkov
-          curl -L "$(curl -s https://api.github.com/repos/terraform-docs/terraform-docs/releases/latest | grep -o -E "https://.+?-v0.12.1-linux-amd64" | head -n1)" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/
+          curl -L "$(curl -s https://api.github.com/repos/terraform-docs/terraform-docs/releases/latest | grep -o -E "https://.+?-v1.0.1-linux-amd64" | head -n1)" > terraform-docs && chmod +x terraform-docs && sudo mv terraform-docs /usr/bin/
           curl -L "$(curl -s https://api.github.com/repos/terraform-linters/tflint/releases/latest | grep -o -E "https://.+?_linux_amd64.zip")" > tflint.zip && unzip tflint.zip && rm tflint.zip && sudo mv tflint /usr/bin/
 
       - name: Execute pre-commit

.github/workflows/pre-commit.yml

@@ -82,3 +82,4 @@ _testmain.go
 # ignore test related file(s)
 **/test**
 **.
+#**/.external_modules

.gitignore

@@ -17,23 +17,15 @@ repos:
           - '--args=--only=terraform_workspace_remote'
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.4.0
     hooks:
       - id: trailing-whitespace
       - id: check-merge-conflict
       - 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'
+    rev: '2.0.531'
     hooks:
     - id: checkov
       verbose: true

.pre-commit-config.yaml

@@ -16,9 +16,10 @@
 </p>
 
 ## Terraform module for [Databricks Azure Workspace (Part 1)](https://registry.terraform.io/providers/databrickslabs/databricks/latest/docs/guides/azure-workspace)
----
 
-## Terraform module for [Databricks AWS Workspace](https://github.com/tomarv2/terraform-databricks-aws-workspace)
+> :arrow_right:️ **Part 2:** Terraform module for [Databricks Workspace management](https://github.com/tomarv2/terraform-databricks-workspace-management)
+
+---
 
 ![Databricks deployment](https://github.com/tomarv2/terraform-databricks-azure-workspace/raw/main/docs/images/databricks_deployment.png)
 ---
@@ -92,11 +93,6 @@ tf -c=azure destroy -var='teamid=foo' -var='prjid=bar'
 module "databricks_workspace" {
   source = "git::[email protected]:tomarv2/terraform-databricks-azure-workspace.git"
 
-  client_id       = var.client_id
-  client_secret   = var.client_secret
-  subscription_id = var.subscription_id
-  tenant_id       = var.tenant_id
-
   resource_group_name         = "demo-rg"
   # ---------------------------------------------
   # Note: Do not change teamid and prjid once set.
@@ -106,3 +102,8 @@ module "databricks_workspace" {
 ```
 
 Please refer to examples directory [link](examples) for references.
+
+
+#### References
+
+##### - Terraform module for [Databricks AWS Workspace](https://github.com/tomarv2/terraform-databricks-aws-workspace)

README.md

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

examples/azure_databricks/main.tf

@@ -1,5 +1,5 @@
 module "vnet" {
-  source = "[email protected]:tomarv2/terraform-azure-virtual-network.git?ref=v0.0.2"
+  source = "git::git@github.com:tomarv2/terraform-azure-virtual-network.git?ref=v0.0.2"
 
   resource_group_name = "demo-resource_group"
   location            = "westus2"
@@ -13,8 +13,7 @@ module "vnet" {
 module "azure_databricks" {
   source = "../../"
 
-  deploy_resource_group = false
-  resource_group_name   = "demo-resource_group"
+  resource_group_name = "demo-resource_group"
   custom_parameters = {
     virtual_network_id = module.vnet.virtual_network_id
   }

examples/azure_databricks_with_virtual_network/main.tf

@@ -6,7 +6,7 @@ data "external" "current_user" {
 }
 
 module "resource_group" {
-  source = "[email protected]:tomarv2/terraform-azure-resource-group.git?ref=v0.0.3"
+  source = "git::git@github.com:tomarv2/terraform-azure-resource-group.git?ref=v0.0.3"
 
   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}"