Refactoring usage of providers within modules (#94)

* refactor providers usage within modules

* remove more providers

Author: nkvuong

examples/aws-remote-backend-infra/main.tf

@@ -14,17 +14,23 @@ terraform {
 
 resource "aws_s3_bucket" "terraform_state" {
   bucket = var.bucket_name
-  # Enable versioning so we can see the full revision history of state files
-  versioning {
-    enabled = true
-  }
   force_destroy = true
-  # Enable server-side encryption by default
-  server_side_encryption_configuration {
-    rule {
-      apply_server_side_encryption_by_default {
-        sse_algorithm = "AES256"
-      }
+}
+
+# Enable versioning so we can see the full revision history of state files
+resource "aws_s3_bucket_versioning" "terraform_state" {
+  bucket = aws_s3_bucket.terraform_state.id
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
+# Enable server-side encryption by default
+resource "aws_s3_bucket_server_side_encryption_configuration" "terraform_state" {
+  bucket = aws_s3_bucket.terraform_state.id
+  rule {
+    apply_server_side_encryption_by_default {
+      sse_algorithm = "AES256"
     }
   }
 }

examples/aws-workspace-basic/main.tf

@@ -1,6 +1,4 @@
 module "aws-workspace-basic" {
   source                      = "github.com/databricks/terraform-databricks-examples/modules/aws-workspace-basic"
   databricks_account_id       = var.databricks_account_id
-  databricks_account_username = var.databricks_account_username
-  databricks_account_password = var.databricks_account_password
 }

examples/aws-workspace-basic/variables.tf

@@ -1,5 +1,3 @@
-variable "databricks_account_username" {}
-variable "databricks_account_password" {}
 variable "databricks_account_id" {}
 
 variable "tags" {

examples/aws-workspace-basic/versions.tf

@@ -12,3 +12,11 @@ terraform {
     }
   }
 }
+
+provider "aws" {
+  region = var.region
+}
+
+provider "databricks" {
+  host     = "https://accounts.cloud.databricks.com"
+}

examples/aws-workspace-with-firewall/main.tf

@@ -1,6 +1,4 @@
 module "aws-workspace-with-firewall" {
   source                      = "github.com/databricks/terraform-databricks-examples/modules/aws-workspace-with-firewall"
   databricks_account_id       = var.databricks_account_id
-  databricks_account_username = var.databricks_account_username
-  databricks_account_password = var.databricks_account_password
 }

examples/aws-workspace-with-firewall/versions.tf

@@ -12,3 +12,11 @@ terraform {
     }
   }
 }
+
+provider "aws" {
+  region = var.region
+}
+
+provider "databricks" {
+  host     = "https://accounts.cloud.databricks.com"
+}

examples/gcp-basic/init.tf

@@ -13,30 +13,10 @@ provider "google" {
   project = var.google_project
   region  = var.google_region
   zone    = var.google_zone
-
 }
 
-
-// initialize provider in "accounts" mode to provision new workspace
-
 provider "databricks" {
-  alias                  = "accounts"  
   host                   = "https://accounts.gcp.databricks.com"
   google_service_account = var.databricks_google_service_account
   account_id             = var.databricks_account_id
-
-}
-
-data "google_client_openid_userinfo" "me" {
-}
-
-
-data "google_client_config" "current" {
-}
-
-
-resource "random_string" "suffix" {
-  special = false
-  upper   = false
-  length  = 6
-}
+}

examples/gcp-basic/main.tf

@@ -0,0 +1,9 @@
+module "gcp-basic" {
+  source                = "github.com/databricks/terraform-databricks-examples/modules/gcp-workspace-basic"
+  databricks_account_id = var.databricks_account_id
+  google_project        = var.google_project
+  google_region         = var.google_region
+  prefix                = var.prefix
+  workspace_name        = var.workspace_name
+  delegate_from         = var.delegate_from
+}

examples/gcp-basic/workspace.tf

@@ -16,11 +16,7 @@ provider "google" {
 
 }
 
-
-// initialize provider in "accounts" mode to provision new workspace
-
 provider "databricks" {
-  alias                  = "accounts"  
   host                   = "https://accounts.gcp.databricks.com"
   google_service_account = var.databricks_google_service_account
   account_id             = var.databricks_account_id
@@ -32,11 +28,4 @@ data "google_client_openid_userinfo" "me" {
 
 
 data "google_client_config" "current" {
-}
-
-
-resource "random_string" "suffix" {
-  special = false
-  upper   = false
-  length  = 6
-}
+}

examples/gcp-byovpc/init.tf

@@ -0,0 +1,15 @@
+module "gcp-byovpc" {
+  source                = "github.com/databricks/terraform-databricks-examples/modules/gcp-workspace-byovpc"
+  databricks_account_id = var.databricks_account_id
+  google_project        = var.google_project
+  google_region         = var.google_region
+  prefix                = var.prefix
+  subnet_ip_cidr_range  = var.subnet_ip_cidr_range
+  pod_ip_cidr_range     = var.pod_ip_cidr_range
+  svc_ip_cidr_range     = var.svc_ip_cidr_range
+  subnet_name           = var.subnet_name
+  router_name           = var.router_name
+  nat_name              = var.nat_name
+  workspace_name        = var.workspace_name
+  delegate_from         = var.delegate_from
+}