Merge pull request #1127 from jcpunk/puppet-lint

sanfrancrisko · web-flow · commit 6b8cdc6a9844 · 2020-09-21T14:21:32.000+01:00
Resolve puppet-lint warnings
diff --git a/examples/has_interface_with.pp b/examples/has_interface_with.pp
@@ -1,4 +1,4 @@
-include ::stdlib
+include stdlib
 info('has_interface_with(\'lo\'):', has_interface_with('lo'))
 info('has_interface_with(\'loX\'):', has_interface_with('loX'))
 info('has_interface_with(\'ipaddress\', \'127.0.0.1\'):', has_interface_with('ipaddress', '127.0.0.1'))
diff --git a/examples/has_ip_address.pp b/examples/has_ip_address.pp
@@ -1,3 +1,3 @@
-include ::stdlib
+include stdlib
 info('has_ip_address(\'192.168.1.256\'):', has_ip_address('192.168.1.256'))
 info('has_ip_address(\'127.0.0.1\'):', has_ip_address('127.0.0.1'))
diff --git a/examples/has_ip_network.pp b/examples/has_ip_network.pp
@@ -1,3 +1,3 @@
-include ::stdlib
+include stdlib
 info('has_ip_network(\'127.0.0.0\'):', has_ip_network('127.0.0.0'))
 info('has_ip_network(\'128.0.0.0\'):', has_ip_network('128.0.0.0'))
diff --git a/examples/init.pp b/examples/init.pp
@@ -1 +1 @@
-include ::stdlib
+include stdlib
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -8,5 +8,5 @@
 # of stdlib::stages.
 #
 class stdlib {
-  include ::stdlib::stages
+  include stdlib::stages
 }
diff --git a/manifests/stages.pp b/manifests/stages.pp
@@ -22,13 +22,11 @@
 #   }
 #
 class stdlib::stages {
-
   stage { 'setup':  before => Stage['main'] }
   stage { 'runtime': require => Stage['main'] }
   -> stage { 'setup_infra': }
   -> stage { 'deploy_infra': }
   -> stage { 'setup_app': }
   -> stage { 'deploy_app': }
   -> stage { 'deploy': }
-
 }
