Merge 9b4feaa into 5bf54d4

uc-cdis · Aug 7, 2020 · 7fbe083 · 7fbe083
2 parents 5bf54d4 + 9b4feaa
commit 7fbe083
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/fence/blueprints/google.py b/fence/blueprints/google.py
@@ -131,8 +131,8 @@ def post(self):
 
         if len(project_access) > config["SERVICE_ACCOUNT_LIMIT"]:
             raise UserError(
-                "Project access limited to {}. You added {}".format(
-                    config["SERVICE_ACCOUNT_LIMIT"], len(project_access)
+                "Exceeded Allowable Number of Projects. Maximum {} Projects allowed per account.".format(
+                    config["SERVICE_ACCOUNT_LIMIT"]
                 )
             )
 
@@ -364,9 +364,9 @@ def post(self, id_):
         project_access = payload.get("project_access")
 
         if len(project_access) > config["SERVICE_ACCOUNT_LIMIT"]:
-            raise UserError(
-                "Project access limited to {}. You added {}".format(
-                    config["SERVICE_ACCOUNT_LIMIT"], len(project_access)
+            return UserError(
+                "Exceeded Allowable Number of Projects. Maximum {} Projects allowed per account.".format(
+                    config["SERVICE_ACCOUNT_LIMIT"]
                 )
             )
 
@@ -607,8 +607,8 @@ def _get_service_account_for_patch(id_):
 
     if len(project_access) > config["SERVICE_ACCOUNT_LIMIT"]:
         raise UserError(
-            "Project access limited to {}. You added {}".format(
-                config["SERVICE_ACCOUNT_LIMIT"], len(project_access)
+            "Exceeded Allowable Number of Projects. Maximum {} Projects allowed per account.".format(
+                config["SERVICE_ACCOUNT_LIMIT"]
             )
         )