From 86bf3f0ec543d10558c51b63c964d2666cf42a38 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 19 Mar 2023 22:42:42 +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: Iabbf0e8e9fc46a982f46b2008d6f4fd50ca9ed90 --- manifests/api.pp | 3 +++ manifests/engine.pp | 3 +++ manifests/event_engine.pp | 3 +++ manifests/executor.pp | 3 +++ manifests/init.pp | 2 ++ 5 files changed, 14 insertions(+) diff --git a/manifests/api.pp b/manifests/api.pp index cda0359..341d0c0 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -76,6 +76,9 @@ class mistral::api ( include mistral::params include mistral::policy + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + if $auth_strategy == 'keystone' { include mistral::keystone::authtoken } diff --git a/manifests/engine.pp b/manifests/engine.pp index 2241897..280ae61 100644 --- a/manifests/engine.pp +++ b/manifests/engine.pp @@ -69,6 +69,9 @@ class mistral::engine ( include mistral::deps include mistral::params + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + package { 'mistral-engine': ensure => $package_ensure, name => $::mistral::params::engine_package_name, diff --git a/manifests/event_engine.pp b/manifests/event_engine.pp index be67af2..91c44ab 100644 --- a/manifests/event_engine.pp +++ b/manifests/event_engine.pp @@ -40,6 +40,9 @@ class mistral::event_engine ( include mistral::deps include mistral::params + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + package { 'mistral-event-engine': ensure => $package_ensure, name => $::mistral::params::event_engine_package_name, diff --git a/manifests/executor.pp b/manifests/executor.pp index 79b1e29..55a45da 100644 --- a/manifests/executor.pp +++ b/manifests/executor.pp @@ -40,6 +40,9 @@ class mistral::executor ( include mistral::deps include mistral::params + validate_legacy(Boolean, 'validate_bool', $manage_service) + validate_legacy(Boolean, 'validate_bool', $enabled) + package { 'mistral-executor': ensure => $package_ensure, name => $::mistral::params::executor_package_name, diff --git a/manifests/init.pp b/manifests/init.pp index 8da8004..47d605f 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -186,6 +186,8 @@ class mistral( include mistral::params include mistral::db + validate_legacy(Boolean, 'validate_bool', $sync_db) + package { 'mistral-common': ensure => $package_ensure, name => $::mistral::params::common_package_name,