(SIMP-10739) Update documentation and acc. tests

Updated the acceptance tests (which I cannot run, so gosh I hope they work) to use the newer convention for user/password specification.
simp · Aug 12, 2022 · b5b4b43 · b5b4b43
1 parent 74b1113
commit b5b4b43
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 14 deletions.
diff --git a/manifests/server/section.pp b/manifests/server/section.pp
@@ -140,7 +140,7 @@
       $secretsfile_lines = $user_pass
         .map |$line| { "${line}\n" }
     } else {
-      $secretsfile_lines = Hash.assert_type($auth_users) |$ex, $act| { 
+      $secretsfile_lines = Hash.assert_type($auth_users) |$ex, $act| {
           $auth_users.reduce({}) |$hash, $user| { $hash + { $user => undef } }
         }.map |$username, $maybe_password| {
         $password = $maybe_password ? {

diff --git a/spec/acceptance/suites/default/10_server_client_spec.rb b/spec/acceptance/suites/default/10_server_client_spec.rb
@@ -45,8 +45,7 @@
             }
 
             rsync::server::section { 'test':
-              auth_users  => ['test_user'],
-              user_pass   => ['test_user:test_pass'],
+              auth_users  => { 'test_user' => 'test_pass' },
               comment     => 'A test system',
               hosts_allow => ['#{server1_ip}', '#{server2_ip}'],
               path        => '/srv/rsync/test',

diff --git a/spec/acceptance/suites/default/20_server_client_stunnel_spec.rb b/spec/acceptance/suites/default/20_server_client_stunnel_spec.rb
@@ -49,11 +49,10 @@
             }
 
             rsync::server::section { 'test':
-              auth_users  => ['test_user'],
-              user_pass   => ['test_user:test_pass'],
-              comment     => 'A test system',
-              path        => '/srv/rsync/test',
-              require     => File['/srv/rsync/test/test_file_srvcli2_server1']
+              auth_users => { 'test_user' => 'test_pass' },
+              comment    => 'A test system',
+              path       => '/srv/rsync/test',
+              require    => File['/srv/rsync/test/test_file_srvcli2_server1']
             }
 
             stunnel::connection { 'rsync':
@@ -88,11 +87,10 @@
             }
 
             rsync::server::section { 'test':
-              auth_users  => ['test_user'],
-              user_pass   => ['test_user:test_pass'],
-              comment     => 'A test system',
-              path        => '/srv/rsync/test',
-              require     => File['/srv/rsync/test/test_file_srvcli2_server2']
+              auth_users => { 'test_user' => 'test_pass' },
+              comment    => 'A test system',
+              path       => '/srv/rsync/test',
+              require    => File['/srv/rsync/test/test_file_srvcli2_server2']
             }
 
             stunnel::connection { 'rsync':

diff --git a/types/auth_users.pp b/types/auth_users.pp
@@ -1,6 +1,6 @@
 # @summary Validator for rsync::server::auth_users
 # 
 type Rsync::Auth_users = Variant[
-    Array[String[1]], 
+    Array[String[1]],
     Hash[String[1], Optional[String]]
   ]