added parameter(s3_enable_inventory_tables) to enable/disable tables …

…and cronjob (#269) * added parameter(s3_enable_inventory_tables) to enable/disable tables and cronjob * added parameter(s3_enable_inventory_tables) to enable/disable tables and cronjob * added parameter(s3_enable_inventory_tables) to enable/disable tables and cronjob --------- Co-authored-by: Harold Jimenez <[email protected]>
ExpediaGroup · Aug 29, 2024 · 11a5ce8 · 11a5ce8
1 parent 4d6a9e1
commit 11a5ce8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [7.3.3] - 2024-08-28
+### Added
+- Parameter(s3_enable_inventory_tables) to enable/disable s3 inventory tables and cron-job.
+
 ## [7.3.2] - 2024-08-27
 ### Fixed
 - Fixed schema deny exception policy.

diff --git a/k8s-cronjobs.tf b/k8s-cronjobs.tf
@@ -5,7 +5,7 @@
  */
 
 resource "kubernetes_cron_job_v1" "apiary_inventory" {
-  count = (var.s3_enable_inventory && var.hms_instance_type == "k8s") ? 1 : 0
+  count = (var.s3_enable_inventory && var.hms_instance_type == "k8s" && var.s3_enable_inventory_tables) ? 1 : 0
   metadata {
     name      = "${local.instance_alias}-s3-inventory"
     namespace = var.metastore_namespace

diff --git a/variables.tf b/variables.tf
@@ -275,9 +275,9 @@ variable "db_maintenance_window" {
 }
 
 variable "db_copy_tags_to_snapshot" {
-    description = "Copy all Cluster tags to snapshots."
-    type        = bool
-    default     = true
+  description = "Copy all Cluster tags to snapshots."
+  type        = bool
+  default     = true
 }
 
 variable "encrypt_db" {
@@ -451,6 +451,12 @@ variable "s3_enable_inventory" {
   default     = false
 }
 
+variable "s3_enable_inventory_tables" {
+  description = "Enable s3 inventory tables and cronjob"
+  type        = bool
+  default     = true
+}
+
 variable "s3_inventory_format" {
   description = "Output format for S3 inventory results. Can be Parquet, ORC, CSV"
   type        = string
@@ -783,7 +789,7 @@ variable "hms_ro_datanucleus_connection_pool_config" {
 }
 
 variable "hms_rw_datanucleus_connection_pool_config" {
-  description = "A map of env vars supported by Apiary docker image that can configure the chosen Datanucleus connection pool"  
+  description = "A map of env vars supported by Apiary docker image that can configure the chosen Datanucleus connection pool"
   type = map(any)
   default = {}
 }