cleanup

Author: tomarv2

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-    <a href="https://github.com/tomarv2/terraform-databricks-aws-workspace/actions/workflows/pre-commit.yml" alt="Precommit">
+    <a href="https://github.com/tomarv2/terraform-databricks-aws-workspace/actions/workflows/pre-commit.yml" alt="Pre Commit">
         <img src="https://github.com/tomarv2/terraform-databricks-aws-workspace/actions/workflows/pre-commit.yml/badge.svg?branch=main" /></a>
     <a href="https://www.apache.org/licenses/LICENSE-2.0" alt="license">
         <img src="https://img.shields.io/github/license/tomarv2/terraform-databricks-aws-workspace" /></a>
@@ -15,7 +15,7 @@
         <img src="https://img.shields.io/twitter/follow/varuntomar2019?style=social&logo=twitter"></a>
 </p>
 
-# Terraform module for [Databricks AWS Workspace E2 (Part 1)](https://registry.terraform.io/providers/databrickslabs/databricks/latest/docs/guides/aws-workspace)
+## Terraform module for [Databricks AWS Workspace E2 (Part 1)](https://registry.terraform.io/providers/databrickslabs/databricks/latest/docs/guides/aws-workspace)
 
 > ❗️ **Important**
 >
@@ -29,6 +29,11 @@
 >
 > :point_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-aws-workspace/raw/main/docs/images/databricks_deployment.png)
+---
+
 ## Versions
 
 - Module tested for Terraform 0.14.
@@ -95,7 +100,7 @@ tf -cloud aws destroy -var='teamid=foo' -var='prjid=bar'
 
 ```
 module "databricks_workspace" {
-  source = "git::git@github.com:tomarv2/terraform-databricks-aws-workspace.git?ref=v0.0.1"
+  source = "git::git@github.com:tomarv2/terraform-databricks-aws-workspace.git"
 
   profile_for_iam             = "iam-admin"
   databricks_account_username = "example@example.com"

docs/images/databricks_deployment.png

@@ -1,10 +1,3 @@
 locals {
-  /*
-  shared_tags = map(
-    "Name", "${var.teamid}-${var.prjid}",
-    "team", var.teamid,
-    "project", var.prjid
-  )
-*/
   profile_to_use = var.profile_for_iam != null ? var.profile_for_iam : var.profile_to_use
 }

locals.tf

@@ -8,7 +8,7 @@ module "vpc" {
 }
 
 module "iam_role" {
-  source = "git::git@github.com:tomarv2/terraform-aws-iam-role.git//modules/iam_role_external?ref=v0.0.2"
+  source = "git::git@github.com:tomarv2/terraform-aws-iam-role.git//modules/iam_role_external?ref=v0.0.3"
 
   profile_to_use     = local.profile_to_use
   assume_role_policy = data.databricks_aws_assume_role_policy.this.json
@@ -20,7 +20,7 @@ module "iam_role" {
 }
 
 module "iam_policies" {
-  source = "git::git@github.com:tomarv2/terraform-aws-iam-policies.git?ref=v0.0.1"
+  source = "git::git@github.com:tomarv2/terraform-aws-iam-policies.git?ref=v0.0.2"
 
   profile_to_use = local.profile_to_use
   role_name      = module.iam_role.iam_role_name

main.tf

@@ -29,21 +29,11 @@ variable "databricks_account_password" {
   type        = string
 }
 
-#variable "databricks_account_id" {}
-
 variable "databricks_account_id" {
   description = "External ID provided by third party."
   type        = string
 }
 
-/*
-variable "cidr_block" {
-  description = "VPC CIDR block"
-  default     = "10.4.0.0/16"
-  type        = string
-}
-*/
-
 resource "random_string" "naming" {
   special = false
   upper   = false
@@ -53,43 +43,7 @@ resource "random_string" "naming" {
 locals {
   suffix = random_string.naming.result
 }
-/*
-variable "path" {
-  description = "The path to the IAM Role."
-  type        = string
-  default     = "/"
-}
-
-variable "force_detach_policies" {
-  description = "Forcibly detach the policy of the role."
-  type        = bool
-  default     = false
-}
-
-variable "policy_arn" {
-  description = "Attaches the policies to the IAM Role."
-  type        = list(any)
-  default     = null
-}
 
-variable "policy_identifier" {
-  description = "Policy Indentifier"
-  default     = ["ec2.amazonaws.com"]
-  type        = list(string)
-}
-
-variable "role_name" {
-  description = "IAM role"
-  default     = ""
-  type        = string
-}
-
-variable "assume_role_policy" {
-  description = "IAM assume role policy"
-  default     = ""
-  type        = string
-}
-*/
 variable "profile_for_iam" {
   description = "profile to use for IAM"
   default     = null

variables.tf

@@ -2,8 +2,8 @@ resource "databricks_mws_workspaces" "this" {
   provider        = databricks.mws
   account_id      = var.databricks_account_id
   aws_region      = var.aws_region
-  workspace_name  = "${var.teamid}-${var.prjid}-${local.suffix}" #local.prefix
-  deployment_name = "${var.teamid}-${var.prjid}-${local.suffix}" #local.prefix
+  workspace_name  = "${var.teamid}-${var.prjid}-${local.suffix}"
+  deployment_name = "${var.teamid}-${var.prjid}-${local.suffix}"
 
   credentials_id           = databricks_mws_credentials.this.credentials_id
   storage_configuration_id = databricks_mws_storage_configurations.this.storage_configuration_id