From ffe0ebae1427d9c30106f380cb3a1d96a9a0e9da Mon Sep 17 00:00:00 2001 From: Robert Cohen Date: Thu, 6 Jul 2023 09:57:04 +1000 Subject: [PATCH 1/4] use + operator for merge --- manifests/install.pp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index dd541bc5..3d9a306e 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -52,23 +52,23 @@ } case $docker::package_source { /docker-engine/ : { - ensure_resource('package', 'docker', merge($docker_hash, { + ensure_resource('package', 'docker', $docker_hash + { ensure => $ensure, source => $docker::package_source, name => $docker::docker_engine_package_name, - })) + }) } /docker-ce/ : { - ensure_resource('package', 'docker', merge($docker_hash, { + ensure_resource('package', 'docker', $docker_hash + { ensure => $ensure, source => $docker::package_source, name => $docker::docker_ce_package_name, - })) - ensure_resource('package', 'docker-ce-cli', merge($docker_hash, { + }) + ensure_resource('package', 'docker-ce-cli', $docker_hash + { ensure => $ensure, source => $docker::package_source, name => $docker::docker_ce_cli_package_name, - })) + }) } default : { # Empty @@ -76,10 +76,10 @@ } } else { if $facts['os']['family'] != 'windows' { - ensure_resource('package', 'docker', merge($docker_hash, { + ensure_resource('package', 'docker', $docker_hash + { ensure => $ensure, name => $docker::docker_package_name, - })) + }) if $ensure == 'absent' { ensure_resource('package', $dependent_packages, { From 5c8490bc2fad10c865017b8a6747e56d88e4a30f Mon Sep 17 00:00:00 2001 From: Robert Cohen Date: Thu, 6 Jul 2023 12:07:43 +1000 Subject: [PATCH 2/4] lint fixes --- manifests/install.pp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index 3d9a306e..97ee96a7 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -53,21 +53,21 @@ case $docker::package_source { /docker-engine/ : { ensure_resource('package', 'docker', $docker_hash + { - ensure => $ensure, - source => $docker::package_source, - name => $docker::docker_engine_package_name, + ensure => $ensure, + source => $docker::package_source, + name => $docker::docker_engine_package_name, }) } /docker-ce/ : { ensure_resource('package', 'docker', $docker_hash + { - ensure => $ensure, - source => $docker::package_source, - name => $docker::docker_ce_package_name, + ensure => $ensure, + source => $docker::package_source, + name => $docker::docker_ce_package_name, }) ensure_resource('package', 'docker-ce-cli', $docker_hash + { - ensure => $ensure, - source => $docker::package_source, - name => $docker::docker_ce_cli_package_name, + ensure => $ensure, + source => $docker::package_source, + name => $docker::docker_ce_cli_package_name, }) } default : { @@ -77,13 +77,13 @@ } else { if $facts['os']['family'] != 'windows' { ensure_resource('package', 'docker', $docker_hash + { - ensure => $ensure, - name => $docker::docker_package_name, + ensure => $ensure, + name => $docker::docker_package_name, }) if $ensure == 'absent' { ensure_resource('package', $dependent_packages, { - ensure => $ensure, + ensure => $ensure, }) } } else { From e94c9577b8e4ee321f3fade3440e047367a8be04 Mon Sep 17 00:00:00 2001 From: Robert Cohen Date: Thu, 6 Jul 2023 14:31:53 +1000 Subject: [PATCH 3/4] indent --- manifests/install.pp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/manifests/install.pp b/manifests/install.pp index 97ee96a7..2e57bab1 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -53,21 +53,21 @@ case $docker::package_source { /docker-engine/ : { ensure_resource('package', 'docker', $docker_hash + { - ensure => $ensure, - source => $docker::package_source, - name => $docker::docker_engine_package_name, + ensure => $ensure, + source => $docker::package_source, + name => $docker::docker_engine_package_name, }) } /docker-ce/ : { ensure_resource('package', 'docker', $docker_hash + { - ensure => $ensure, - source => $docker::package_source, - name => $docker::docker_ce_package_name, + ensure => $ensure, + source => $docker::package_source, + name => $docker::docker_ce_package_name, }) ensure_resource('package', 'docker-ce-cli', $docker_hash + { - ensure => $ensure, - source => $docker::package_source, - name => $docker::docker_ce_cli_package_name, + ensure => $ensure, + source => $docker::package_source, + name => $docker::docker_ce_cli_package_name, }) } default : { @@ -77,8 +77,8 @@ } else { if $facts['os']['family'] != 'windows' { ensure_resource('package', 'docker', $docker_hash + { - ensure => $ensure, - name => $docker::docker_package_name, + ensure => $ensure, + name => $docker::docker_package_name, }) if $ensure == 'absent' { From 10700f3bfb7df69d8d375ed50867538de4d52a21 Mon Sep 17 00:00:00 2001 From: Robert Cohen Date: Thu, 6 Jul 2023 18:00:01 +1000 Subject: [PATCH 4/4] indentation --- manifests/install.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/install.pp b/manifests/install.pp index 2e57bab1..c5142ab5 100644 --- a/manifests/install.pp +++ b/manifests/install.pp @@ -83,7 +83,7 @@ if $ensure == 'absent' { ensure_resource('package', $dependent_packages, { - ensure => $ensure, + ensure => $ensure, }) } } else {