strict_indent/unquoted_string_in_case

puppetlabs · Aug 18, 2022 · 6fbb2ef · 6fbb2ef
1 parent f9fbef8
commit 6fbb2ef
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 37 deletions.
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
@@ -4,5 +4,3 @@
 --no-relative_classname_inclusion-check
 --no-parameter_documentation-check
 --no-anchor_resource-check
---no-strict_indent-check
---no-unquoted_string_in_case-check
diff --git a/.sync.yml b/.sync.yml
@@ -38,5 +38,3 @@ Rakefile:
     - relative_classname_inclusion
     - parameter_documentation
     - anchor_resource
-    - strict_indent
-    - unquoted_string_in_case
diff --git a/Rakefile b/Rakefile
@@ -47,8 +47,6 @@ PuppetLint.configuration.send('disable_topscope_variable')
 PuppetLint.configuration.send('disable_relative_classname_inclusion')
 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')
 
 if Bundler.rubygems.find_name('github_changelog_generator').any?
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -212,17 +212,21 @@
       $_item = merge($apt::proxy_defaults, $item)
       $_scheme = $_item['https'] ? {
         true    => 'https',
-        default => 'http' }
+        default => 'http',
+      }
       $_port = $_item['port'] ? {
         Integer => ":${_item['port']}",
         default => ''
       }
       $_target = $_item['direct'] ? {
         true    => 'DIRECT',
-        default => "${_scheme}://${_item['host']}${_port}/" }
+        default => "${_scheme}://${_item['host']}${_port}/",
+      }
       merge($item, {
-        'scheme' => $_scheme,
-        'target' => $_target })
+          'scheme' => $_scheme,
+          'target' => $_target,
+        }
+      )
     }
   } else {
     $_perhost = {}
@@ -260,7 +264,7 @@
       true    => "# Repos managed by puppet.\n",
       default => undef,
     }
-    }
+  }
 
   $preferences_ensure = $_purge['preferences'] ? {
     true    => absent,

diff --git a/manifests/key.pp b/manifests/key.pp
@@ -43,7 +43,7 @@
   Pattern[/\A((hkp|hkps|http|https):\/\/)?([a-z\d])([a-z\d-]{0,61}\.)+[a-z\d]+(:\d{2,5})?(\/[a-zA-Z\d\-_.]+)*\/?$/] $server = $::apt::keyserver,
   Boolean $weak_ssl                                                                                                     = false,
   Optional[String] $options                                                                                             = $::apt::key_options,
-  ) {
+) {
   case $ensure {
     /^(refreshed|present)$/: {
       if defined(Anchor["apt_key ${id} absent"]) {
@@ -82,7 +82,7 @@
       }
     }
 
-    absent: {
+    /absent/: {
       if defined(Anchor["apt_key ${id} present"]) {
         fail("key with id ${id} already ensured as present")
       }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -77,10 +77,10 @@
 
   case $facts['os']['name'] {
     'Debian': {
-          $backports = {
-            'location' => 'http://deb.debian.org/debian',
-            'repos'    => 'main contrib non-free',
-          }
+      $backports = {
+        'location' => 'http://deb.debian.org/debian',
+        'repos'    => 'main contrib non-free',
+      }
       $ppa_options = undef
       $ppa_package = undef
       $auth_conf_owner = '_apt'

diff --git a/manifests/pin.pp b/manifests/pin.pp
@@ -79,7 +79,7 @@
 
   if $packages_string != '*' { # specific form
     if ( $pin_release != '' and ( $origin or $version )) or
-      ( $version and ( $pin_release != '' or $origin )) {
+    ( $version and ( $pin_release != '' or $origin )) {
       fail('parameters release, origin, and version are mutually exclusive')
     }
   } else { # general form

diff --git a/manifests/ppa.pp b/manifests/ppa.pp
@@ -61,7 +61,7 @@
   $sources_list_d_filename  = "${dash_filename_no_specialchars}-${release}.list"
 
   if versioncmp($facts['os']['release']['full'], '15.10') >= 0 and
-    versioncmp($facts['os']['release']['full'], '21.04') < 0 {
+  versioncmp($facts['os']['release']['full'], '21.04') < 0 {
     $trusted_gpg_d_filename = "${underscore_filename_no_specialchars}.gpg"
   } else {
     $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"
@@ -91,10 +91,11 @@
 
     unless $sources_list_d_filename in $facts['apt_sources'] {
       $script_content = epp('apt/add-apt-repository.sh.epp', {
-        command                 => ['/usr/bin/add-apt-repository', shell_join($options), $name],
-        sources_list_d_path     => $::apt::sources_list_d,
-        sources_list_d_filename => $sources_list_d_filename,
-      })
+          command                 => ['/usr/bin/add-apt-repository', shell_join($options), $name],
+          sources_list_d_path     => $::apt::sources_list_d,
+          sources_list_d_filename => $sources_list_d_filename,
+        }
+      )
 
       file { "add-apt-repository-script-${name}":
         ensure  => 'file',

diff --git a/manifests/source.pp b/manifests/source.pp
@@ -140,20 +140,21 @@
   }
 
   $sourcelist = epp('apt/source.list.epp', {
-    'comment'          => $comment,
-    'includes'         => $includes,
-    'options'          => delete_undef_values( {
-        'arch'              => $architecture,
-        'trusted'           => $allow_unsigned ? { true => 'yes', false => undef },
-        'allow-insecure'    => $allow_insecure ? { true => 'yes', false => undef },
-        'signed-by'         => $keyring,
-        'check-valid-until' => $check_valid_until? { true => undef, false => 'false' },
-      },
-    ),
-    'location'         => $_location,
-    'release'          => $_release,
-    'repos'            => $repos,
-  })
+      'comment'          => $comment,
+      'includes'         => $includes,
+      'options'          => delete_undef_values( {
+          'arch'              => $architecture,
+          'trusted'           => $allow_unsigned ? { true => 'yes', false => undef },
+          'allow-insecure'    => $allow_insecure ? { true => 'yes', false => undef },
+          'signed-by'         => $keyring,
+          'check-valid-until' => $check_valid_until? { true => undef, false => 'false' },
+        },
+      ),
+      'location'         => $_location,
+      'release'          => $_release,
+      'repos'            => $repos,
+    }
+  )
 
   apt::setting { "list-${name}":
     ensure        => $ensure,