Merge pull request #9 from tomarv2/updates

upgrading module to work with databricks version 0.3.3

Author: tomarv2

README.md

@@ -37,8 +37,8 @@
 ## Versions
 
 - Module tested for Terraform 0.14.
-- `databrickslabs/databricks` provider version [0.3.1](https://registry.terraform.io/providers/databrickslabs/databricks/latest)
-- AWS provider version [3.29.0](https://registry.terraform.io/providers/hashicorp/aws/latest)
+- `databrickslabs/databricks` provider version [0.3.3](https://registry.terraform.io/providers/databrickslabs/databricks/latest)
+- AWS provider version [3.30](https://registry.terraform.io/providers/hashicorp/aws/latest)
 - `main` branch: Provider versions not pinned to keep up with Terraform releases
 - `tags` releases: Tags are pinned with versions (use <a href="https://github.com/tomarv2/terraform-databricks-aws-workspace/tags" alt="GitHub tag">
         <img src="https://img.shields.io/github/v/tag/tomarv2/terraform-databricks-aws-workspace" /></a> in your releases)
@@ -103,6 +103,7 @@ module "databricks_workspace" {
   source = "git::git@github.com:tomarv2/terraform-databricks-aws-workspace.git"
 
   profile_for_iam             = "iam-admin"
+  aws_region                  = "us-east-2"
   databricks_account_username = "example@example.com"
   databricks_account_password = "sample123!"
   databricks_account_id       = "1234567-1234-1234-1234-1234567"
@@ -115,6 +116,10 @@ module "databricks_workspace" {
 
 Please refer to examples directory [link](examples) for references.
 
+## Coming up:
+
+- Use [Customer Managed VPC](https://docs.databricks.com/administration-guide/cloud-configurations/aws/customer-managed-vpc.html)
+
 ## Troubleshooting:
 
 ### IAM policy error

examples/sample/main.tf

@@ -2,6 +2,7 @@ module "databricks_workspace" {
   source = "../../"
 
   profile_for_iam             = "iam-admin"
+  aws_region                  = "us-east-2"
   databricks_account_username = "example@example.com"
   databricks_account_password = "sample123!"
   databricks_account_id       = "1234567-1234-1234-1234-1234567"

main.tf

@@ -1,6 +1,7 @@
 module "vpc" {
   source = "git::git@github.com:tomarv2/terraform-aws-vpc.git?ref=v0.0.1"
 
+  aws_region = var.aws_region
   # -----------------------------------------
   # Do not change the teamid, prjid once set.
   teamid = var.teamid
@@ -24,7 +25,7 @@ module "iam_policies" {
 
   profile_to_use = local.profile_to_use
   role_name      = module.iam_role.iam_role_name
-  policy_json    = data.databricks_aws_crossaccount_policy.cross_account_iam_policy.json
+  policy         = data.databricks_aws_crossaccount_policy.cross_account_iam_policy.json
   inline_policy  = true
   # -----------------------------------------
   # Do not change the teamid, prjid once set.
@@ -33,8 +34,9 @@ module "iam_policies" {
 }
 
 module "s3" {
-  source = "git::git@github.com:tomarv2/terraform-aws-s3.git?ref=v0.0.1"
+  source = "git::git@github.com:tomarv2/terraform-aws-s3.git?ref=v0.0.2"
 
+  aws_region = var.aws_region
   # -----------------------------------------
   # Do not change the teamid, prjid once set.
   teamid = var.teamid

outputs.tf

@@ -72,3 +72,15 @@ output "workspace_url" {
   description = "databricks workspace url"
   value       = databricks_mws_workspaces.this
 }
+
+/*
+output "pat_token" {
+  description = "databricks pat"
+  value       = databricks_token.pat.connection
+}
+
+output "pat_token_duration" {
+  description = "databricks pat"
+  value       = databricks_token.pat.lifetime_seconds
+}
+*/

pat_token.tf

@@ -1,9 +1,9 @@
 /* Create PAT token to provision entities within workspace
  https://registry.terraform.io/providers/databrickslabs/databricks/latest/docs/resources/token
-
-resource "databricks_token" "dapi" {
+*/
+resource "databricks_token" "pat" {
   provider = databricks.created_workspace
   comment  = "Terraform managed: ${var.teamid}-${var.prjid}"
   lifetime_seconds = 86400
 }
-*/
+

versions.tf

@@ -7,11 +7,11 @@ terraform {
   required_version = ">= 0.14"
   required_providers {
     aws = {
-      version = "~> 3.29"
+      version = "~> 3.30"
     }
     databricks = {
       source  = "databrickslabs/databricks"
-      version = "0.3.1"
+      version = "0.3.3"
     }
     random = {
       version = "~> 3.1"