Allow EnvironmentFile to be an array

It's valid to set EnvironmentFile multiple times and this reflects that possibility. It also enhances the regex to at least require one character, so that -/ is considered invalid.
voxpupuli · Mar 20, 2023 · 3dde677 · 3dde677
1 parent 727c4be
commit 3dde677
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -2182,7 +2182,7 @@ Struct[{
     Optional['OOMPolicy']                 => Enum['continue', 'stop','kill'],
     Optional['OOMScoreAdjust']            => Integer[-1000,1000],
     Optional['Environment']               => String,
-    Optional['EnvironmentFile']           => Variant[Stdlib::Unixpath,Pattern[/-\/.*/]],
+    Optional['EnvironmentFile']           => Variant[Stdlib::Unixpath,Pattern[/-\/.+/], Array[Stdlib::Unixpath,Pattern[/-\/.+/],1]],
   }]
 ```
 

diff --git a/spec/type_aliases/systemd_unit_service_spec.rb b/spec/type_aliases/systemd_unit_service_spec.rb
@@ -19,5 +19,7 @@
 
   it { is_expected.to allow_value({ 'EnvironmentFile' => '/etc/sysconfig/foo' }) }
   it { is_expected.to allow_value({ 'EnvironmentFile' => '-/etc/sysconfig/foo' }) }
+  it { is_expected.to allow_value({ 'EnvironmentFile' => ['/etc/sysconfig/foo', '-/etc/sysconfig/foo-bar'] }) }
+  it { is_expected.not_to allow_value({ 'EnvironmentFile' => '-/' }) }
   it { is_expected.not_to allow_value({ 'EnvironmentFile' => 'relative-path.sh' }) }
 end
diff --git a/types/unit/service.pp b/types/unit/service.pp
@@ -40,6 +40,6 @@
     Optional['OOMPolicy']                 => Enum['continue', 'stop','kill'],
     Optional['OOMScoreAdjust']            => Integer[-1000,1000],
     Optional['Environment']               => String,
-    Optional['EnvironmentFile']           => Variant[Stdlib::Unixpath,Pattern[/-\/.*/]],
+    Optional['EnvironmentFile']           => Variant[Stdlib::Unixpath,Pattern[/-\/.+/], Array[Stdlib::Unixpath,Pattern[/-\/.+/],1]],
   }
 ]