Skip to content

Commit

Permalink
added deletion of configurations at delete tenant resources
Browse files Browse the repository at this point in the history
  • Loading branch information
daniel-davidd committed Jul 23, 2023
1 parent a867318 commit 7caac01
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 0 deletions.
25 changes: 25 additions & 0 deletions db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -6164,3 +6164,28 @@ func RemovePoisonedCg(stationId int, cgName string) error {

return nil
}

func DeleteConfByTenantName(tenantName string) error {
ctx, cancelfunc := context.WithTimeout(context.Background(), DbOperationTimeout*time.Second)
defer cancelfunc()

conn, err := MetadataDbClient.Client.Acquire(ctx)
if err != nil {
return err
}
defer conn.Release()

query := `DELETE FROM configurations
WHERE tenant_name=$1`

stmt, err := conn.Conn().Prepare(ctx, "remove_conf_by_tenant_name", query)
if err != nil {
return err
}
tenantName = strings.ToLower(tenantName)
_, err = conn.Conn().Exec(ctx, stmt.Name, tenantName)
if err != nil {
return err
}
return nil
}
5 changes: 5 additions & 0 deletions server/memphis_handlers_user_mgmt.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ func removeTenantResources(tenantName string, user models.User) error {

SendUserDeleteCacheUpdate(users_list, tenantName)

err = db.DeleteConfByTenantName(tenantName)
if err != nil {
return err
}

err = db.RemoveTenant(tenantName)
if err != nil {
return err
Expand Down

0 comments on commit 7caac01

Please sign in to comment.