Skip to content

Commit b7db196

Browse files
MartyEwingsMartyEwings
committed
Bump PDK Version and corresponding Linting
1 parent 0eb44b3 commit b7db196

File tree

8 files changed

+51
-49
lines changed

8 files changed

+51
-49
lines changed

‎.devcontainer/README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,18 @@ https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/pupp
1313

1414
// Set *default* container specific settings.json values on container create.
1515
"settings": {
16-
"terminal.integrated.shell.linux": "/bin/bash"
16+
"terminal.integrated.profiles.linux": {
17+
"bash": {
18+
"path": "bash",
19+
}
20+
}
1721
},
1822

1923
// Add the IDs of extensions you want installed when the container is created.
2024
"extensions": [
2125
"puppet.puppet-vscode",
2226
"rebornix.Ruby"
23-
]
27+
],
2428

2529
// Use 'forwardPorts' to make a list of ports inside the container available locally.
2630
"forwardPorts": [],

‎.rubocop.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require:
44
- rubocop-rspec
55
AllCops:
66
DisplayCopNames: true
7-
TargetRubyVersion: '2.4'
7+
TargetRubyVersion: '2.5'
88
Include:
99
- "**/*.rb"
1010
Exclude:
@@ -93,7 +93,7 @@ Style/GuardClause:
9393
RSpec/EmptyExampleGroup:
9494
Enabled: false
9595
Style/CollectionMethods:
96-
Enabled: false
96+
Enabled: true
9797
RSpec/MessageSpies:
9898
EnforcedStyle: receive
9999
Style/WordArray:

‎Gemfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ group :development do
2424
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
2525
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2626
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27+
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false
2728
gem "github_changelog_generator", require: false
2829
end
2930
group :system_tests do

‎files/json2timeseriesdb‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -399,20 +399,18 @@ end
399399
# Process collected JSON files (including '-' to process data from STDIN).
400400

401401
data_files.each do |filename|
402-
begin
403-
converted_data = if filename == '-'
404-
STDIN.each_line.map { |l| parse_input(JSON.parse(l)) }.flatten.join("\n")
405-
else
406-
parse_file(filename)
407-
end
408-
if $options[:host]
409-
$net_output.write(converted_data)
410-
else
411-
STDOUT.puts(converted_data)
412-
end
413-
rescue => e
414-
STDERR.puts "ERROR: #{filename}: #{e.message}"
402+
converted_data = if filename == '-'
403+
STDIN.each_line.map { |l| parse_input(JSON.parse(l)) }.flatten.join("\n")
404+
else
405+
parse_file(filename)
406+
end
407+
if $options[:host]
408+
$net_output.write(converted_data)
409+
else
410+
STDOUT.puts(converted_data)
415411
end
412+
rescue => e
413+
STDERR.puts "ERROR: #{filename}: #{e.message}"
416414
end
417415

418416
$net_output.close if $options[:host]

