Skip to content

Commit

Permalink
replace merge() with stdlib::merge(), #68
Browse files Browse the repository at this point in the history
  • Loading branch information
southalc committed Nov 28, 2024
1 parent 914f5cd commit f4e31b5
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 6 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## Release 0.7.4
- Bugfix. Replace deprecated merge() calls with stdlib::merge() - #68. Reported by ZaxLofful

## Release 0.7.3
- Allow version setting on podman and podman-compose packages #77. Contributed by broadinstitute

Expand Down
2 changes: 1 addition & 1 deletion manifests/container.pp
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
}

# If a container name is not set, use the Puppet resource name
$merged_flags = merge({ name => $title, label => $label }, $no_label )
$merged_flags = stdlib::merge({ name => $title, label => $label }, $no_label )
$container_name = $merged_flags['name']

# A rootless container will run as the defined user
Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
$containers.each |$name, $properties| { Resource['Podman::Container'] { $name: * => $properties, } }
$quadlets.each |$name, $properties| {
Resource['Podman::Quadlet'] { $name:
* => merge({ defaults => lookup(podman::quadlet::defaults) }, $properties),
* => stdlib::merge({ defaults => lookup(podman::quadlet::defaults) }, $properties),
}
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/pod.pp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

# The resource name will be the pod name by default
$pod_name = $title
$name_flags = merge({ name => $title }, $flags )
$name_flags = stdlib::merge({ name => $title }, $flags )

# Convert $flags hash to command arguments
$_flags = $name_flags.reduce('') |$mem, $flag| {
Expand Down
2 changes: 1 addition & 1 deletion manifests/quadlet.pp
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

file { $quadlet_file:
ensure => $ensure,
content => hash2ini(merge($defaults, $settings), $hash2ini_options),
content => hash2ini(stdlib::merge($defaults, $settings), $hash2ini_options),
notify => $notify_systemd,
require => $requires,
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/secret.pp
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
}

# If a secret name is not set, use the Puppet resource name
$merged_flags = merge({ label => $label }, $no_label )
$merged_flags = stdlib::merge({ label => $label }, $no_label )

# Convert $flags hash to command arguments
$_flags = $merged_flags.reduce('') |$mem, $flag| {
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "southalc-podman",
"version": "0.7.3",
"version": "0.7.4",
"author": "Chris Southall",
"summary": "Manage podman containers with puppet",
"license": "Apache-2.0",
Expand Down

0 comments on commit f4e31b5

Please sign in to comment.