Merge pull request #345 from helgi/key_hook_fingerprints

feat(hooks): add fingerprint to key hooks API response

Author: helgi

rootfs/api/tests/test_hooks.py

@@ -86,7 +86,10 @@ def test_key_hook(self):
         url = '/v2/hooks/keys/{}'.format(app_id)
         response = self.client.get(url, HTTP_X_DEIS_BUILDER_AUTH=settings.BUILDER_KEY)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data, {"autotest": [public, public2]})
+        self.assertEqual(response.data, {"autotest": [
+            {'key': public, 'fingerprint': '54:6d:da:1f:91:b5:2b:6f:a2:83:90:c4:f9:73:76:f5'},
+            {'key': public2, 'fingerprint': '43:fd:22:bc:dc:ca:6a:28:ba:71:4c:18:41:1d:d1:e2'}
+        ]})
 
         # Test against an app that exist but user does not
         url = '/v2/hooks/keys/{}/foooooo'.format(app_id)
@@ -97,7 +100,10 @@ def test_key_hook(self):
         url = '/v2/hooks/keys/{}/{}'.format(app_id, str(self.user))
         response = self.client.get(url, HTTP_X_DEIS_BUILDER_AUTH=settings.BUILDER_KEY)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data, {"autotest": [public, public2]})
+        self.assertEqual(response.data, {"autotest": [
+            {'key': public, 'fingerprint': '54:6d:da:1f:91:b5:2b:6f:a2:83:90:c4:f9:73:76:f5'},
+            {'key': public2, 'fingerprint': '43:fd:22:bc:dc:ca:6a:28:ba:71:4c:18:41:1d:d1:e2'}
+        ]})
 
     def test_push_hook(self):
         """Test creating a Push via the API"""

rootfs/api/views.py

@@ -413,14 +413,17 @@ def app(self, request, *args, **kwargs):
         data = {}
         result = models.Key.objects \
                        .filter(owner__in=usernames) \
-                       .values('owner__username', 'public') \
+                       .values('owner__username', 'public', 'fingerprint') \
                        .order_by('created')
         for info in result:
             user = info['owner__username']
             if user not in data:
                 data[user] = []
 
-            data[user].append(info['public'])
+            data[user].append({
+                'key': info['public'],
+                'fingerprint': info['fingerprint']
+            })
 
         return Response(data, status=status.HTTP_200_OK)
 
@@ -434,13 +437,16 @@ def users(self, request, *args, **kwargs):
         data = {request.user.username: []}
         keys = models.Key.objects \
                      .filter(owner__username=kwargs['username']) \
-                     .values('public') \
+                     .values('public', 'fingerprint') \
                      .order_by('created')
         if not keys:
             raise Http404("No Keys match the given query.")
 
-        for key in keys:
-            data[request.user.username].append(key['public'])
+        for info in keys:
+            data[request.user.username].append({
+                'key': info['public'],
+                'fingerprint': info['fingerprint']
+            })
 
         return Response(data, status=status.HTTP_200_OK)