Bump PDK Version and corresponding Linting

MartyEwings · MartyEwings · commit b7db196c96f1 · 2022-10-07T17:53:18.000+01:00
diff --git a/.devcontainer/README.md b/.devcontainer/README.md
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
 
 	// Set *default* container specific settings.json values on container create.
 	"settings": {
-		"terminal.integrated.shell.linux": "/bin/bash"
+		"terminal.integrated.profiles.linux": {
+			"bash": {
+				"path": "bash",
+			}
+		}
 	},
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"puppet.puppet-vscode",
 		"rebornix.Ruby"
-	]
+	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	"forwardPorts": [],
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -4,7 +4,7 @@ require:
 - rubocop-rspec
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: '2.4'
+  TargetRubyVersion: '2.5'
   Include:
   - "**/*.rb"
   Exclude:
@@ -93,7 +93,7 @@ Style/GuardClause:
 RSpec/EmptyExampleGroup:
   Enabled: false
 Style/CollectionMethods:
-  Enabled: false
+  Enabled: true
 RSpec/MessageSpies:
   EnforcedStyle: receive
 Style/WordArray:
diff --git a/Gemfile b/Gemfile
@@ -24,6 +24,7 @@ group :development do
   gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0',     require: false, platforms: [:ruby]
   gem "puppet-module-win-default-r#{minor_version}", '~> 1.0',   require: false, platforms: [:mswin, :mingw, :x64_mingw]
   gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0',       require: false, platforms: [:mswin, :mingw, :x64_mingw]
+  gem "voxpupuli-puppet-lint-plugins", '>= 3.0',                 require: false
   gem "github_changelog_generator",                              require: false
 end
 group :system_tests do
diff --git a/files/json2timeseriesdb b/files/json2timeseriesdb
@@ -399,20 +399,18 @@ end
 # Process collected JSON files (including '-' to process data from STDIN).
 
 data_files.each do |filename|
-  begin
-    converted_data = if filename == '-'
-                       STDIN.each_line.map { |l| parse_input(JSON.parse(l)) }.flatten.join("\n")
-                     else
-                       parse_file(filename)
-                     end
-    if $options[:host]
-      $net_output.write(converted_data)
-    else
-      STDOUT.puts(converted_data)
-    end
-  rescue => e
-    STDERR.puts "ERROR: #{filename}: #{e.message}"
+  converted_data = if filename == '-'
+                     STDIN.each_line.map { |l| parse_input(JSON.parse(l)) }.flatten.join("\n")
+                   else
+                     parse_file(filename)
+                   end
+  if $options[:host]
+    $net_output.write(converted_data)
+  else
+    STDOUT.puts(converted_data)
   end
+rescue => e
+  STDERR.puts "ERROR: #{filename}: #{e.message}"
 end
 
 $net_output.close if $options[:host]
