Skip to content

Commit 25630ac

Browse files
MyroslavLevchykMyroslavLevchyk
authored andcommitted
fix: module update
1 parent ec0f7f0 commit 25630ac

File tree

9 files changed

+24
-19
lines changed

9 files changed

+24
-19
lines changed

README.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ Terraform module for creation AWS Databricks Workspace
99
| Name | Version |
1010
|------|---------|
1111
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.8 |
12-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0 |
13-
| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | >= 1.55 |
12+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~>5.0 |
13+
| <a name="requirement_databricks"></a> [databricks](#requirement\_databricks) | ~>1.0 |
1414
| <a name="requirement_time"></a> [time](#requirement\_time) | ~> 0.11 |
1515

1616
## Providers
1717

1818
| Name | Version |
1919
|------|---------|
20-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 5.0 |
21-
| <a name="provider_databricks"></a> [databricks](#provider\_databricks) | >= 1.55 |
20+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~>5.0 |
21+
| <a name="provider_databricks"></a> [databricks](#provider\_databricks) | ~>1.0 |
2222
| <a name="provider_time"></a> [time](#provider\_time) | ~> 0.11 |
2323

2424
## Modules
@@ -50,19 +50,19 @@ Terraform module for creation AWS Databricks Workspace
5050
| Name | Description | Type | Default | Required |
5151
|------|-------------|------|---------|:--------:|
5252
| <a name="input_account_id"></a> [account\_id](#input\_account\_id) | Databricks Account ID | `string` | n/a | yes |
53-
| <a name="input_iam_cross_account_workspace_role_config"></a> [iam\_cross\_account\_workspace\_role\_config](#input\_iam\_cross\_account\_workspace\_role\_config) | Configuration object for setting the IAM cross-account role for the Databricks workspace | <pre>object({<br/> role_name = optional(string, null)<br/> policy_name = optional(string, null)<br/> permission_boundary_arn = optional(string, null)<br/> role_description = optional(string, "Databricks IAM Role to launch clusters in your AWS account, you must create a cross-account IAM role that gives access to Databricks.")<br/> })</pre> | `{}` | no |
53+
| <a name="input_iam_cross_account_workspace_role_config"></a> [iam\_cross\_account\_workspace\_role\_config](#input\_iam\_cross\_account\_workspace\_role\_config) | Configuration object for setting the IAM cross-account role for the Databricks workspace | <pre>object({<br> role_name = optional(string, null)<br> policy_name = optional(string, null)<br> permission_boundary_arn = optional(string, null)<br> role_description = optional(string, "Databricks IAM Role to launch clusters in your AWS account, you must create a cross-account IAM role that gives access to Databricks.")<br> })</pre> | `{}` | no |
5454
| <a name="input_iam_cross_account_workspace_role_enabled"></a> [iam\_cross\_account\_workspace\_role\_enabled](#input\_iam\_cross\_account\_workspace\_role\_enabled) | A boolean flag to determine if the cross-account IAM role for Databricks workspace access should be created | `bool` | `true` | no |
5555
| <a name="input_label"></a> [label](#input\_label) | A customizable string used as a prefix for naming Databricks resources | `string` | n/a | yes |
56-
| <a name="input_private_access_settings_config"></a> [private\_access\_settings\_config](#input\_private\_access\_settings\_config) | Configuration for private access settings | <pre>object({<br/> name = optional(string, null)<br/> allowed_vpc_endpoint_ids = optional(list(string), [])<br/> public_access_enabled = optional(bool, true)<br/> })</pre> | `{}` | no |
56+
| <a name="input_private_access_settings_config"></a> [private\_access\_settings\_config](#input\_private\_access\_settings\_config) | Configuration for private access settings | <pre>object({<br> name = optional(string, null)<br> allowed_vpc_endpoint_ids = optional(list(string), [])<br> public_access_enabled = optional(bool, true)<br> })</pre> | `{}` | no |
5757
| <a name="input_private_access_settings_enabled"></a> [private\_access\_settings\_enabled](#input\_private\_access\_settings\_enabled) | Indicates whether private access settings should be enabled for the Databricks workspace. Set to true to activate these settings | `bool` | `true` | no |
58-
| <a name="input_privatelink_dedicated_vpce_config"></a> [privatelink\_dedicated\_vpce\_config](#input\_privatelink\_dedicated\_vpce\_config) | Configuration object for AWS PrivateLink dedicated VPC Endpoints (VPCe) | <pre>object({<br/> rest_vpc_endpoint_name = optional(string, null)<br/> relay_vpc_endpoint_name = optional(string, null)<br/> rest_aws_vpc_endpoint_id = optional(string, null)<br/> relay_aws_vpc_endpoint_id = optional(string, null)<br/> })</pre> | `{}` | no |
58+
| <a name="input_privatelink_dedicated_vpce_config"></a> [privatelink\_dedicated\_vpce\_config](#input\_privatelink\_dedicated\_vpce\_config) | Configuration object for AWS PrivateLink dedicated VPC Endpoints (VPCe) | <pre>object({<br> rest_vpc_endpoint_name = optional(string, null)<br> relay_vpc_endpoint_name = optional(string, null)<br> rest_aws_vpc_endpoint_id = optional(string, null)<br> relay_aws_vpc_endpoint_id = optional(string, null)<br> })</pre> | `{}` | no |
5959
| <a name="input_privatelink_dedicated_vpce_enabled"></a> [privatelink\_dedicated\_vpce\_enabled](#input\_privatelink\_dedicated\_vpce\_enabled) | Boolean flag to enable or disable the creation of dedicated AWS VPC Endpoints (VPCe) for Databricks PrivateLink | `bool` | `false` | no |
6060
| <a name="input_privatelink_enabled"></a> [privatelink\_enabled](#input\_privatelink\_enabled) | Boolean flag to enabled registration of Privatelink VPC Endpoints (REST API and SCC Relay) in target Databricks Network Config | `bool` | `false` | no |
6161
| <a name="input_privatelink_relay_vpce_id"></a> [privatelink\_relay\_vpce\_id](#input\_privatelink\_relay\_vpce\_id) | AWS VPC Endpoint ID used for Databricks SCC Relay when PrivateLink is enabled | `string` | `null` | no |
6262
| <a name="input_privatelink_rest_vpce_id"></a> [privatelink\_rest\_vpce\_id](#input\_privatelink\_rest\_vpce\_id) | AWS VPC Endpoint ID used for Databricks REST API if PrivateLink is enabled | `string` | `null` | no |
6363
| <a name="input_region"></a> [region](#input\_region) | AWS region | `string` | n/a | yes |
6464
| <a name="input_security_group_ids"></a> [security\_group\_ids](#input\_security\_group\_ids) | Set of AWS security group IDs for Databricks Account network configuration | `set(string)` | n/a | yes |
65-
| <a name="input_storage_dbfs_config"></a> [storage\_dbfs\_config](#input\_storage\_dbfs\_config) | Configuration for the Databricks File System (DBFS) storage | <pre>object({<br/> bucket_name = optional(string)<br/> })</pre> | `{}` | no |
65+
| <a name="input_storage_dbfs_config"></a> [storage\_dbfs\_config](#input\_storage\_dbfs\_config) | Configuration for the Databricks File System (DBFS) storage | <pre>object({<br> bucket_name = optional(string)<br> })</pre> | `{}` | no |
6666
| <a name="input_storage_dbfs_enabled"></a> [storage\_dbfs\_enabled](#input\_storage\_dbfs\_enabled) | Flag to enable or disable the use of DBFS (Databricks File System) storage in the Databricks workspace | `bool` | `true` | no |
6767
| <a name="input_subnet_ids"></a> [subnet\_ids](#input\_subnet\_ids) | Set of AWS subnet IDs for Databricks Account network configuration | `set(string)` | n/a | yes |
6868
| <a name="input_tags"></a> [tags](#input\_tags) | Assigned tags to AWS services | `map(string)` | `{}` | no |
@@ -76,6 +76,7 @@ Terraform module for creation AWS Databricks Workspace
7676
| <a name="output_iam_role"></a> [iam\_role](#output\_iam\_role) | The IAM role created for cross-account access to the Databricks workspace |
7777
| <a name="output_storage"></a> [storage](#output\_storage) | The storage configuration for the DBFS bucket associated with the workspace |
7878
| <a name="output_workspace"></a> [workspace](#output\_workspace) | The Databricks workspace resource that has been created |
79+
| <a name="output_workspace_id"></a> [workspace\_id](#output\_workspace\_id) | The unique identifier of the Databricks workspace. |
7980
| <a name="output_workspace_url"></a> [workspace\_url](#output\_workspace\_url) | The URL for accessing the Databricks workspace |
8081
<!-- END_TF_DOCS -->
8182

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,4 +157,4 @@ resource "databricks_mws_storage_configurations" "this" {
157157
account_id = var.account_id
158158
storage_configuration_name = var.label
159159
bucket_name = module.storage_configuration_dbfs_bucket[0].s3_bucket_id
160-
}
160+
}

modules/privatelink/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ resource "databricks_mws_vpc_endpoint" "relay" {
1010
aws_vpc_endpoint_id = var.relay_aws_vpc_endpoint_id
1111
vpc_endpoint_name = var.relay_vpc_endpoint_name
1212
region = var.region
13-
}
13+
}

modules/privatelink/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ output "rest_vpce_id" {
66
output "relay_vpce_id" {
77
value = databricks_mws_vpc_endpoint.relay.vpc_endpoint_id
88
description = "The ID of the AWS VPC endpoint associated with the Databricks Relay service"
9-
}
9+
}

modules/privatelink/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ variable "relay_aws_vpc_endpoint_id" {
2525
variable "account_id" {
2626
type = string
2727
description = "Databricks Account ID"
28-
}
28+
}

modules/privatelink/versions.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
databricks = {
66
source = "databricks/databricks"
7-
version = ">= 1.55"
7+
version = "~>1.0"
88
}
99
}
10-
}
10+
}

outputs.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,8 @@ output "workspace_url" {
1717
value = databricks_mws_workspaces.this.workspace_url
1818
description = "The URL for accessing the Databricks workspace"
1919
}
20+
21+
output "workspace_id" {
22+
value = databricks_mws_workspaces.this.workspace_id
23+
description = "The unique identifier of the Databricks workspace."
24+
}

variables.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ variable "iam_cross_account_workspace_role_config" {
107107
})
108108
default = {}
109109
}
110-
111110
################################################################################
112111
# Storage root bucket config
113112
################################################################################
@@ -151,4 +150,4 @@ variable "private_access_settings_config" {
151150
public_access_enabled = optional(bool, true)
152151
})
153152
default = {}
154-
}
153+
}

versions.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 5.0"
7+
version = "~>5.0"
88
}
99
databricks = {
1010
source = "databricks/databricks"
11-
version = ">= 1.55"
11+
version = "~>1.0"
1212
}
1313
time = {
1414
source = "hashicorp/time"
1515
version = "~> 0.11"
1616
}
1717
}
18-
}
18+
}

0 commit comments

Comments
 (0)