Merge pull request #2397 from igt-marcin-wasilewski/main

strickter loglevel syntax verification
puppetlabs · Sep 20, 2023 · ab45655 · ab45655
2 parents abb8410 + 96932e8
commit ab45655
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/spec/type_aliases/loglevel_spec.rb b/spec/type_aliases/loglevel_spec.rb
@@ -10,6 +10,7 @@
     'warn mod_ssl.c:info',
     'warn ssl_module:info',
     'trace4',
+    'ssl:info',
   ].each do |allowed_value|
     it { is_expected.to allow_value(allowed_value) }
   end
@@ -19,6 +20,8 @@
     '',
     [],
     ['info'],
+    'thisiswarning',
+    'errorerror',
   ].each do |invalid_value|
     it { is_expected.not_to allow_value(invalid_value) }
   end

diff --git a/types/loglevel.pp b/types/loglevel.pp
@@ -24,4 +24,4 @@
 # * `trace8`
 #
 # @see https://httpd.apache.org/docs/current/mod/core.html#loglevel
-type Apache::LogLevel = Pattern[/(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])/]
+type Apache::LogLevel = Pattern[/\A([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8])(\s+([a-z_\.]+:)?(emerg|alert|crit|error|warn|notice|info|debug|trace[1-8]))*\Z/]