Skip to content

Commit

Permalink
Merge pull request #76 from tomarv2/develop
Browse files Browse the repository at this point in the history
fixing naming standard
tomarv2 authored Sep 29, 2022
2 parents 5c674e3 + 72d25c1 commit fdd4ec3
Showing 27 changed files with 97 additions and 103 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@
## Versions

- Module tested for Terraform 1.0.1.
- `databricks/databricks` provider version [1.3.0](https://registry.terraform.io/providers/databricks/databricks/latest)
- `databricks/databricks` provider version [1.3.1](https://registry.terraform.io/providers/databricks/databricks/latest)
- AWS provider version [4.14](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-workspace-management/tags" alt="GitHub tag">
2 changes: 1 addition & 1 deletion examples/all/sample-maximum_config/main.tf
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}
2 changes: 1 addition & 1 deletion examples/all/sample/main.tf
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}
4 changes: 2 additions & 2 deletions examples/clusters/1_single_node_cluster/main.tf
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}

module "databricks_workspace_management" {
module "cluster" {
source = "../../../"
# ------------------------------------------------
# CLUSTER
14 changes: 7 additions & 7 deletions examples/clusters/1_single_node_cluster/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.cluster.cluster_id
}

output "databricks_secret_acl" {
description = "databricks secret acl"
value = module.databricks_workspace_management.databricks_secret_acl
value = module.cluster.databricks_secret_acl
}

output "databricks_group" {
description = "databricks group name"
value = module.databricks_workspace_management.databricks_group
value = module.cluster.databricks_group
}

output "databricks_user" {
description = "databricks user name"
value = module.databricks_workspace_management.databricks_user
value = module.cluster.databricks_user
}

output "databricks_user_id" {
description = "databricks user id"
value = module.databricks_workspace_management.databricks_user_id
value = module.cluster.databricks_user_id
}

output "databricks_group_member" {
description = "databricks group members"
value = module.databricks_workspace_management.databricks_group_member
value = module.cluster.databricks_group_member
}

output "cluster_policy_id" {
description = "databricks cluster policy permissions"
value = module.databricks_workspace_management.cluster_policy_id
value = module.cluster.cluster_policy_id
}
4 changes: 2 additions & 2 deletions examples/clusters/2_standard_cluster/main.tf
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "cluster" {
source = "../../../"
# ------------------------------------------------
# CLUSTER
14 changes: 7 additions & 7 deletions examples/clusters/2_standard_cluster/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.cluster.cluster_id
}

output "databricks_secret_acl" {
description = "databricks secret acl"
value = module.databricks_workspace_management.databricks_secret_acl
value = module.cluster.databricks_secret_acl
}

output "databricks_group" {
description = "databricks group name"
value = module.databricks_workspace_management.databricks_group
value = module.cluster.databricks_group
}

output "databricks_user" {
description = "databricks user name"
value = module.databricks_workspace_management.databricks_user
value = module.cluster.databricks_user
}

output "databricks_user_id" {
description = "databricks user id"
value = module.databricks_workspace_management.databricks_user_id
value = module.cluster.databricks_user_id
}

output "databricks_group_member" {
description = "databricks group members"
value = module.databricks_workspace_management.databricks_group_member
value = module.cluster.databricks_group_member
}

output "cluster_policy_id" {
description = "databricks cluster policy permissions"
value = module.databricks_workspace_management.cluster_policy_id
value = module.cluster.cluster_policy_id
}
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "cluster" {
source = "../../../"
# ------------------------------------------------
# CLUSTER
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.cluster.cluster_id
}

output "databricks_secret_acl" {
description = "databricks secret acl"
value = module.databricks_workspace_management.databricks_secret_acl
value = module.cluster.databricks_secret_acl
}

output "databricks_group" {
description = "databricks group name"
value = module.databricks_workspace_management.databricks_group
value = module.cluster.databricks_group
}

output "databricks_user" {
description = "databricks user name"
value = module.databricks_workspace_management.databricks_user
value = module.cluster.databricks_user
}

output "databricks_user_id" {
description = "databricks user id"
value = module.databricks_workspace_management.databricks_user_id
value = module.cluster.databricks_user_id
}

output "databricks_group_member" {
description = "databricks group members"
value = module.databricks_workspace_management.databricks_group_member
value = module.cluster.databricks_group_member
}

output "cluster_policy_id" {
description = "databricks cluster policy permissions"
value = module.databricks_workspace_management.cluster_policy_id
value = module.cluster.cluster_policy_id
}
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}

