Merge pull request #906 from isb-cgc/isb-cgc-prod-sp

Sprint 36: API v4

accounts/sa_utils.py

@@ -542,7 +542,7 @@ def register_service_account(user_email, user_id, gcp_id, user_sa, datasets, is_
     except (TokenFailure, InternalTokenError, RefreshTokenExpired, DCFCommFailure) as e:
         raise e
     except Exception as e:
-        logger.error("[ERROR] Exception while registering ServiceAccount")
+        logger.error("[ERROR] Exception while registering ServiceAccount {} for project {}:".format(user_sa,gcp_id))
         logger.exception(e)
         raise e
 
@@ -624,7 +624,7 @@ def _register_service_account_dcf(user_email, user_id, gcp_id, user_sa, datasets
             #
 
     except (TokenFailure, InternalTokenError, RefreshTokenExpired, DCFCommFailure) as e:
-        logger.error("[ERROR] Exception while registering ServiceAccount")
+        logger.error("[ERROR] Exception while registering ServiceAccount {} for project {}:".format(user_sa,gcp_id))
         logger.exception(e)
         raise e
 

accounts/utils.py

@@ -299,21 +299,34 @@ def unreg_gcp(user, gcp_id):
 
 
 def get_user_gcps(user, gcp_id=None):
-    gcps = []
-    gcp_list = None
+    gcps = None
 
     try:
         if gcp_id:
-            gcp_list = GoogleProject.objects.filter(user=user, active=1)
-        else:
             gcp_list = GoogleProject.objects.filter(user=user, active=1, project_id=gcp_id)
+        else:
+            gcp_list = GoogleProject.objects.filter(user=user, active=1)
 
+        gcps = []
         for gcp in gcp_list:
-            gcps.append({'gcp_id': gcp.project_id, 'gcp_name': gcp.project_name, 'users': [x.email for x in gcp.users_set.all()]})
+            gcps.append({'gcp_id': gcp.project_id, 'gcp_name': gcp.project_name, 'users': [x.email for x in gcp.user.all()]})
 
     except Exception as e:
         logger.error("[ERROR] While fetching the GCP project list for user {}:")
         logger.exception(e)
 
     return gcps
 
+def api_gcp_delete(user, gcp_id):
+    response = {}
+    status = 200
+
+    try:
+        gcp = GoogleProject.objects.get(project_id=gcp_id, active=1)
+        response, status = unreg_gcp(user, gcp.id)
+    except ObjectDoesNotExist:
+        response['message'] = "An active Google Cloud Platform project with ID {} was not found.".format(gcp_id)
+        status = 404
+
+    return response, status
+