(GH-cat-9) syntax:hiera:yaml fixes

david22swan · david22swan · commit 31f886c35854 · 2022-04-26T16:25:00.000+01:00
diff --git a/manifests/config/context.pp b/manifests/config/context.pp
@@ -27,7 +27,6 @@
       incl      => "${_catalina_base}/conf/context.xml",
       changes   => $changes,
       show_diff => $show_diff,
-
     }
   }
 }
diff --git a/manifests/config/context/environment.pp b/manifests/config/context/environment.pp
@@ -82,13 +82,13 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $set_name,
-      $set_type,
-      $set_value,
-      $set_override,
-      $set_description,
-      $set_additional_attributes,
-      $rm_attributes_to_remove,
+          $set_name,
+          $set_type,
+          $set_value,
+          $set_override,
+          $set_description,
+          $set_additional_attributes,
+          $rm_attributes_to_remove,
     ]))
   }
 
diff --git a/manifests/config/context/manager.pp b/manifests/config/context/manager.pp
@@ -43,7 +43,7 @@
     if ! empty($additional_attributes) {
       $set_additional_attributes =
         suffix(prefix(join_keys_to_values($additional_attributes, " '"),
-          "set ${base_path}/#attribute/"), "'")
+      "set ${base_path}/#attribute/"), "'")
     } else {
       $set_additional_attributes = undef
     }
@@ -55,9 +55,9 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $set_name,
-      $set_additional_attributes,
-      $rm_attributes_to_remove,
+          $set_name,
+          $set_additional_attributes,
+          $rm_attributes_to_remove,
     ]))
   }
 
diff --git a/manifests/config/context/parameter.pp b/manifests/config/context/parameter.pp
@@ -32,7 +32,6 @@
     $changes = "rm ${base_path}"
   }
   else {
-
     if empty($value) {
       fail('$value must be specified')
     }
@@ -54,10 +53,10 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $set_name,
-      $set_value,
-      $set_override,
-      $set_description,
+          $set_name,
+          $set_value,
+          $set_override,
+          $set_description,
     ]))
   }
 
diff --git a/manifests/config/context/resource.pp b/manifests/config/context/resource.pp
@@ -60,12 +60,11 @@
       $rm_attributes_to_remove = undef
     }
 
-
     $changes = delete_undef_values(flatten([
-      $set_name,
-      $set_type,
-      $set_additional_attributes,
-      $rm_attributes_to_remove,
+          $set_name,
+          $set_type,
+          $set_additional_attributes,
+          $rm_attributes_to_remove,
     ]))
   }
 
diff --git a/manifests/config/context/resourcelink.pp b/manifests/config/context/resourcelink.pp
@@ -54,10 +54,10 @@
     }
 
     $augeaschanges = delete_undef_values(flatten([
-      $set_name,
-      $set_type,
-      $set_additional_attributes,
-      $rm_attributes_to_remove,
+          $set_name,
+          $set_type,
+          $set_additional_attributes,
+          $rm_attributes_to_remove,
     ]))
   }
 
diff --git a/manifests/config/context/valve.pp b/manifests/config/context/valve.pp
@@ -82,9 +82,9 @@
   }
 
   if $_name !~ Undef {
-    $attributes = {'className' => $_class_name, 'name' => $_name} + $additional_attributes
+    $attributes = { 'className' => $_class_name, 'name' => $_name } + $additional_attributes
   } else {
-    $attributes = {'className' => $_class_name} + $additional_attributes
+    $attributes = { 'className' => $_class_name } + $additional_attributes
   }
 
   $augeas_filter = $_uniqueness_attributes.map |$attr| {
@@ -109,9 +109,9 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $defnode_valve,
-      $set_attributes,
-      $rm_attributes,
+          $defnode_valve,
+          $set_attributes,
+          $rm_attributes,
     ]))
   }
 
