fixing merge conflict

lemur/authorities/service.py

@@ -57,11 +57,14 @@ def create(kwargs):
     cert = cert_service.save_cert(cert_body, None, intermediate, None, None, None)
     cert.user = g.current_user
 
-    # we create and attach any roles that cloudCA gives us
+    # we create and attach any roles that the issuer gives us
     role_objs = []
     for r in issuer_roles:
-        role = role_service.create(r['name'], password=r['password'], description="CloudCA auto generated role",
-                                   username=r['username'])
+        role = role_service.create(
+            r['name'],
+           password=r['password'],
+           description="{0} auto generated role".format(kwargs.get('pluginName')),
+           username=r['username'])
         # the user creating the authority should be able to administer it
         if role.username == 'admin':
             g.current_user.roles.append(role)

lemur/authorities/views.py

@@ -365,7 +365,11 @@ class CertificateAuthority(AuthenticatedResource):
            :statuscode 200: no error
            :statuscode 403: unauthenticated
         """
-        return certificate_service.get(certificate_id).authority
+        cert = certificate_service.get(certificate_id)
+        if not cert:
+            return dict(message="Certificate not found"), 404
+
+        return cert.authority
 
 api.add_resource(AuthoritiesList, '/authorities', endpoint='authorities')
 api.add_resource(Authorities, '/authorities/<int:authority_id>', endpoint='authority')