‎functions/generate_metrics_server_command.pp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ function puppet_metrics_collector::generate_metrics_server_command (
1111
Optional[String] $metrics_server_hostname = undef,
1212
Optional[String] $metrics_server_db_name = undef,
1313
Optional[Integer] $metrics_server_port = undef,
14-
) >> String {
14+
) >> String {
1515
if !empty($metrics_server_type) {
16-
if empty($metrics_server_db_name) and $metrics_server_type == 'influxdb' {
16+
if empty($metrics_server_db_name) and $metrics_server_type == 'influxdb' {
1717
fail('When specifying an InfluxDB metrics server, you must specify a metrics server db_name')
1818
}
1919

@@ -26,25 +26,25 @@ function puppet_metrics_collector::generate_metrics_server_command (
2626

2727
$metrics_shipping_command = $metrics_server_type ? {
2828
'influxdb' => ['--print |',
29-
"${scripts_dir}/json2timeseriesdb",
30-
"--netcat ${metrics_server_hostname}",
31-
"--convert-to ${metrics_server_type}",
32-
"--influx-db ${metrics_server_db_name}",
33-
$port_command,
34-
'-',
35-
].filter |$v| { $v != undef }.join(' '), # Filter out undef without stdlib
29+
"${scripts_dir}/json2timeseriesdb",
30+
"--netcat ${metrics_server_hostname}",
31+
"--convert-to ${metrics_server_type}",
32+
"--influx-db ${metrics_server_db_name}",
33+
$port_command,
34+
'-',
35+
].filter |$v| { $v != undef }.join(' '), # Filter out undef without stdlib
3636
'graphite' => join(['--print |',
37-
"${scripts_dir}/json2timeseriesdb",
38-
"--netcat ${metrics_server_hostname}",
39-
"--convert-to ${metrics_server_type}",
40-
'-',
41-
], ' '),
37+
"${scripts_dir}/json2timeseriesdb",
38+
"--netcat ${metrics_server_hostname}",
39+
"--convert-to ${metrics_server_type}",
40+
'-',
41+
], ' '),
4242
'splunk_hec' => join(['--print |',
43-
'/opt/puppetlabs/bin/puppet',
44-
'splunk_hec',
45-
'--sourcetype puppet:metrics',
46-
'--pe_metrics',
47-
], ' '),
43+
'/opt/puppetlabs/bin/puppet',
44+
'splunk_hec',
45+
'--sourcetype puppet:metrics',
46+
'--pe_metrics',
47+
], ' '),
4848
default => '',
4949
}
5050
} else {

‎functions/hosts_with_pe_profile.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ function puppet_metrics_collector::hosts_with_pe_profile($profile) {
1818
# See: https://github.com/puppetlabs/puppet-enterprise-modules/blob/main/docs/pe-modules-next-discussion-outline.txt
1919
if $settings::storeconfigs {
2020
$_profile = capitalize($profile)
21-
$hosts = puppetdb_query("resources[certname] {
21+
$hosts = puppetdb_query("resources[certname] {
2222
type = 'Class' and
2323
title = 'Puppet_enterprise::Profile::${_profile}' and
2424
nodes { deactivated is null and expired is null }

‎manifests/pe_metric.pp‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,13 @@
1010
Boolean $ssl = true,
1111
Array[String] $excludes = puppet_metrics_collector::version_based_excludes($title),
1212
Array[Hash] $additional_metrics = [],
13-
Optional[Boolean] $remote_metrics_enabled = lookup('puppet_metrics_collector::pe_metric::remote_metrics_enabled', {'default_value' => undef}), # lint:ignore:140chars
13+
Optional[Boolean] $remote_metrics_enabled = lookup('puppet_metrics_collector::pe_metric::remote_metrics_enabled', { 'default_value' => undef }), # lint:ignore:140chars
1414
Optional[String] $override_metrics_command = undef,
1515
Optional[Enum['influxdb','graphite','splunk_hec']] $metrics_server_type = undef,
1616
Optional[String] $metrics_server_hostname = undef,
1717
Optional[Integer] $metrics_server_port = undef,
1818
Optional[String] $metrics_server_db_name = undef,
1919
) {
20-
2120
$metrics_output_dir = "${puppet_metrics_collector::output_dir}/${metrics_type}"
2221

2322
$metrics_output_dir_ensure = $metric_ensure ? {
@@ -66,12 +65,12 @@
6665
if empty($override_metrics_command) {
6766
$base_metrics_command = "${metric_script_file_path} --metrics_type ${metrics_type} --output_dir ${metrics_output_dir}"
6867
$metrics_shipping_command = puppet_metrics_collector::generate_metrics_server_command(
69-
$puppet_metrics_collector::scripts_dir,
70-
$metrics_server_type,
71-
$metrics_server_hostname,
72-
$metrics_server_db_name,
73-
$metrics_server_port
74-
)
68+
$puppet_metrics_collector::scripts_dir,
69+
$metrics_server_type,
70+
$metrics_server_hostname,
71+
$metrics_server_db_name,
72+
$metrics_server_port
73+
)
7574

7675
if !empty($metrics_server_type) {
7776
$metrics_command = "${base_metrics_command} ${metrics_shipping_command} > /dev/null"
@@ -84,7 +83,7 @@
8483

8584
$tidy_command = "${puppet_metrics_collector::scripts_dir}/metrics_tidy -d ${metrics_output_dir} -r ${retention_days}"
8685

87-
puppet_metrics_collector::collect {$metrics_type:
86+
puppet_metrics_collector::collect { $metrics_type:
8887
metrics_command => $metrics_command,
8988
tidy_command => $tidy_command,
9089
metric_ensure => $metric_ensure,

‎metadata.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"version_requirement": ">= 6.16.0 < 8.0.0"
5757
}
5858
],
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"
6262
}

0 commit comments

Comments
 (0)