diff --git a/manifests/config/server/connector.pp b/manifests/config/server/connector.pp
@@ -92,11 +92,11 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $__purge_connectors,
-      $_port,
-      $_protocol_change,
-      $_additional_attributes,
-      $_attributes_to_remove,
+          $__purge_connectors,
+          $_port,
+          $_protocol_change,
+          $_additional_attributes,
+          $_attributes_to_remove,
     ]))
   }
 
diff --git a/manifests/config/server/engine.pp b/manifests/config/server/engine.pp
@@ -103,12 +103,12 @@
   }
 
   $changes = delete_undef_values([
-    $_name_change,
-    $_default_host,
-    $_background_processor_delay,
-    $_class_name,
-    $_jvm_route,
-    $_start_stop_threads,
+      $_name_change,
+      $_default_host,
+      $_background_processor_delay,
+      $_class_name,
+      $_jvm_route,
+      $_start_stop_threads,
   ])
 
   augeas { "${_catalina_base}-${parent_service}-engine":
diff --git a/manifests/config/server/globalnamingresource.pp b/manifests/config/server/globalnamingresource.pp
@@ -64,8 +64,8 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $set_additional_attributes,
-      $rm_attributes_to_remove,
+          $set_additional_attributes,
+          $rm_attributes_to_remove,
     ]))
 
     # (MODULES-3353) This should use $set_name in $changes like
diff --git a/manifests/config/server/host.pp b/manifests/config/server/host.pp
@@ -86,12 +86,13 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $_host_name_change,
-      $_app_base,
-      $_additional_attributes,
-      $_attributes_to_remove,
-      $_clear_aliases,
-      $_add_aliases]))
+          $_host_name_change,
+          $_app_base,
+          $_additional_attributes,
+          $_attributes_to_remove,
+          $_clear_aliases,
+          $_add_aliases,
+    ]))
   }
 
   augeas { "${_catalina_base}-${parent_service}-host-${name}":
diff --git a/manifests/config/server/realm.pp b/manifests/config/server/realm.pp
@@ -99,14 +99,13 @@
   if $realm_ensure == 'absent' {
     $changes = "rm ${path}[${path_expression}]"
   } else {
-
     # This will create the node if there are no matches
     $_class_name = "set ${path}[${path_expression}]/#attribute/className '${class_name}'"
     $puppet_name = "set ${path}[${path_expression}]/#attribute/puppetName '${name}'"
 
     if ! empty($additional_attributes) {
       $_additional_attributes = suffix(prefix(join_keys_to_values($additional_attributes, " '"),
-                                              "set ${path}[${path_expression}]/#attribute/"), "'")
+      "set ${path}[${path_expression}]/#attribute/"), "'")
     } else {
       $_additional_attributes = undef
     }
@@ -117,11 +116,12 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $__purge_realms,
-      $puppet_name,
-      $_class_name,
-      $_additional_attributes,
-      $_attributes_to_remove ]))
+          $__purge_realms,
+          $puppet_name,
+          $_class_name,
+          $_additional_attributes,
+          $_attributes_to_remove,
+    ]))
   }
 
   augeas { "${_catalina_base}-${parent_service}-${parent_engine}-${parent_host}-${parent_realm}-realm-${name}":
@@ -130,5 +130,4 @@
     changes   => $changes,
     show_diff => $show_diff,
   }
-
 }
