Move to inline settings validations

This makes it clearer how the setting is exactly defined. As a bonus, this syntax is compatible with both Ruby 2 and 3.
theforeman · Feb 12, 2024 · 5e64c82 · 5e64c82
1 parent 8cc4e19
commit 5e64c82
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/lib/foreman_discovery/engine.rb b/lib/foreman_discovery/engine.rb
@@ -75,11 +75,10 @@ class Engine < ::Rails::Engine
             setting "discovery_hostname",
               type: :array,
               default: ["discovery_bootif"],
+              validate: { presence: true },
               full_name: N_("Hostname facts"),
               description: N_("List of facts to use for the hostname (first wins)")
 
-            validates "discovery_hostname", presence: true
-
             setting "discovery_auto",
               type: :boolean,
               default: false,
@@ -95,11 +94,10 @@ class Engine < ::Rails::Engine
             setting "discovery_prefix",
               type: :string,
               default: "mac",
+              validate: { presence: true },
               full_name: N_("Hostname prefix"),
               description: N_("The default prefix to use for the host name, must start with a letter")
 
-            validates "discovery_prefix", presence: true
-
             setting "discovery_fact_column",
               type: :array,
               default: [],