Merge pull request #6 from bastelfreak/validate

repo: parameters: default to undef
voxpupuli · Feb 27, 2024 · 3987294 · 3987294
2 parents b1af660 + 40bdf88
commit 3987294
Showing 1 changed file with 16 additions and 16 deletions.
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -22,11 +22,11 @@
 
 define aptly::repo(
   Array $architectures = [],
-  String $comment       = '',
-  String $component     = '',
-  String $distribution  = '',
-){
-  include ::aptly
+  Optional[String[1]] $comment       = undef,
+  Optional[String[1]] $component     = undef,
+  Optional[String[1]] $distribution  = undef,
+) {
+  include aptly
 
   $aptly_cmd = "${::aptly::aptly_cmd} repo"
 
@@ -37,22 +37,22 @@
     $architectures_arg = "-architectures=\"${architectures_as_s}\""
   }
 
-  if empty($comment) {
+  $comment_arg = if $comment {
+    "-comment=\"${comment}\""
+  } else {
     $comment_arg = ''
-  } else{
-    $comment_arg = "-comment=\"${comment}\""
   }
 
-  if empty($component) {
-    $component_arg = ''
-  } else{
-    $component_arg = "-component=\"${component}\""
+  $component_arg = if $component {
+    "-component=\"${component}\""
+  } else {
+    ''
   }
 
-  if empty($distribution) {
-    $distribution_arg = ''
-  } else{
-    $distribution_arg = "-distribution=\"${distribution}\""
+  $distribution_arg = if $distribution {
+    "-distribution=\"${distribution}\""
+  } else {
+    ''
   }
 
   exec{ "aptly_repo_create-${title}":