changing deferred functions

lib/puppet/functions/docker/env.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+Puppet::Functions.create_function(:'docker::env') do
+  dispatch :env do
+    param 'Array', :a
+    return_type 'Array'
+  end
+
+  def env(args)
+    args
+  end
+end

manifests/registry.pp

@@ -50,9 +50,6 @@
 
   $docker_command = $docker::params::docker_command
 
-  # Use Deferred to encrypt the password
-  $deferred_password = Deferred('docker::password', [$password])
-
   if $facts['os']['family'] == 'windows' {
     $exec_environment = ["PATH=${facts['docker_program_files_path']}/Docker/",]
     $exec_timeout     = 3000
@@ -79,12 +76,12 @@
   }
 
   if $ensure == 'present' {
-    if $username != undef and $deferred_password != undef and $email != undef and $version != undef and $version =~ /1[.][1-9]0?/ {
+    if $username != undef and $password != undef and $email != undef and $version != undef and $version =~ /1[.][1-9]0?/ {
       $auth_cmd         = "${docker_command} login -u '${username}' -p \"${password_env}\" -e '${email}' ${server}"
-      $auth_environment = Deferred('docker::password', [$password])
-    } elsif $username != undef and $deferred_password != undef {
+      $auth_environment = "password=${password}"
+    } elsif $username != undef and $password != undef {
       $auth_cmd         = "${docker_command} login -u '${username}' -p \"${password_env}\" ${server}"
-      $auth_environment = Deferred('docker::password', [$password])
+      $auth_environment = "password=${password}"
     } else {
       $auth_cmd         = "${docker_command} login ${server}"
       $auth_environment = ''
@@ -94,35 +91,14 @@
     $auth_environment = ''
   }
 
-  #$docker_auth = "${title}${auth_environment}${auth_cmd}${local_user}"
-  $docker_auth = Deferred('sprintf', ['%spassword=%s%s%s',
-      $title,
-      $auth_environment,
-      $auth_cmd,
-      $local_user,
-  ])
+  $docker_auth = "${title}${auth_environment}${auth_cmd}${local_user}"
 
-  if $auth_environment =~ Deferred {
-    $exec_env = Deferred('sprintf', ['%spassword=%sdocker_auth=%s',
-        $exec_environment,
-        $auth_environment,
-        $docker_auth,
-      ]
-    )
+  if $auth_environment != '' {
+    $exec_env = concat($exec_environment, $auth_environment, "docker_auth=${docker_auth}")
   } else {
-    $exec_env = Deferred('sprintf', ['%sdocker_auth=%s',
-        $exec_environment,
-        $docker_auth,
-      ]
-    )
+    $exec_env = concat($exec_environment, "docker_auth=${docker_auth}")
   }
 
-  #if $auth_environment != '' {
-  #  $exec_env = concat($exec_environment, concat('password=',$auth_environment), "docker_auth=${docker_auth}")
-  #} else {
-  #  $exec_env = concat($exec_environment, "docker_auth=${docker_auth}")
-  #}
-
   if $receipt {
     if $facts['os']['family'] != 'windows' {
       # server may be an URI, which can contain /
@@ -172,8 +148,8 @@
   }
 
   exec { "${title} auth":
-    environment => $exec_env,
-    command     => $_auth_command,
+    environment => Deferred('docker::env', [$exec_env]),
+    command     => Deferred('sprintf', [$_auth_command]),
     user        => $exec_user,
     path        => $exec_path,
     timeout     => $exec_timeout,

spec/functions/env_spec.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'docker::env' do
+  it { is_expected.to run.with_params([4]).and_return([4]) }
+  it { is_expected.to run.with_params([4, 5, '3']).and_return([4, 5, '3']) }
+  it { is_expected.to run.with_params(2).and_raise_error(StandardError) }
+  it { is_expected.to run.with_params('string').and_raise_error(StandardError) }
+  it { is_expected.to run.with_params(nil).and_raise_error(StandardError) }
+end