diff --git a/spec/fixtures/test/manifests/base32.pp b/spec/fixtures/test/manifests/base32.pp
@@ -1,6 +1,6 @@
 # Class to test the Stdlib::Base32 type alias
 class test::base32 (
-    Stdlib::Base32 $value,
-    ) {
+  Stdlib::Base32 $value,
+) {
   notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/base64.pp b/spec/fixtures/test/manifests/base64.pp
@@ -1,6 +1,6 @@
 # Class to test the Stdlib::Base64 type alias
 class test::base64 (
-    Stdlib::Base64 $value,
-    ) {
+  Stdlib::Base64 $value,
+) {
   notice('Success')
 }
diff --git a/spec/fixtures/test/manifests/deftype.pp b/spec/fixtures/test/manifests/deftype.pp
@@ -1,4 +1,4 @@
 # Class to test deftype
-define test::deftype( $param = 'foo' ) {
+define test::deftype ( $param = 'foo' ) {
   notify { "deftype: ${title}": }
 }
diff --git a/spec/fixtures/test/manifests/ensure_resources.pp b/spec/fixtures/test/manifests/ensure_resources.pp
@@ -1,4 +1,4 @@
 # A helper class to test the ensure_resources function
-class test::ensure_resources( $resource_type, $title_hash, $attributes_hash ) {
+class test::ensure_resources ( $resource_type, $title_hash, $attributes_hash ) {
   ensure_resources($resource_type, $title_hash, $attributes_hash)
 }
diff --git a/types/filemode.pp b/types/filemode.pp
@@ -1,2 +1,4 @@
 # See `man chmod.1` for the regular expression for symbolic mode
+# lint:ignore:140chars
 type Stdlib::Filemode = Pattern[/\A(([0-7]{1,4})|(([ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+)(,([ugoa]*([-+=]([rwxXst]*|[ugo]))+|[-+=][0-7]+))*))\z/]
+# lint:endignore
diff --git a/types/ip/address/v4/cidr.pp b/types/ip/address/v4/cidr.pp
@@ -1 +1,3 @@
+# lint:ignore:140chars
 type Stdlib::IP::Address::V4::CIDR = Pattern[/\A([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\/([0-9]|[12][0-9]|3[0-2])\z/]
+# lint:endignore
diff --git a/types/ip/address/v4/nosubnet.pp b/types/ip/address/v4/nosubnet.pp
@@ -1 +1,3 @@
+# lint:ignore:140chars
 type Stdlib::IP::Address::V4::Nosubnet = Pattern[/\A([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/]
+# lint:endignore
diff --git a/types/ip/address/v6/alternative.pp b/types/ip/address/v6/alternative.pp
@@ -1,3 +1,4 @@
+# lint:ignore:140chars
 type Stdlib::IP::Address::V6::Alternative = Pattern[
   /\A([[:xdigit:]]{1,4}:){6}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/,
   /\A([[:xdigit:]]{1,4}:){5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/,
@@ -7,3 +8,4 @@
   /\A([[:xdigit:]]{1,4}:){1}(:[[:xdigit:]]{1,4}){0,4}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/,
   /\A:(:[[:xdigit:]]{1,4}){0,5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}(\/(1([01][0-9]|2[0-8])|[1-9][0-9]|[0-9]))?\z/,
 ]
+# lint:endignore
diff --git a/types/ip/address/v6/cidr.pp b/types/ip/address/v6/cidr.pp
@@ -1,3 +1,3 @@
-
+# lint:ignore:140chars
 type Stdlib::IP::Address::V6::CIDR = Pattern[/\A((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])?\z/]
-
+# lint:endignore
diff --git a/types/ip/address/v6/nosubnet/alternative.pp b/types/ip/address/v6/nosubnet/alternative.pp
@@ -1,3 +1,4 @@
+# lint:ignore:140chars
 type Stdlib::IP::Address::V6::Nosubnet::Alternative = Pattern[
   /\A([[:xdigit:]]{1,4}:){6}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/,
   /\A([[:xdigit:]]{1,4}:){5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/,
@@ -7,3 +8,4 @@
   /\A([[:xdigit:]]{1,4}:){1}(:[[:xdigit:]]{1,4}){0,4}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/,
   /\A:(:[[:xdigit:]]{1,4}){0,5}:([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(\.([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])){3}\z/,
 ]
+# lint:endignore
diff --git a/types/mac.pp b/types/mac.pp
@@ -1,5 +1,5 @@
 # A type for a MAC address
 type Stdlib::MAC = Pattern[
   /\A([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})\z/,
-  /\A([0-9A-Fa-f]{2}[:-]){19}([0-9A-Fa-f]{2})\z/
+  /\A([0-9A-Fa-f]{2}[:-]){19}([0-9A-Fa-f]{2})\z/,
 ]
diff --git a/types/objectstore/gsuri.pp b/types/objectstore/gsuri.pp
@@ -1,2 +1 @@
 type Stdlib::ObjectStore::GSUri = Pattern[/\Ags:\/\/.*\z/]
-
diff --git a/types/syslogfacility.pp b/types/syslogfacility.pp
@@ -22,5 +22,5 @@
   'local4',
   'local5',
   'local6',
-  'local7'
+  'local7',
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include ::stdlib`
	`1`	`+include stdlib`
`2`	`2`	`info('has_interface_with(\'lo\'):', has_interface_with('lo'))`
`3`	`3`	`info('has_interface_with(\'loX\'):', has_interface_with('loX'))`
`4`	`4`	`info('has_interface_with(\'ipaddress\', \'127.0.0.1\'):', has_interface_with('ipaddress', '127.0.0.1'))`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`# of stdlib::stages.`
`9`	`9`	`#`
`10`	`10`	`class stdlib {`
`11`		`- include ::stdlib::stages`
	`11`	`+ include stdlib::stages`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,13 +22,11 @@`
`22`	`22`	`# }`
`23`	`23`	`#`
`24`	`24`	`class stdlib::stages {`
`25`		`-`
`26`	`25`	`stage { 'setup': before => Stage['main'] }`
`27`	`26`	`stage { 'runtime': require => Stage['main'] }`
`28`	`27`	`-> stage { 'setup_infra': }`
`29`	`28`	`-> stage { 'deploy_infra': }`
`30`	`29`	`-> stage { 'setup_app': }`
`31`	`30`	`-> stage { 'deploy_app': }`
`32`	`31`	`-> stage { 'deploy': }`
`33`		`-`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Class to test the Stdlib::Base32 type alias`
`2`	`2`	`class test::base32 (`
`3`		`- Stdlib::Base32 $value,`
`4`		`- ) {`
	`3`	`+ Stdlib::Base32 $value,`
	`4`	`+) {`
`5`	`5`	`notice('Success')`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# Class to test the Stdlib::Base64 type alias`
`2`	`2`	`class test::base64 (`
`3`		`- Stdlib::Base64 $value,`
`4`		`- ) {`
	`3`	`+ Stdlib::Base64 $value,`
	`4`	`+) {`
`5`	`5`	`notice('Success')`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`# Class to test deftype`
`2`		`-define test::deftype( $param = 'foo' ) {`
	`2`	`+define test::deftype ( $param = 'foo' ) {`
`3`	`3`	`notify { "deftype: ${title}": }`
`4`	`4`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`# A helper class to test the ensure_resources function`
`2`		`-class test::ensure_resources( $resource_type, $title_hash, $attributes_hash ) {`
	`2`	`+class test::ensure_resources ( $resource_type, $title_hash, $attributes_hash ) {`
`3`	`3`	`ensure_resources($resource_type, $title_hash, $attributes_hash)`
`4`	`4`	`}`