diff --git a/manifests/config/server/resources.pp b/manifests/config/server/resources.pp
@@ -85,7 +85,7 @@
   } else {
     $_container = [
       "set ${parent} ''",
-      "set ${path} #empty"
+      "set ${path} #empty",
     ]
 
     if ! empty($additional_attributes) {
diff --git a/manifests/config/server/tomcat_users.pp b/manifests/config/server/tomcat_users.pp
@@ -36,7 +36,6 @@
   Array $roles                     = [],
   Boolean $show_diff               = true,
 ) {
-
   if versioncmp($::augeasversion, '1.0.0') < 0 {
     fail('Server configurations require Augeas >= 1.0.0')
   }
@@ -69,13 +68,13 @@
 
   if $manage_file {
     ensure_resource('file', $_file, {
-      ensure  => file,
-      path    => $_file,
-      replace => false,
-      content => '<?xml version=\'1.0\' encoding=\'utf-8\'?><tomcat-users></tomcat-users>',
-      owner   => $_owner,
-      group   => $_group,
-      mode    => '0640',
+        ensure  => file,
+        path    => $_file,
+        replace => false,
+        content => '<?xml version=\'1.0\' encoding=\'utf-8\'?><tomcat-users></tomcat-users>',
+        owner   => $_owner,
+        group   => $_group,
+        mode    => '0640',
     })
     File[$_file] -> Augeas["${catalina_base}-tomcat_users-${element}-${_element_name}-${name}"]
   }
@@ -107,5 +106,4 @@
     changes   => $changes,
     show_diff => $show_diff,
   }
-
 }
diff --git a/manifests/config/server/valve.pp b/manifests/config/server/valve.pp
@@ -60,7 +60,7 @@
     $_uniqueness_attributes = $uniqueness_attributes
   }
 
-  $attributes = {'className' => $_class_name} + $additional_attributes
+  $attributes = { 'className' => $_class_name } + $additional_attributes
 
   $augeas_filter = $_uniqueness_attributes.map |$attr| {
     "[#attribute/${attr}='${attributes[$attr]}']"
@@ -100,9 +100,9 @@
     }
 
     $changes = delete_undef_values(flatten([
-      $defnode_valve,
-      $set_attributes,
-      $rm_attributes,
+          $defnode_valve,
+          $set_attributes,
+          $rm_attributes,
     ]))
   }
 
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -33,11 +33,12 @@
   Boolean $manage_base       = true,
   Boolean $manage_properties = true,
 ) {
-
   case $::osfamily {
     'windows','Solaris','Darwin': {
       fail("Unsupported osfamily: ${::osfamily}")
     }
-    default: { }
+    default: {
+      # Empty
+    }
   }
 }
diff --git a/manifests/install.pp b/manifests/install.pp
@@ -50,7 +50,6 @@
   $manage_home                    = undef,
   Optional[Array[String]] $remove_default_webapps     = undef,
 
-
   # package options
   $package_ensure                 = undef,
   $package_name                   = undef,
