From 3c98d5c9a7c15bcb3c2989b8403fda055ad06889 Mon Sep 17 00:00:00 2001 From: MyroslavLevchyk Date: Mon, 25 Nov 2024 11:29:11 +0200 Subject: [PATCH] fix: module update --- README.md | 9 +++++---- main.tf | 2 +- modules/privatelink/main.tf | 2 +- modules/privatelink/outputs.tf | 2 +- modules/privatelink/variables.tf | 2 +- modules/privatelink/versions.tf | 4 ++-- outputs.tf | 5 +++++ variables.tf | 3 +-- versions.tf | 6 +++--- 9 files changed, 20 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index a13e5df..8891480 100644 --- a/README.md +++ b/README.md @@ -9,16 +9,16 @@ Terraform module for creation AWS Databricks Workspace | Name | Version | |------|---------| | [terraform](#requirement\_terraform) | >= 1.8 | -| [aws](#requirement\_aws) | >= 5.0 | -| [databricks](#requirement\_databricks) | >= 1.55 | +| [aws](#requirement\_aws) | ~>5.0 | +| [databricks](#requirement\_databricks) | ~>1.0 | | [time](#requirement\_time) | ~> 0.11 | ## Providers | Name | Version | |------|---------| -| [aws](#provider\_aws) | >= 5.0 | -| [databricks](#provider\_databricks) | >= 1.55 | +| [aws](#provider\_aws) | ~>5.0 | +| [databricks](#provider\_databricks) | ~>1.0 | | [time](#provider\_time) | ~> 0.11 | ## Modules @@ -76,6 +76,7 @@ Terraform module for creation AWS Databricks Workspace | [iam\_role](#output\_iam\_role) | The IAM role created for cross-account access to the Databricks workspace | | [storage](#output\_storage) | The storage configuration for the DBFS bucket associated with the workspace | | [workspace](#output\_workspace) | The Databricks workspace resource that has been created | +| [workspace\_id](#output\_workspace\_id) | The unique identifier of the Databricks workspace. | | [workspace\_url](#output\_workspace\_url) | The URL for accessing the Databricks workspace | diff --git a/main.tf b/main.tf index 1d7d81d..7b1fd55 100644 --- a/main.tf +++ b/main.tf @@ -157,4 +157,4 @@ resource "databricks_mws_storage_configurations" "this" { account_id = var.account_id storage_configuration_name = var.label bucket_name = module.storage_configuration_dbfs_bucket[0].s3_bucket_id -} +} \ No newline at end of file diff --git a/modules/privatelink/main.tf b/modules/privatelink/main.tf index 005e2b1..166269d 100644 --- a/modules/privatelink/main.tf +++ b/modules/privatelink/main.tf @@ -10,4 +10,4 @@ resource "databricks_mws_vpc_endpoint" "relay" { aws_vpc_endpoint_id = var.relay_aws_vpc_endpoint_id vpc_endpoint_name = var.relay_vpc_endpoint_name region = var.region -} +} \ No newline at end of file diff --git a/modules/privatelink/outputs.tf b/modules/privatelink/outputs.tf index 62f6995..0f76590 100644 --- a/modules/privatelink/outputs.tf +++ b/modules/privatelink/outputs.tf @@ -6,4 +6,4 @@ output "rest_vpce_id" { output "relay_vpce_id" { value = databricks_mws_vpc_endpoint.relay.vpc_endpoint_id description = "The ID of the AWS VPC endpoint associated with the Databricks Relay service" -} +} \ No newline at end of file diff --git a/modules/privatelink/variables.tf b/modules/privatelink/variables.tf index 66c2050..6e366bd 100644 --- a/modules/privatelink/variables.tf +++ b/modules/privatelink/variables.tf @@ -25,4 +25,4 @@ variable "relay_aws_vpc_endpoint_id" { variable "account_id" { type = string description = "Databricks Account ID" -} +} \ No newline at end of file diff --git a/modules/privatelink/versions.tf b/modules/privatelink/versions.tf index 21f9c42..f41cc35 100644 --- a/modules/privatelink/versions.tf +++ b/modules/privatelink/versions.tf @@ -4,7 +4,7 @@ terraform { required_providers { databricks = { source = "databricks/databricks" - version = ">= 1.55" + version = "~>1.0" } } -} +} \ No newline at end of file diff --git a/outputs.tf b/outputs.tf index d3d7247..34faa09 100644 --- a/outputs.tf +++ b/outputs.tf @@ -17,3 +17,8 @@ output "workspace_url" { value = databricks_mws_workspaces.this.workspace_url description = "The URL for accessing the Databricks workspace" } + +output "workspace_id" { + value = databricks_mws_workspaces.this.workspace_id + description = "The unique identifier of the Databricks workspace." +} \ No newline at end of file diff --git a/variables.tf b/variables.tf index 2a974fb..5dc6d59 100644 --- a/variables.tf +++ b/variables.tf @@ -107,7 +107,6 @@ variable "iam_cross_account_workspace_role_config" { }) default = {} } - ################################################################################ # Storage root bucket config ################################################################################ @@ -151,4 +150,4 @@ variable "private_access_settings_config" { public_access_enabled = optional(bool, true) }) default = {} -} +} \ No newline at end of file diff --git a/versions.tf b/versions.tf index 2a9a86d..54078af 100644 --- a/versions.tf +++ b/versions.tf @@ -4,15 +4,15 @@ terraform { required_providers { aws = { source = "hashicorp/aws" - version = ">= 5.0" + version = "~>5.0" } databricks = { source = "databricks/databricks" - version = ">= 1.55" + version = "~>1.0" } time = { source = "hashicorp/time" version = "~> 0.11" } } -} +} \ No newline at end of file