totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-18 21:55:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete data endpoints (#364)

Browse Source
This commit is contained in:
Dominic Wong
2022-02-07 16:45:27 +00:00
committed by GitHub
parent 7a826ed615
commit 9e252e9a30
6 changed files with 133 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/handler/google.go
View File

@@ -19,6 +19,8 @@ import (
"github.com/micro/micro/v3/service/store"
"github.com/micro/services/app/domain"
pb "github.com/micro/services/app/proto"
pauth "github.com/micro/services/pkg/auth"
adminpb "github.com/micro/services/pkg/service/proto"
"github.com/micro/services/pkg/tenant"
"github.com/teris-io/shortid"
)
@@ -555,7 +557,6 @@ func (e *GoogleApp) Delete(ctx context.Context, req *pb.DeleteRequest, rsp *pb.D
if !ok {
id = "micro"
}
// read the app for the owner
key := OwnerKey + id + "/" + req.Name
recs, err := store.Read(key)
@@ -575,11 +576,16 @@ func (e *GoogleApp) Delete(ctx context.Context, req *pb.DeleteRequest, rsp *pb.D
return err
}
return e.deleteApp(ctx, id, srv)
}
func (e *GoogleApp) deleteApp(ctx context.Context, tenantID string, srv *pb.Service) error {
// check the status
switch srv.Status {
case domain.StatusUpdating, domain.StatusDeploying, domain.StatusDeleting:
log.Errorf("Won't delete: % is %s", req.Name, srv.Status)
return errors.BadRequest("app.delete", "% status: %s", req.Name, srv.Status)
log.Errorf("Won't delete: % is %s", srv.Name, srv.Status)
return errors.BadRequest("app.delete", "% status: %s", srv.Name, srv.Status)
}
// delete from the db
@@ -587,7 +593,7 @@ func (e *GoogleApp) Delete(ctx context.Context, req *pb.DeleteRequest, rsp *pb.D
// service key
ServiceKey + srv.Id,
// owner key
OwnerKey + id + "/" + req.Name,
OwnerKey + tenantID + "/" + srv.Name,
}
// set the delete status
@@ -623,6 +629,35 @@ func (e *GoogleApp) Delete(ctx context.Context, req *pb.DeleteRequest, rsp *pb.D
return nil
}
func (e *GoogleApp) DeleteData(ctx context.Context, request *adminpb.DeleteDataRequest, response *adminpb.DeleteDataResponse) error {
method := "admin.DeleteData"
_, err := pauth.VerifyMicroAdmin(ctx, method)
if err != nil {
return err
}
if len(request.TenantId) < 10 { // deliberate length check so we don't delete all the things
return errors.BadRequest(method, "Missing tenant ID")
}
prefix := OwnerKey + request.TenantId + "/"
recs, err := store.Read(prefix, store.ReadPrefix())
if err != nil {
return err
}
for _, rec := range recs {
var srv pb.Service
if err := rec.Decode(&srv); err != nil {
return err
}
e.deleteApp(ctx, request.TenantId, &srv)
}
log.Infof("Deleted %d functions for %s", len(recs), request.TenantId)
return nil
}
func (e *GoogleApp) List(ctx context.Context, req *pb.ListRequest, rsp *pb.ListResponse) error {
log.Info("Received App.List request")