Merge pull request #484 from cultuurnet/feature/ssh_key_tags

Allow multiple tags on SSH pubkeys

Author: willaerk

manifests/ssh.pp

@@ -53,7 +53,7 @@
     purge => true
   }
 
-  any2array($ssh_authorized_keys_tags).each |$tag| {
+  [$ssh_authorized_keys_tags].flatten.each |$tag| {
     Ssh_authorized_key <| tag == $tag |>
   }
 

manifests/ssh_authorized_keys.pp

@@ -15,7 +15,7 @@
         user => 'ubuntu',
         type => $key_attributes['type'],
         key  => $key_attributes['key'],
-        tag  => $attributes['tag']
+        tag  => $attributes['tags']
       }
     }
   }

spec/classes/ssh_authorized_keys_spec.rb

@@ -16,13 +16,13 @@
           it { is_expected.to have_ssh_authorized_key_resource_count(0) }
         end
 
-        context "with keys => { foo => { tag => publiq, keys => { type => ssh-rsa, key => abcd1234 } }, bar => { tag => publiq, keys => [{ type => ssh-rsa, key => efgh5678 }, { type => ssh-ed25519, key => ijkl9012 }] }, baz => { tag => acme, keys => {type => ssh-rsa, key => efgh5678} } }" do
+        context "with keys => { foo => { tags => [publiq, example], keys => { type => ssh-rsa, key => abcd1234 } }, bar => { tags => publiq, keys => [{ type => ssh-rsa, key => efgh5678 }, { type => ssh-ed25519, key => ijkl9012 }] }, baz => { tags => acme, keys => {type => ssh-rsa, key => efgh5678} } }" do
           let(:params) {
             {
               'keys' => {
-                'foo' => { 'tag' => 'publiq', 'keys' => { 'type' => 'ssh-rsa', 'key' => 'abcd1234' } },
-                'bar' => { 'tag' => 'publiq', 'keys' => [{ 'type' => 'ssh-rsa', 'key' => 'efgh5678' }, { 'type' => 'ssh-ed25519', 'key' => 'ijkl9012' }] },
-                'baz' => { 'tag' => 'acme', 'keys' => { 'type' => 'ssh-rsa', 'key' => 'efgh5678' } }
+                'foo' => { 'tags' => ['publiq', 'example'], 'keys' => { 'type' => 'ssh-rsa', 'key' => 'abcd1234' } },
+                'bar' => { 'tags' => 'publiq', 'keys' => [{ 'type' => 'ssh-rsa', 'key' => 'efgh5678' }, { 'type' => 'ssh-ed25519', 'key' => 'ijkl9012' }] },
+                'baz' => { 'tags' => 'acme', 'keys' => { 'type' => 'ssh-rsa', 'key' => 'efgh5678' } }
               }
             }
           }
@@ -31,7 +31,7 @@
             'user' => 'ubuntu',
             'type' => 'ssh-rsa',
             'key'  => 'abcd1234',
-            'tag'  => 'publiq'
+            'tag'  => ['publiq', 'example']
           ) }
 
           it { is_expected.to contain_ssh_authorized_key('bar 1').with(

spec/support/hiera/data/common.yaml

@@ -65,22 +65,24 @@ profiles::certificates::certificates:
 
 profiles::ssh_authorized_keys::keys:
   'publiq first key':
-    tag: 'publiq'
+    tags: 'publiq'
     keys:
       type: 'ssh-rsa'
       key: 'abcd'
   'publiq second key':
-    tag: 'publiq'
+    tags:
+      - 'publiq'
+      - 'example'
     keys:
       type: 'ssh-ed25519'
       key: 'defg'
   'foobar first key':
-    tag: 'foobar'
+    tags: 'foobar'
     keys:
       type: 'ssh-rsa'
       key: '0123'
   'acme first key':
-    tag: 'acme'
+    tags: 'acme'
     keys:
       type: 'ssh-rsa'
       key: '4567'