ddmt/gitdts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(runner): delete runner from admin html page

Browse Source
This commit is contained in:
fuxiaohei
2022-10-12 20:57:40 +08:00
committed by Jason Song
parent 5b989e2a11
commit fbb9f437a6
6 changed files with 58 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
routers/api/bots/runner/unary.go
View File

@@ -28,7 +28,7 @@ var WithRunner = connect.WithInterceptors(connect.UnaryInterceptorFunc(func(unar
token := request.Header().Get("X-Runner-Token") // TODO: shouldn't be X-Runner-Token, maybe X-Runner-UUID
runner, err := bots_model.GetRunnerByToken(token)
if err != nil {
if _, ok := err.(*bots_model.ErrRunnerNotExist); ok {
if _, ok := err.(bots_model.ErrRunnerNotExist); ok {
return nil, status.Error(codes.Unauthenticated, "unregistered runner")
}
return nil, status.Error(codes.Internal, err.Error())

28
routers/web/admin/runners.go
View File

@@ -42,8 +42,9 @@ func Runners(ctx *context.Context) {
Page: page,
PageSize: 100,
},
Sort: ctx.Req.URL.Query().Get("sort"),
Filter: ctx.Req.URL.Query().Get("q"),
Sort: ctx.Req.URL.Query().Get("sort"),
Filter: ctx.Req.URL.Query().Get("q"),
WithDeleted: false,
}
count, err := bots_model.CountRunners(opts)
@@ -122,11 +123,26 @@ func EditRunnerPost(ctx *context.Context) {
}
// DeleteRunner response for deleting a runner
func DeleteRunner(ctx *context.Context) {
func DeleteRunnerPost(ctx *context.Context) {
runner, err := bots_model.GetRunnerByID(ctx.ParamsInt64(":runnerid"))
if err != nil {
log.Warn("DeleteRunnerPost.GetRunnerByID failed: %v, url: %s", err, ctx.Req.URL)
ctx.ServerError("DeleteRunnerPost.GetRunnerByID", err)
return
}
err = bots_model.DeleteRunner(ctx, runner)
if err != nil {
log.Warn("DeleteRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL)
ctx.Flash.Warning(ctx.Tr("admin.runners.delete_failed"))
ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid")))
return
}
log.Info("DeleteRunnerPost success: %s", ctx.Req.URL)
ctx.Flash.Success(ctx.Tr("admin.runners.deletion_success"))
ctx.JSON(http.StatusOK, map[string]interface{}{
"redirect": setting.AppSubURL + "/admin/runners",
})
ctx.Redirect(setting.AppSubURL + "/admin/runners/")
}
/**

2
routers/web/web.go
View File

@@ -629,7 +629,7 @@ func RegisterRoutes(m *web.Route) {
m.Group("/runners", func() {
m.Get("", admin.Runners)
m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.AdminEditRunnerForm{}), admin.EditRunnerPost)
m.Post("/{runnerid}/delete", admin.DeleteRunner)
m.Post("/{runnerid}/delete", admin.DeleteRunnerPost)
})
}, func(ctx *context.Context) {
ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable