Merge branch 'main' into jng/CDI-1691

chanzuckerberg · Aug 29, 2024 · fdc03a5 · fdc03a5
2 parents efe3c07 + e3974b7
commit fdc03a5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.80.0](https://github.com/chanzuckerberg/cztack/compare/v0.79.0...v0.80.0) (2024-08-27)
+
+
+### Features
+
+* Catalog prefix option ([#631](https://github.com/chanzuckerberg/cztack/issues/631)) ([44b9e6b](https://github.com/chanzuckerberg/cztack/commit/44b9e6b239d32c3698b001ec9aba4027db32de9c))
+
+## [0.79.0](https://github.com/chanzuckerberg/cztack/compare/v0.78.2...v0.79.0) (2024-08-22)
+
+
+### Features
+
+* trigger release and fix docs ([#629](https://github.com/chanzuckerberg/cztack/issues/629)) ([730a6d5](https://github.com/chanzuckerberg/cztack/commit/730a6d50328c566f93b3161599d7fa4390d5a494))
+
 ## [0.78.2](https://github.com/chanzuckerberg/cztack/compare/v0.78.1...v0.78.2) (2024-08-21)
 
 

diff --git a/databricks-catalog-external-location/catalogs.tf b/databricks-catalog-external-location/catalogs.tf
@@ -1,7 +1,7 @@
 resource "databricks_catalog" "catalog" {
   for_each       = { for idx, catalog in var.catalogs : catalog.name => catalog }
   name           = each.value.name
-  storage_root   = "s3://${module.catalog_bucket.name}/${each.value.name}"
+  storage_root   = "s3://${module.catalog_bucket.name}/${each.value.catalog_prefix != "" ? each.value.catalog_prefix : each.value.name}"
   comment        = "this catalog is managed by terraform"
   isolation_mode = each.value.isolation_mode
   owner          = each.value.owner

diff --git a/databricks-catalog-external-location/variables.tf b/databricks-catalog-external-location/variables.tf
@@ -28,5 +28,6 @@ variable "catalogs" {
       all_privileges_groups   = list(string)
       read_privileges_groups  = optional(list(string), [])
       write_privileges_groups = optional(list(string), [])
+      catalog_prefix          = optional(string, "")
   }))
 }
diff --git a/databricks-cluster-log-permissions/README.md b/databricks-cluster-log-permissions/README.md
@@ -63,4 +63,5 @@ No modules.
 | <a name="output_default_logging_role_arn"></a> [default\_logging\_role\_arn](#output\_default\_logging\_role\_arn) | ARN of the AWS IAM role created for default logs access |
 | <a name="output_rw_logging_role_arn"></a> [rw\_logging\_role\_arn](#output\_rw\_logging\_role\_arn) | ARN of the AWS IAM role created for read and write logs access |
 | <a name="output_rw_logging_role_instance_profile_arn"></a> [rw\_logging\_role\_instance\_profile\_arn](#output\_rw\_logging\_role\_instance\_profile\_arn) | ARN of the AWS instance profile created for read and write logs access |
+| <a name="output_dbx_instance_profile_id"></a> [rw\_dbx\_instance\_profile\_id](#output\_dbx\_instance\_profile\_id) | ID of the Databricks instance profile created for writing logs |
 <!-- END -->
diff --git a/databricks-cluster-log-permissions/outputs.tf b/databricks-cluster-log-permissions/outputs.tf
@@ -14,6 +14,6 @@ output "rw_logging_role_instance_profile_arn" {
 }
 
 output "dbx_instance_profile_id"{
-  description = "ID of the Databricks instance profile create for writing logs"
+  description = "ID of the Databricks instance profile created for writing logs"
   value       = databricks_instance_profile.cluster_log_cluster.id
 }
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.78.2
+0.80.0