Skip to content

Commit 8ac286a

Browse files
teintuctruthbk
teintuc
authored and
truthbk
committed
Fix puppet stdlib 4.24.0 deprecation (#403)
* Refactore validate string * Refactor validate array * Refactor validate bool * Fix bad data types for Boolean values * Refactor validate integer * Refactor validate re * Refactor validate_array * Fix validate_re type lookup * Refactor hiera_* functions to lookup * Refactor is_array functions * Fix missing variable * Attempt to fix the datadtype in tag6 * Refactor the tag functino
1 parent 397b135 commit 8ac286a

4 files changed

Lines changed: 75 additions & 73 deletions

File tree

‎functions/tag6.pp‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ function datadog_agent::tag6(
66
Variant[Array, String] $tag_names,
77
Variant[String, Boolean] $lookup_fact = false,
88
) {
9-
if is_array($tag_names) {
9+
if validate_legacy('Optional[Array]', 'is_array', $tag_names) {
1010
$tags = $tag_names.reduce([]) |$_tags , $tag| {
1111
concat($_tags, datadog_agent::tag6($tag, lookup_fact))
1212
}
1313
} elsif str2bool($lookup_fact) {
1414
$value = getvar($tag_names)
1515

16-
if is_array($value){
17-
$tags = prefix($value, "${tag_name}:")
16+
if validate_legacy('Optional[Array]', 'is_array', $value){
17+
$tags = prefix($value, "${tag_names}:")
18+
} else {
19+
$tags = [$tag_names]
1820
}
1921
} else {
20-
$tags = [$tag_name]
22+
$tags = [$tag_names]
2123
}
2224

2325
$tags

‎manifests/init.pp‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -279,80 +279,80 @@
279279
$_syslog_port = "${syslog_port}"
280280
# lint:endignore
281281

282-
validate_string($dd_url)
283-
validate_string($host)
284-
validate_string($api_key)
285-
validate_array($tags)
286-
validate_bool($hiera_tags)
287-
validate_array($dogstreams)
288-
validate_array($facts_to_tags)
289-
validate_bool($puppet_run_reports)
290-
validate_string($puppetmaster_user)
291-
validate_bool($non_local_traffic)
292-
validate_bool($log_to_syslog)
293-
validate_bool($manage_repo)
294-
validate_string($log_level)
295-
validate_re($_dogstatsd_port, '^\d*$')
296-
validate_string($statsd_histogram_percentiles)
297-
validate_re($_statsd_forward_port, '^\d*$')
298-
validate_string($proxy_host)
299-
validate_re($_proxy_port, '^\d*$')
300-
validate_string($proxy_user)
301-
validate_string($proxy_password)
302-
validate_re($_graphite_listen_port, '^\d*$')
303-
validate_string($extra_template)
304-
validate_string($ganglia_host)
305-
validate_integer($ganglia_port)
306-
validate_bool($skip_ssl_validation)
307-
validate_bool($skip_apt_key_trusting)
308-
validate_bool($use_curl_http_client)
309-
validate_bool($collect_ec2_tags)
310-
validate_bool($collect_instance_metadata)
311-
validate_string($recent_point_threshold)
312-
validate_re($_listen_port, '^\d*$')
313-
validate_string($additional_checksd)
314-
validate_string($bind_host)
315-
validate_bool($use_pup)
316-
validate_re($_pup_port, '^\d*$')
317-
validate_string($pup_interface)
318-
validate_string($pup_url)
319-
validate_bool($use_dogstatsd)
320-
validate_string($dogstatsd_target)
321-
validate_string($dogstatsd_interval)
322-
validate_bool($dogstatsd_normalize)
323-
validate_string($statsd_forward_host)
324-
validate_string($device_blacklist_re)
325-
validate_string($custom_emitters)
326-
validate_string($agent6_log_file)
327-
validate_string($collector_log_file)
328-
validate_string($forwarder_log_file)
329-
validate_string($dogstatsd_log_file)
330-
validate_string($pup_log_file)
331-
validate_string($syslog_host)
332-
validate_re($_syslog_port, '^\d*$')
333-
validate_string($service_discovery_backend)
334-
validate_string($sd_config_backend)
335-
validate_string($sd_backend_host)
336-
validate_integer($sd_backend_port)
337-
validate_string($sd_template_dir)
338-
validate_bool($sd_jmx_enable)
339-
validate_string($consul_token)
340-
validate_bool($apm_enabled)
341-
validate_bool($agent5_enable)
342-
validate_string($apm_env)
343-
validate_bool($process_enabled)
344-
validate_string($agent5_repo_uri)
345-
validate_string($agent6_repo_uri)
346-
validate_string($apt_release)
282+
validate_legacy(String, 'validate_string', $dd_url)
283+
validate_legacy(String, 'validate_string', $host)
284+
validate_legacy(String, 'validate_string', $api_key)
285+
validate_legacy(Array, 'validate_array', $tags)
286+
validate_legacy(Boolean, 'validate_bool', $hiera_tags)
287+
validate_legacy(Array, 'validate_array', $dogstreams)
288+
validate_legacy(Array, 'validate_array', $facts_to_tags)
289+
validate_legacy(Boolean, 'validate_bool', $puppet_run_reports)
290+
validate_legacy(String, 'validate_string', $puppetmaster_user)
291+
validate_legacy(Boolean, 'validate_bool', $non_local_traffic)
292+
validate_legacy(Boolean, 'validate_bool', $log_to_syslog)
293+
validate_legacy(Boolean, 'validate_bool', $manage_repo)
294+
validate_legacy(String, 'validate_string', $log_level)
295+
validate_legacy(String, 'validate_re', $_dogstatsd_port, '^\d*$')
296+
validate_legacy(String, 'validate_string', $statsd_histogram_percentiles)
297+
validate_legacy(String, 'validate_re', $_statsd_forward_port, '^\d*$')
298+
validate_legacy(String, 'validate_string', $proxy_host)
299+
validate_legacy(String, 'validate_re', $_proxy_port, '^\d*$')
300+
validate_legacy(String, 'validate_string', $proxy_user)
301+
validate_legacy(String, 'validate_string', $proxy_password)
302+
validate_legacy(String, 'validate_re', $_graphite_listen_port, '^\d*$')
303+
validate_legacy(String, 'validate_string', $extra_template)
304+
validate_legacy(String, 'validate_string', $ganglia_host)
305+
validate_legacy(Integer, 'validate_integer', $ganglia_port)
306+
validate_legacy(Boolean, 'validate_bool', $skip_ssl_validation)
307+
validate_legacy(Boolean, 'validate_bool', $skip_apt_key_trusting)
308+
validate_legacy(Boolean, 'validate_bool', $use_curl_http_client)
309+
validate_legacy(Boolean, 'validate_bool', $collect_ec2_tags)
310+
validate_legacy(Boolean, 'validate_bool', $collect_instance_metadata)
311+
validate_legacy(String, 'validate_string', $recent_point_threshold)
312+
validate_legacy(String, 'validate_re', $_listen_port, '^\d*$')
313+
validate_legacy(String, 'validate_string', $additional_checksd)
314+
validate_legacy(String, 'validate_string', $bind_host)
315+
validate_legacy(Boolean, 'validate_bool', $use_pup)
316+
validate_legacy(String, 'validate_re', $_pup_port, '^\d*$')
317+
validate_legacy(String, 'validate_string', $pup_interface)
318+
validate_legacy(String, 'validate_string', $pup_url)
319+
validate_legacy(Boolean, 'validate_bool', $use_dogstatsd)
320+
validate_legacy(String, 'validate_string', $dogstatsd_target)
321+
validate_legacy(String, 'validate_string', $dogstatsd_interval)
322+
validate_legacy(Boolean, 'validate_bool', $dogstatsd_normalize)
323+
validate_legacy(String, 'validate_string', $statsd_forward_host)
324+
validate_legacy(String, 'validate_string', $device_blacklist_re)
325+
validate_legacy(String, 'validate_string', $custom_emitters)
326+
validate_legacy(String, 'validate_string', $agent6_log_file)
327+
validate_legacy(String, 'validate_string', $collector_log_file)
328+
validate_legacy(String, 'validate_string', $forwarder_log_file)
329+
validate_legacy(String, 'validate_string', $dogstatsd_log_file)
330+
validate_legacy(String, 'validate_string', $pup_log_file)
331+
validate_legacy(String, 'validate_string', $syslog_host)
332+
validate_legacy(String, 'validate_re', $_syslog_port, '^\d*$')
333+
validate_legacy(String, 'validate_string', $service_discovery_backend)
334+
validate_legacy(String, 'validate_string', $sd_config_backend)
335+
validate_legacy(String, 'validate_string', $sd_backend_host)
336+
validate_legacy(Integer, 'validate_integer', $sd_backend_port)
337+
validate_legacy(String, 'validate_string', $sd_template_dir)
338+
validate_legacy(Boolean, 'validate_bool', $sd_jmx_enable)
339+
validate_legacy(String, 'validate_string', $consul_token)
340+
validate_legacy(Boolean, 'validate_bool', $apm_enabled)
341+
validate_legacy(Boolean, 'validate_bool', $agent5_enable)
342+
validate_legacy(String, 'validate_string', $apm_env)
343+
validate_legacy(Boolean, 'validate_bool', $process_enabled)
344+
validate_legacy(String, 'validate_string', $agent5_repo_uri)
345+
validate_legacy(String, 'validate_string', $agent6_repo_uri)
346+
validate_legacy(String, 'validate_string', $apt_release)
347347

348348
if $hiera_tags {
349-
$local_tags = hiera_array('datadog_agent::tags', [])
349+
$local_tags = lookup({ 'name' => 'datadog_agent::tags', 'default_value' => []})
350350
} else {
351351
$local_tags = $tags
352352
}
353353

354354
if $hiera_integrations {
355-
$local_integrations = hiera_hash('datadog_agent::integrations', {})
355+
$local_integrations = lookup({ 'name' => 'datadog_agent::integrations', 'default_value' => {}})
356356
} else {
357357
$local_integrations = $integrations
358358
}

‎manifests/integrations/process.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
validate_array( $processes )
5151

5252
if $hiera_processes {
53-
$local_processes = hiera_array('datadog_agent::integrations::process::processes')
53+
$local_processes = lookup({ 'name' => 'datadog_agent::integrations::process::processes', 'default_value' => []})
5454
} else {
5555
$local_processes = $processes
5656
}

‎manifests/ubuntu/agent6.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
) inherits datadog_agent::params {
1717

1818
ensure_packages(['apt-transport-https'])
19-
validate_array($other_keys)
19+
validate_legacy(Array, 'validate_array', $other_keys)
2020

2121
if !$skip_apt_key_trusting {
2222
$mykeys = concat($other_keys, [$apt_key])

0 commit comments

Comments
 (0)
⚡