module "databricks_workspace_management" {
module "cluster" {
source = "../../../"
# ------------------------------------------------
# CLUSTER
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.cluster.cluster_id
}

output "databricks_secret_acl" {
description = "databricks secret acl"
value = module.databricks_workspace_management.databricks_secret_acl
value = module.cluster.databricks_secret_acl
}

output "databricks_group" {
description = "databricks group name"
value = module.databricks_workspace_management.databricks_group
value = module.cluster.databricks_group
}

output "databricks_user" {
description = "databricks user name"
value = module.databricks_workspace_management.databricks_user
value = module.cluster.databricks_user
}

output "databricks_user_id" {
description = "databricks user id"
value = module.databricks_workspace_management.databricks_user_id
value = module.cluster.databricks_user_id
}

output "databricks_group_member" {
description = "databricks group members"
value = module.databricks_workspace_management.databricks_group_member
value = module.cluster.databricks_group_member
}

output "cluster_policy_id" {
description = "databricks cluster policy permissions"
value = module.databricks_workspace_management.cluster_policy_id
value = module.cluster.cluster_policy_id
}
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "cluster" {
source = "../../../"
# ------------------------------------------------
# CLUSTER
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.cluster.cluster_id
}

output "databricks_secret_acl" {
description = "databricks secret acl"
value = module.databricks_workspace_management.databricks_secret_acl
value = module.cluster.databricks_secret_acl
}

output "databricks_group" {
description = "databricks group name"
value = module.databricks_workspace_management.databricks_group
value = module.cluster.databricks_group
}

output "databricks_user" {
description = "databricks user name"
value = module.databricks_workspace_management.databricks_user
value = module.cluster.databricks_user
}

output "databricks_user_id" {
description = "databricks user id"
value = module.databricks_workspace_management.databricks_user_id
value = module.cluster.databricks_user_id
}

output "databricks_group_member" {
description = "databricks group members"
value = module.databricks_workspace_management.databricks_group_member
value = module.cluster.databricks_group_member
}

output "cluster_policy_id" {
description = "databricks cluster policy permissions"
value = module.databricks_workspace_management.cluster_policy_id
value = module.cluster.cluster_policy_id
}
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "cluster" {
source = "../../../"
# ------------------------------------------------
# CLUSTER
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.cluster.cluster_id
}

output "databricks_secret_acl" {
description = "databricks secret acl"
value = module.databricks_workspace_management.databricks_secret_acl
value = module.cluster.databricks_secret_acl
}

output "databricks_group" {
description = "databricks group name"
value = module.databricks_workspace_management.databricks_group
value = module.cluster.databricks_group
}

output "databricks_user" {
description = "databricks user name"
value = module.databricks_workspace_management.databricks_user
value = module.cluster.databricks_user
}

output "databricks_user_id" {
description = "databricks user id"
value = module.databricks_workspace_management.databricks_user_id
value = module.cluster.databricks_user_id
}

output "databricks_group_member" {
description = "databricks group members"
value = module.databricks_workspace_management.databricks_group_member
value = module.cluster.databricks_group_member
}

output "cluster_policy_id" {
description = "databricks cluster policy permissions"
value = module.databricks_workspace_management.cluster_policy_id
value = module.cluster.cluster_policy_id
}
4 changes: 2 additions & 2 deletions examples/clusters/7_cluster_with_aws_instance_profile/main.tf
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "cluster" {
source = "../../../"
# ------------------------------------------------
# CLUSTER
12 changes: 6 additions & 6 deletions examples/clusters/7_cluster_with_aws_instance_profile/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.cluster.cluster_id
}
output "databricks_secret_acl" {
description = "databricks secret acl"
value = module.databricks_workspace_management.databricks_secret_acl
value = module.cluster.databricks_secret_acl
}

output "databricks_group" {
description = "databricks group name"
value = module.databricks_workspace_management.databricks_group
value = module.cluster.databricks_group
}

output "databricks_user" {
description = "databricks user name"
value = module.databricks_workspace_management.databricks_user
value = module.cluster.databricks_user
}

output "databricks_user_id" {
description = "databricks user id"
value = module.databricks_workspace_management.databricks_user_id
value = module.cluster.databricks_user_id
}

output "databricks_group_member" {
description = "databricks group members"
value = module.databricks_workspace_management.databricks_group_member
value = module.cluster.databricks_group_member
}
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "job" {
source = "../../../"
# ------------------------------------------------
# JOB
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.job.cluster_id
}

output "notebook_url" {
description = "databricks notebook url"
value = module.databricks_workspace_management.notebook_url
value = module.job.notebook_url
}
output "job_url" {
description = "databricks job url"
value = module.databricks_workspace_management.new_cluster_new_job_new_notebooks_job
value = module.job.new_cluster_new_job_new_notebooks_job
}

output "job_id" {
description = "databricks job id"
value = module.databricks_workspace_management.new_cluster_new_job_new_notebooks_id
value = module.job.new_cluster_new_job_new_notebooks_id
}

output "notebooks_id" {
description = "databricks notebook id"
value = module.databricks_workspace_management.new_cluster_new_job_existing_notebooks_id
value = module.job.new_cluster_new_job_existing_notebooks_id
}
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "job" {
source = "../../../"
# ------------------------------------------------
# JOB
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
output "cluster_id" {
description = "databricks cluster id"
value = module.databricks_workspace_management.cluster_id
value = module.job.cluster_id
}

output "notebook_url" {
description = "databricks notebook url"
value = module.databricks_workspace_management.notebook_url
value = module.job.notebook_url
}
output "job_url" {
description = "databricks job url"
value = module.databricks_workspace_management.new_cluster_new_job_new_notebooks_job
value = module.job.new_cluster_new_job_new_notebooks_job
}

output "job_id" {
description = "databricks job id"
value = module.databricks_workspace_management.new_cluster_new_job_new_notebooks_id
value = module.job.new_cluster_new_job_new_notebooks_id
}

output "notebooks_id" {
description = "databricks notebook id"
value = module.databricks_workspace_management.new_cluster_new_job_existing_notebooks_id
value = module.job.new_cluster_new_job_existing_notebooks_id
}
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}

module "databricks_workspace_management" {
module "job" {
source = "../../../"
# ------------------------------------------------
# JOB
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
output "notebook_url" {
description = "databricks notebook url"
value = module.databricks_workspace_management.notebook_url
value = module.job.notebook_url
}

output "job_url" {
description = "databricks new cluster job url"
value = module.databricks_workspace_management.existing_cluster_new_job_existing_notebooks_job
value = module.job.existing_cluster_new_job_existing_notebooks_job
}

output "job_id" {
description = "job id"
value = module.databricks_workspace_management.existing_cluster_new_job_existing_notebooks_id
value = module.job.existing_cluster_new_job_existing_notebooks_id
}
14 changes: 2 additions & 12 deletions examples/jobs/4_job_on_existing_cluster_with_new_notebooks/main.tf
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}
@@ -19,21 +19,11 @@ module "cluster" {
# ------------------------------------------------
deploy_cluster = true
fixed_value = 0

# libraries = {
# maven = {
# "com.microsoft.azure:azure-eventhubs-spark_2.12:2.3.21" = {}
# }
# python_wheel = {}
# }

# ------------------------------------------------
# Do not change the teamid, prjid once set.
teamid = var.teamid
prjid = var.prjid
}

module "jobs" {
module "job" {
source = "../../../"

# ------------------------------------------------
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
output "notebook_url" {
description = "databricks notebook url"
value = module.jobs.notebook_url
value = module.job.notebook_url
}

output "job_url" {
description = "databricks job url"
value = module.jobs.existing_cluster_new_job_new_notebooks_job
value = module.job.existing_cluster_new_job_new_notebooks_job
}

output "job_id" {
description = "databricks job id"
value = module.jobs.existing_cluster_new_job_new_notebooks_id
value = module.job.existing_cluster_new_job_new_notebooks_id
}

output "cluster_id" {
description = "databricks cluster id"
value = module.cluster.cluster_id
}
4 changes: 2 additions & 2 deletions examples/notebooks/1_deploy_notebooks/main.tf
Original file line number Diff line number Diff line change
@@ -7,13 +7,13 @@ terraform {
required_providers {
databricks = {
source = "databricks/databricks"
version = "~> 0.5.7"
version = "~> 1.3.1"
}
}
}


module "databricks_workspace_management" {
module "notebook" {
source = "../../../"
# ------------------------------------------------
# NOTEBOOK
4 changes: 2 additions & 2 deletions examples/notebooks/1_deploy_notebooks/outputs.tf
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
output "notebook_url_standalone" {
description = "databricks notebook url"
value = module.databricks_workspace_management.notebook_url_standalone
value = module.notebook.notebook_url_standalone
}

/*
output "notebook_permissions" {
description = "databricks notebook permissions"
value = module.databricks_workspace_management.notebook_permissions
value = module.cluster.notebook_permissions
}
*/

0 comments on commit fdd4ec3

Please sign in to comment.