merge group info with primary group declaration #39

lib/puppet/parser/functions/accounts_primary_groups.rb

@@ -4,12 +4,12 @@ module Puppet::Parser::Functions
 EOS
   ) do |args|
 
-    if args.size != 1
-      raise(Puppet::ParseError, "accounts_primary_groups(): Wrong number of args, given #{args.size}, accepts only 1")
+    if args.size != 2
+      raise(Puppet::ParseError, "accounts_primary_groups(): Wrong number of args, given #{args.size}, accepts exactly 2 Hashes")
     end
 
     if args[0].class != Hash
-      raise(Puppet::ParseError, "accounts_primary_groups(): argument must be a Hash, you passed a " + args[0].class.to_s)
+      raise(Puppet::ParseError, "accounts_primary_groups(): argument must be a Hash, you passed a " + args[0].class.to_s + " and "+ args[1].class.to_s)
     end
 
     # assign `user` to group `g`
@@ -23,13 +23,15 @@ module Puppet::Parser::Functions
     end
 
     res = {}
+    groups = args[1]
     args[0].each do |user, val|
       # don't assign users marked for removal to groups
       next if val.key? 'ensure' and val['ensure'] == 'absent'
       val['primary_group'] = user.to_s unless val.key? 'primary_group'
       val['manage_group'] = true unless val.key? 'manage_group'
       if val['manage_group']
         g = val['primary_group']
+        res[g] = groups[g] if groups.key? g
         assign_helper.call(res, g, user)
         if val.key? 'gid'
           res[g]['gid'] = val['gid'] # manually override GID

manifests/init.pp

@@ -21,7 +21,7 @@
 
   anchor { 'accounts::primary_groups_created': }
   # create primary groups first
-  $primary_groups = accounts_primary_groups($merged_users)
+  $primary_groups = accounts_primary_groups($merged_users, $merged_groups)
   notify{"primary_groups: ${primary_groups}": }
   create_resources(accounts::group, $primary_groups,
     {'before' => Anchor['accounts::primary_groups_created']}

spec/functions/accounts_primary_groups_spec.rb

@@ -30,7 +30,7 @@
         john: { 'groups' => ['bar', 'users'], 'gid' => 500},
       }
 
-      is_expected.to run.with_params(users).and_return(
+      is_expected.to run.with_params(users, {}).and_return(
         {
           'foo' => {'members' => [:foo] },
           'john' => {'members' => [:john], 'gid' => 500},
@@ -45,7 +45,7 @@
         tracy: { 'groups' => ['sudo', 'users'], 'ensure' => 'absent'},
       }
 
-      is_expected.to run.with_params(users).and_return(
+      is_expected.to run.with_params(users, {}).and_return(
         {
           'bob' => {'members' => [:bob]},
           'alice' => {'members' => [:alice]},
@@ -57,13 +57,19 @@
   describe 'extract also primary groups' do
     it 'finds group specified by primary_group' do
       users = {
-        foo: { 'primary_group' => 'testgroup', 'manage_group' => true},
-        bar: { 'primary_group' => 'testgroup', 'manage_group' => false},
+        'foo' => { 'primary_group' => 'testgroup', 'manage_group' => true},
+        'bar' => { 'primary_group' => 'testgroup', 'manage_group' => false},
+      }
+      groups = {
+        'testgroup' => {
+          'members' => [ 'www-data', 'testuser' ],
+          'gid'     => 500,
+        }
       }
 
-      is_expected.to run.with_params(users).and_return(
+      is_expected.to run.with_params(users, groups).and_return(
         {
-          'testgroup' => {'members' => [:foo]},
+          'testgroup' => {'members' => ['www-data', 'testuser', 'foo'], 'gid' => 500},
         }
       )
     end