From 5c0e3c494f5580ec183b377112d60c754e47308a Mon Sep 17 00:00:00 2001 From: jgreenstevens Date: Tue, 17 Dec 2024 13:30:18 +0000 Subject: [PATCH 1/2] Add new properties to scheduler config --- CHANGELOG.md | 4 ++++ config-templates.tf | 2 ++ files/beekeeper-scheduler-apiary-config.json | 4 +++- variables.tf | 6 ++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9331e5d..2b9c1ea 100644 --- 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). +## [TBD] +### Added +- Added `dry-run-enabled` and `metastore-uri` properties to `beekeeper-scheduler-apiary-config.json`. + ## [5.2.0] - 2024-11-25 ### Added - Added new variable `beekeeper_db_external_hostname` to support external DB host. diff --git a/config-templates.tf b/config-templates.tf index 3c093ea..a1d3df1 100644 --- a/config-templates.tf +++ b/config-templates.tf @@ -23,6 +23,8 @@ data "template_file" "beekeeper_scheduler_apiary_config" { db_name = var.beekeeper_db_name db_username = var.db_username queue = aws_sqs_queue.beekeeper.id + dry_run_enabled = var.scheduler_dry_run_enabled + metastore_uri = var.metastore_uri graphite_config = var.graphite_enabled == "false" ? "" : data.template_file.beekeeper_graphite_config.rendered } } diff --git a/files/beekeeper-scheduler-apiary-config.json b/files/beekeeper-scheduler-apiary-config.json index 3e4be24..321133f 100644 --- a/files/beekeeper-scheduler-apiary-config.json +++ b/files/beekeeper-scheduler-apiary-config.json @@ -4,6 +4,8 @@ "username": "${db_username}" }, "properties": { - "apiary.queue-url": "${queue}" + "apiary.queue-url": "${queue}", + "dry-run-enabled": "${dry_run_enabled}", + "metastore-uri": "${metastore_uri}" }${graphite_config} } diff --git a/variables.tf b/variables.tf index fbba54a..7b15ece 100644 --- a/variables.tf +++ b/variables.tf @@ -282,6 +282,12 @@ variable "metadata_cleanup_dry_run_enabled" { type = string } +variable "scheduler_dry_run_enabled" { + description = "Enable Metadata Cleanup to perform dry runs of deletions only." + default = "false" + type = string +} + # Monitoring variable "graphite_enabled" { From fe558e10d3fbbda3d2579c4d510c6945a9155ce0 Mon Sep 17 00:00:00 2001 From: jgreenstevens Date: Fri, 20 Dec 2024 17:46:33 +0000 Subject: [PATCH 2/2] Cleanup --- CHANGELOG.md | 2 +- config-templates.tf | 1 - files/beekeeper-scheduler-apiary-config.json | 1 - variables.tf | 6 ------ 4 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2b9c1ea..7419d86 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [TBD] ### Added -- Added `dry-run-enabled` and `metastore-uri` properties to `beekeeper-scheduler-apiary-config.json`. +- Added `metastore-uri` properties to `beekeeper-scheduler-apiary-config.json`. ## [5.2.0] - 2024-11-25 ### Added diff --git a/config-templates.tf b/config-templates.tf index a1d3df1..4555183 100644 --- a/config-templates.tf +++ b/config-templates.tf @@ -23,7 +23,6 @@ data "template_file" "beekeeper_scheduler_apiary_config" { db_name = var.beekeeper_db_name db_username = var.db_username queue = aws_sqs_queue.beekeeper.id - dry_run_enabled = var.scheduler_dry_run_enabled metastore_uri = var.metastore_uri graphite_config = var.graphite_enabled == "false" ? "" : data.template_file.beekeeper_graphite_config.rendered } diff --git a/files/beekeeper-scheduler-apiary-config.json b/files/beekeeper-scheduler-apiary-config.json index 321133f..a9d303c 100644 --- a/files/beekeeper-scheduler-apiary-config.json +++ b/files/beekeeper-scheduler-apiary-config.json @@ -5,7 +5,6 @@ }, "properties": { "apiary.queue-url": "${queue}", - "dry-run-enabled": "${dry_run_enabled}", "metastore-uri": "${metastore_uri}" }${graphite_config} } diff --git a/variables.tf b/variables.tf index 7b15ece..fbba54a 100644 --- a/variables.tf +++ b/variables.tf @@ -282,12 +282,6 @@ variable "metadata_cleanup_dry_run_enabled" { type = string } -variable "scheduler_dry_run_enabled" { - description = "Enable Metadata Cleanup to perform dry runs of deletions only." - default = "false" - type = string -} - # Monitoring variable "graphite_enabled" {