@@ -67,13 +66,13 @@
   if $install_from_source {
     if $_manage_user {
       ensure_resource('user', $_user, {
-        ensure => present,
-        gid    => $_group,
+          ensure => present,
+          gid    => $_group,
       })
     }
     if $_manage_group {
       ensure_resource('group', $_group, {
-        ensure => present,
+          ensure => present,
       })
     }
     tomcat::install::source { $name:
@@ -96,7 +95,7 @@
 
   if $remove_default_webapps {
     $remove_default_webapps.each |$folder| {
-      file{"remove ${folder}" :
+      file { "remove ${folder}" :
         ensure  => absent,
         path    => "${catalina_home}/webapps/${folder}",
         recurse => true,
@@ -105,7 +104,7 @@
         require => $install_from_source ? {
           true    => Resource['tomcat::install::source', $name],
           default => Resource['tomcat::install::package', $package_name]
-        }
+        },
       }
     }
   }
diff --git a/manifests/instance.pp b/manifests/instance.pp
@@ -122,9 +122,9 @@
     # it must exist. tomcat::install::source will take care of creating base.
     if $_catalina_base != $_catalina_home and $_manage_base {
       ensure_resource('file',$_catalina_home, {
-        ensure => directory,
-        owner  => $_user,
-        group  => $_group,
+          ensure => directory,
+          owner  => $_user,
+          group  => $_group,
       })
     }
     # XXX This is for backwards compatibility. Declare a tomcat install, but install
@@ -148,13 +148,13 @@
     if $_catalina_home != $_catalina_base {
       if $_manage_user {
         ensure_resource('user', $_user, {
-          ensure => present,
-          gid    => $_group,
+            ensure => present,
+            gid    => $_group,
         })
       }
       if $_manage_group {
         ensure_resource('group', $_group, {
-          ensure => present,
+            ensure => present,
         })
       }
 
diff --git a/manifests/war.pp b/manifests/war.pp

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`incl => "${_catalina_base}/conf/context.xml",`
`28`	`28`	`changes => $changes,`
`29`	`29`	`show_diff => $show_diff,`
`30`		`-`
`31`	`30`	`}`
`32`	`31`	`}`
`33`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@`
`43`	`43`	`if ! empty($additional_attributes) {`
`44`	`44`	`$set_additional_attributes =`
`45`	`45`	`suffix(prefix(join_keys_to_values($additional_attributes, " '"),`
`46`		`- "set ${base_path}/#attribute/"), "'")`
	`46`	`+ "set ${base_path}/#attribute/"), "'")`
`47`	`47`	`} else {`
`48`	`48`	`$set_additional_attributes = undef`
`49`	`49`	`}`
`@@ -55,9 +55,9 @@`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`$changes = delete_undef_values(flatten([`
`58`		`- $set_name,`
`59`		`- $set_additional_attributes,`
`60`		`- $rm_attributes_to_remove,`
	`58`	`+ $set_name,`
	`59`	`+ $set_additional_attributes,`
	`60`	`+ $rm_attributes_to_remove,`
`61`	`61`	`]))`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@`
`32`	`32`	`$changes = "rm ${base_path}"`
`33`	`33`	`}`
`34`	`34`	`else {`
`35`		`-`
`36`	`35`	`if empty($value) {`
`37`	`36`	`fail('$value must be specified')`
`38`	`37`	`}`
`@@ -54,10 +53,10 @@`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`$changes = delete_undef_values(flatten([`
`57`		`- $set_name,`
`58`		`- $set_value,`
`59`		`- $set_override,`
`60`		`- $set_description,`
	`56`	`+ $set_name,`
	`57`	`+ $set_value,`
	`58`	`+ $set_override,`
	`59`	`+ $set_description,`
`61`	`60`	`]))`
`62`	`61`	`}`
`63`	`62`
Original file line number	Diff line number	Diff line change
`@@ -54,10 +54,10 @@`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`$augeaschanges = delete_undef_values(flatten([`
`57`		`- $set_name,`
`58`		`- $set_type,`
`59`		`- $set_additional_attributes,`
`60`		`- $rm_attributes_to_remove,`
	`57`	`+ $set_name,`
	`58`	`+ $set_type,`
	`59`	`+ $set_additional_attributes,`
	`60`	`+ $rm_attributes_to_remove,`
`61`	`61`	`]))`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,9 @@`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`if $_name !~ Undef {`
`85`		`- $attributes = {'className' => $_class_name, 'name' => $_name} + $additional_attributes`
	`85`	`+ $attributes = { 'className' => $_class_name, 'name' => $_name } + $additional_attributes`
`86`	`86`	`} else {`
`87`		`- $attributes = {'className' => $_class_name} + $additional_attributes`
	`87`	`+ $attributes = { 'className' => $_class_name } + $additional_attributes`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`$augeas_filter = $_uniqueness_attributes.map \|$attr\| {`
`@@ -109,9 +109,9 @@`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`$changes = delete_undef_values(flatten([`
`112`		`- $defnode_valve,`
`113`		`- $set_attributes,`
`114`		`- $rm_attributes,`
	`112`	`+ $defnode_valve,`
	`113`	`+ $set_attributes,`
	`114`	`+ $rm_attributes,`
`115`	`115`	`]))`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`$changes = delete_undef_values(flatten([`
`67`		`- $set_additional_attributes,`
`68`		`- $rm_attributes_to_remove,`
	`67`	`+ $set_additional_attributes,`
	`68`	`+ $rm_attributes_to_remove,`
`69`	`69`	`]))`
`70`	`70`
`71`	`71`	`# (MODULES-3353) This should use $set_name in $changes like`