diff --git a/functions/generate_metrics_server_command.pp b/functions/generate_metrics_server_command.pp
@@ -11,9 +11,9 @@ function puppet_metrics_collector::generate_metrics_server_command (
   Optional[String]                                   $metrics_server_hostname = undef,
   Optional[String]                                   $metrics_server_db_name = undef,
   Optional[Integer]                                  $metrics_server_port = undef,
-  )  >> String  {
+)  >> String {
   if !empty($metrics_server_type) {
-    if empty($metrics_server_db_name) and $metrics_server_type == 'influxdb'  {
+    if empty($metrics_server_db_name) and $metrics_server_type == 'influxdb' {
       fail('When specifying an InfluxDB metrics server, you must specify a metrics server db_name')
     }
 
@@ -26,25 +26,25 @@ function puppet_metrics_collector::generate_metrics_server_command (
 
     $metrics_shipping_command = $metrics_server_type ? {
       'influxdb'   => ['--print |',
-                      "${scripts_dir}/json2timeseriesdb",
-                      "--netcat ${metrics_server_hostname}",
-                      "--convert-to ${metrics_server_type}",
-                      "--influx-db ${metrics_server_db_name}",
-                      $port_command,
-                      '-',
-                      ].filter |$v| { $v != undef }.join(' '), # Filter out undef without stdlib
+        "${scripts_dir}/json2timeseriesdb",
+        "--netcat ${metrics_server_hostname}",
+        "--convert-to ${metrics_server_type}",
+        "--influx-db ${metrics_server_db_name}",
+        $port_command,
+        '-',
+      ].filter |$v| { $v != undef }.join(' '), # Filter out undef without stdlib
       'graphite'   => join(['--print |',
-                      "${scripts_dir}/json2timeseriesdb",
-                      "--netcat ${metrics_server_hostname}",
-                      "--convert-to ${metrics_server_type}",
-                      '-',
-                      ], ' '),
+          "${scripts_dir}/json2timeseriesdb",
+          "--netcat ${metrics_server_hostname}",
+          "--convert-to ${metrics_server_type}",
+          '-',
+      ], ' '),
       'splunk_hec' => join(['--print |',
-                      '/opt/puppetlabs/bin/puppet',
-                      'splunk_hec',
-                      '--sourcetype puppet:metrics',
-                      '--pe_metrics',
-                      ], ' '),
+          '/opt/puppetlabs/bin/puppet',
+          'splunk_hec',
+          '--sourcetype puppet:metrics',
+          '--pe_metrics',
+      ], ' '),
       default      => '',
     }
   } else {
diff --git a/functions/hosts_with_pe_profile.pp b/functions/hosts_with_pe_profile.pp
@@ -18,7 +18,7 @@ function puppet_metrics_collector::hosts_with_pe_profile($profile) {
   # See: https://github.com/puppetlabs/puppet-enterprise-modules/blob/main/docs/pe-modules-next-discussion-outline.txt
   if $settings::storeconfigs {
     $_profile = capitalize($profile)
-    $hosts = puppetdb_query("resources[certname] {
+  $hosts = puppetdb_query("resources[certname] {
                type = 'Class' and
                title = 'Puppet_enterprise::Profile::${_profile}' and
                nodes { deactivated is null and expired is null }
diff --git a/manifests/pe_metric.pp b/manifests/pe_metric.pp
@@ -10,14 +10,13 @@
   Boolean                   $ssl                      = true,
   Array[String]             $excludes                 = puppet_metrics_collector::version_based_excludes($title),
   Array[Hash]               $additional_metrics       = [],
-  Optional[Boolean]         $remote_metrics_enabled   = lookup('puppet_metrics_collector::pe_metric::remote_metrics_enabled', {'default_value' => undef}), # lint:ignore:140chars
+  Optional[Boolean]         $remote_metrics_enabled   = lookup('puppet_metrics_collector::pe_metric::remote_metrics_enabled', { 'default_value' => undef }), # lint:ignore:140chars
   Optional[String]          $override_metrics_command = undef,
   Optional[Enum['influxdb','graphite','splunk_hec']] $metrics_server_type = undef,
   Optional[String]          $metrics_server_hostname  = undef,
   Optional[Integer]         $metrics_server_port      = undef,
   Optional[String]          $metrics_server_db_name   = undef,
 ) {
-
   $metrics_output_dir = "${puppet_metrics_collector::output_dir}/${metrics_type}"
 
   $metrics_output_dir_ensure = $metric_ensure ? {
@@ -66,12 +65,12 @@
   if empty($override_metrics_command) {
     $base_metrics_command = "${metric_script_file_path} --metrics_type ${metrics_type} --output_dir ${metrics_output_dir}"
     $metrics_shipping_command = puppet_metrics_collector::generate_metrics_server_command(
-                                $puppet_metrics_collector::scripts_dir,
-                                $metrics_server_type,
-                                $metrics_server_hostname,
-                                $metrics_server_db_name,
-                                $metrics_server_port
-                              )
+      $puppet_metrics_collector::scripts_dir,
+      $metrics_server_type,
+      $metrics_server_hostname,
+      $metrics_server_db_name,
+      $metrics_server_port
+    )
 
     if !empty($metrics_server_type) {
       $metrics_command = "${base_metrics_command} ${metrics_shipping_command} > /dev/null"
@@ -84,7 +83,7 @@
 
   $tidy_command = "${puppet_metrics_collector::scripts_dir}/metrics_tidy -d ${metrics_output_dir} -r ${retention_days}"
 
-  puppet_metrics_collector::collect {$metrics_type:
+  puppet_metrics_collector::collect { $metrics_type:
     metrics_command => $metrics_command,
     tidy_command    => $tidy_command,
     metric_ensure   => $metric_ensure,
diff --git a/metadata.json b/metadata.json
@@ -56,7 +56,7 @@
       "version_requirement": ">= 6.16.0 < 8.0.0"
     }
   ],
-  "pdk-version": "2.4.0",
-  "template-url": "https://github.com/puppetlabs/pdk-templates#2.4.0",
-  "template-ref": "tags/2.4.0-0-gfa6b6d2"
+  "pdk-version": "2.5.0",
+  "template-url": "https://github.com/puppetlabs/pdk-templates#2.5.0",
+  "template-ref": "tags/2.5.0-0-g369d483"
 }

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@`
`56`	`56`	`"version_requirement": ">= 6.16.0 < 8.0.0"`
`57`	`57`	`}`
`58`	`58`	`],`
`59`		`- "pdk-version": "2.4.0",`
`60`		`- "template-url": "https://github.com/puppetlabs/pdk-templates#2.4.0",`
`61`		`- "template-ref": "tags/2.4.0-0-gfa6b6d2"`
	`59`	`+ "pdk-version": "2.5.0",`
	`60`	`+ "template-url": "https://github.com/puppetlabs/pdk-templates#2.5.0",`
	`61`	`+ "template-ref": "tags/2.5.0-0-g369d483"`
`62`	`62`	`}`