From bea839fe5a88a0f37fc4b16d5e55943635e89d8b Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 28 Feb 2023 10:53:43 +0900
Subject: [PATCH] Add strict validation about boolean parameters

This ensures the parameters used by if-else logic accept only boolean
values because non-boolean can result in unexpected behavior.

Change-Id: I73444acddba8818dfcee5d2b2bca52c7e4cf3451
---
 manifests/api.pp       | 5 ++++-
 manifests/evaluator.pp | 3 +++
 manifests/listener.pp  | 3 +++
 manifests/notifier.pp  | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/manifests/api.pp b/manifests/api.pp
index d1f2dc47..e6319ba4 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -66,11 +66,14 @@ class aodh::api (
   $gnocchi_external_domain_name   = 'Default',
 ) inherits aodh::params {
 
-
   include aodh::deps
   include aodh::params
   include aodh::policy
 
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
+  validate_legacy(Boolean, 'validate_bool', $sync_db)
+
   if $auth_strategy == 'keystone' {
     include aodh::keystone::authtoken
   }
diff --git a/manifests/evaluator.pp b/manifests/evaluator.pp
index bb8c26a8..92513244 100644
--- a/manifests/evaluator.pp
+++ b/manifests/evaluator.pp
@@ -43,6 +43,9 @@ class aodh::evaluator (
   include aodh::deps
   include aodh::params
 
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
+
   aodh_config {
     'evaluator/evaluation_interval':    value => $evaluation_interval;
     'DEFAULT/event_alarm_cache_ttl':    value => $event_alarm_cache_ttl;
diff --git a/manifests/listener.pp b/manifests/listener.pp
index 219dbfbe..e02c17ed 100644
--- a/manifests/listener.pp
+++ b/manifests/listener.pp
@@ -43,6 +43,9 @@ class aodh::listener (
   include aodh::deps
   include aodh::params
 
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
+
   aodh_config {
     'listener/workers':           value => $workers;
     'listener/event_alarm_topic': value => $event_alarm_topic;
diff --git a/manifests/notifier.pp b/manifests/notifier.pp
index 2a9a4033..e23da5a2 100644
--- a/manifests/notifier.pp
+++ b/manifests/notifier.pp
@@ -39,6 +39,9 @@ class aodh::notifier (
   include aodh::deps
   include aodh::params
 
+  validate_legacy(Boolean, 'validate_bool', $manage_service)
+  validate_legacy(Boolean, 'validate_bool', $enabled)
+
   aodh_config {
     'notifier/workers':       value => $workers;
     'notifier/batch_size':    value => $batch_size;