optional_default

.puppet-lint.rc

@@ -6,4 +6,3 @@
 --no-anchor_resource-check
 --no-strict_indent-check
 --no-unquoted_string_in_case-check
---no-optional_default-check

.sync.yml

@@ -40,4 +40,3 @@ Rakefile:
     - anchor_resource
     - strict_indent
     - unquoted_string_in_case
-    - optional_default

Rakefile

@@ -49,8 +49,6 @@ PuppetLint.configuration.send('disable_parameter_documentation')
 PuppetLint.configuration.send('disable_anchor_resource')
 PuppetLint.configuration.send('disable_strict_indent')
 PuppetLint.configuration.send('disable_unquoted_string_in_case')
-PuppetLint.configuration.send('disable_optional_default')
-
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|

manifests/pin.pp

@@ -34,19 +34,19 @@
 #   Names the label of the packages in the directory tree of the Release file.
 #
 define apt::pin (
-  Enum['file', 'present', 'absent'] $ensure           = present,
-  Optional[String] $explanation                       = undef,
-  Variant[Integer] $order                             = 50,
-  Variant[String, Array] $packages                    = '*',
-  Variant[Numeric, String] $priority                  = 0,
-  Optional[String] $release                           = '', # a=
-  Optional[String] $origin                            = '',
-  Optional[String] $version                           = '',
-  Optional[String] $codename                          = '', # n=
-  Optional[String] $release_version                   = '', # v=
-  Optional[String] $component                         = '', # c=
-  Optional[String] $originator                        = '', # o=
-  Optional[String] $label                             = '',  # l=
+  Enum['file', 'present', 'absent'] $ensure = present,
+  Optional[String] $explanation             = undef,
+  Variant[Integer] $order                   = 50,
+  Variant[String, Array] $packages          = '*',
+  Variant[Numeric, String] $priority        = 0,
+  Optional[String] $release                 = undef, # a=
+  Optional[String] $origin                  = undef,
+  Optional[String] $version                 = undef,
+  Optional[String] $codename                = undef, # n=
+  Optional[String] $release_version         = undef, # v=
+  Optional[String] $component               = undef, # c=
+  Optional[String] $originator              = undef, # o=
+  Optional[String] $label                   = undef,  # l=
 ) {
   if $explanation {
     $_explanation = $explanation
@@ -58,15 +58,13 @@
     }
   }
 
-  $pin_release_array = [
-    $release,
-    $codename,
-    $release_version,
-    $component,
-    $originator,
-    $label,
-  ]
-  $pin_release = join($pin_release_array, '')
+  $pin_release = ''
+  $pin_release_array = [$release, $codename, $release_version, $component, $originator, $label]
+  $pin_release_array.each |$value| {
+    if $value {
+      $pin_release = join([$pin_release, $value], '')
+    }
+  }
 
   # Read the manpage 'apt_preferences(5)', especially the chapter
   # 'The Effect of APT Preferences' to understand the following logic
@@ -78,15 +76,15 @@
   }
 
   if $packages_string != '*' { # specific form
-    if ( $pin_release != '' and ( $origin != '' or $version != '' )) or
-      ( $version != '' and ( $pin_release != '' or $origin != '' )) {
+    if ( $pin_release != '' and ( $origin or $version )) or
+      ( $version and ( $pin_release != '' or $origin )) {
       fail('parameters release, origin, and version are mutually exclusive')
     }
   } else { # general form
-    if $version != '' {
+    if $version {
       fail('parameter version cannot be used in general form')
     }
-    if ( $pin_release != '' and $origin != '' ) {
+    if ( $pin_release != '' and $origin ) {
       fail('parameters release and origin are mutually exclusive')
     }
   }