Merge pull request #472 from traylenator/swapmaxpercent

traylenator · web-flow · commit 3317560313dd · 2024-07-04T09:59:48.000+02:00
Allow `MemorySwapMax` be specified as a percentage
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -2888,7 +2888,7 @@ Struct[{
     Optional['MemoryHigh']                => Systemd::Unit::AmountOrPercent,
     Optional['MemoryMax']                 => Systemd::Unit::AmountOrPercent,
     Optional['MemoryLimit']               => Systemd::Unit::Amount,
-    Optional['MemorySwapMax']             => Systemd::Unit::Amount,
+    Optional['MemorySwapMax']             => Systemd::Unit::AmountOrPercent,
     Optional['TasksAccounting']           => Boolean,
     Optional['TasksMax']                  => Systemd::Unit::AmountOrPercent,
     Optional['IOAccounting']              => Boolean,
diff --git a/spec/type_aliases/systemd_unit_service_spec.rb b/spec/type_aliases/systemd_unit_service_spec.rb
@@ -103,6 +103,8 @@
     )
   }
 
+  it { is_expected.to allow_value({ 'MemorySwapMax' => '80%' }) }
+
   it { is_expected.not_to allow_value({ 'CPUQuota' => 50 }) }
   it { is_expected.not_to allow_value({ 'CPUQuota' => '0%' }) }
   it { is_expected.not_to allow_value({ 'MemoryHigh' => '1Y' }) }
diff --git a/types/unit/service.pp b/types/unit/service.pp
@@ -57,7 +57,7 @@
     Optional['MemoryHigh']                => Systemd::Unit::AmountOrPercent,
     Optional['MemoryMax']                 => Systemd::Unit::AmountOrPercent,
     Optional['MemoryLimit']               => Systemd::Unit::Amount,
-    Optional['MemorySwapMax']             => Systemd::Unit::Amount,
+    Optional['MemorySwapMax']             => Systemd::Unit::AmountOrPercent,
     Optional['TasksAccounting']           => Boolean,
     Optional['TasksMax']                  => Systemd::Unit::AmountOrPercent,
     Optional['IOAccounting']              => Boolean,

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,8 @@`
`103`	`103`	`)`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ it { is_expected.to allow_value({ 'MemorySwapMax' => '80%' }) }`
	`107`	`+`
`106`	`108`	`it { is_expected.not_to allow_value({ 'CPUQuota' => 50 }) }`
`107`	`109`	`it { is_expected.not_to allow_value({ 'CPUQuota' => '0%' }) }`
`108`	`110`	`it { is_expected.not_to allow_value({ 'MemoryHigh' => '1Y' }) }`