delete tenants and roles from OpenDistro

uselagoon · Jul 21, 2021 · d7eeb3e · d7eeb3e
1 parent 70abc73
commit d7eeb3e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/services/api/src/resources/group/opendistroSecurity.ts b/services/api/src/resources/group/opendistroSecurity.ts
@@ -215,6 +215,9 @@ export const OpendistroSecurityOperations = (
     }
   },
   deleteGroup: async function(groupName) {
+    await this.deleteGroupWithSpecificTenant(groupName, groupName);
+  },
+  deleteGroupWithSpecificTenant: async function(groupName, tenantName) {
     // delete groups that have no Projects assigned to them
     try {
       await opendistroSecurityClient.delete(`roles/${groupName}`);
@@ -234,6 +237,6 @@ export const OpendistroSecurityOperations = (
       }
     }
 
-    await this.deleteTenant(groupName);
+    await this.deleteTenant(tenantName);
   }
 });
diff --git a/services/api/src/resources/project/resolvers.ts b/services/api/src/resources/project/resolvers.ts
@@ -451,7 +451,8 @@ export const deleteProject: ResolverFn = async (
       `project-${project.name}`
     );
     await models.GroupModel.deleteGroup(group.id);
-    OpendistroSecurityOperations(sqlClientPool, models.GroupModel).deleteGroup(
+    OpendistroSecurityOperations(sqlClientPool, models.GroupModel).deleteGroupWithSpecificTenant(
+      `p${pid}`,
       group.name
     );
   } catch (err) {