mirror of https://github.com/go-gitea/gitea
Move secrets and runners settings to actions settings (#24200)
This PR moves the secrets and runners settings to actions settings on
all settings(repo,org,user,admin) levels.
After this PR, if
[ENABLED](5e7543fcf4/custom/conf/app.example.ini (L2604))
inside `app.ini` under `[actions]` is set to `false`, the "Actions" tab
(including runners management and secrets management) will not be shown.
After, the settings under actions settings for each level:
1. Admin Level
"Runners Management"
<img width="1437" alt="Screen Shot 2023-04-26 at 14 34 20"
src="https://user-images.githubusercontent.com/17645053/234489731-15822d21-38e1-4560-8bbe-69f122376abc.png">
2. User Level
"Secrets Management"
<img width="1427" alt="Screen Shot 2023-04-26 at 14 34 30"
src="https://user-images.githubusercontent.com/17645053/234489795-68c9c0cb-24f8-4f09-95c6-458ab914c313.png">
3. Repo and Organization Levels
"Runners Management" and "Secrets Management"
Org:
<img width="1437" alt="Screen Shot 2023-04-26 at 14 35 07"
src="https://user-images.githubusercontent.com/17645053/234489996-f3af5ebb-d354-46ca-9087-a0b586845281.png">
<img width="1433" alt="Screen Shot 2023-04-26 at 14 35 14"
src="https://user-images.githubusercontent.com/17645053/234490004-3abf8fed-81fd-4ce2-837a-935dade1793d.png">
Repo:
<img width="1419" alt="Screen Shot 2023-04-26 at 14 34 50"
src="https://user-images.githubusercontent.com/17645053/234489904-80c11038-4b58-462c-9d0b-8b7cf70bc2b3.png">
<img width="1430" alt="Screen Shot 2023-04-26 at 14 34 57"
src="https://user-images.githubusercontent.com/17645053/234489918-4e8d1fe2-9bcd-4d8a-96c1-238a8088d92e.png">
It also finished these tasks :
- [x] rename routers function "runners" to "actions", and refactor
related file names
- [x] check and modify part of the runners related functions to match
their name
- [x] Fix backend check caused by fmt check
---------
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
pull/24370/head^2
Hester Gong
2 years ago
committed by
GitHub
parent
6dfc0c87ec
commit
63a401ac40
@ -1,78 +0,0 @@ |
|||||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
package org |
|
||||||
|
|
||||||
import ( |
|
||||||
"net/url" |
|
||||||
|
|
||||||
actions_model "code.gitea.io/gitea/models/actions" |
|
||||||
"code.gitea.io/gitea/models/db" |
|
||||||
"code.gitea.io/gitea/modules/context" |
|
||||||
actions_shared "code.gitea.io/gitea/routers/web/shared/actions" |
|
||||||
) |
|
||||||
|
|
||||||
// Runners render runners page
|
|
||||||
func Runners(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("org.runners") |
|
||||||
ctx.Data["PageIsOrgSettings"] = true |
|
||||||
ctx.Data["PageIsOrgSettingsRunners"] = true |
|
||||||
|
|
||||||
page := ctx.FormInt("page") |
|
||||||
if page <= 1 { |
|
||||||
page = 1 |
|
||||||
} |
|
||||||
|
|
||||||
opts := actions_model.FindRunnerOptions{ |
|
||||||
ListOptions: db.ListOptions{ |
|
||||||
Page: page, |
|
||||||
PageSize: 100, |
|
||||||
}, |
|
||||||
Sort: ctx.Req.URL.Query().Get("sort"), |
|
||||||
Filter: ctx.Req.URL.Query().Get("q"), |
|
||||||
OwnerID: ctx.Org.Organization.ID, |
|
||||||
WithAvailable: true, |
|
||||||
} |
|
||||||
|
|
||||||
actions_shared.RunnersList(ctx, tplSettingsRunners, opts) |
|
||||||
} |
|
||||||
|
|
||||||
// ResetRunnerRegistrationToken reset runner registration token
|
|
||||||
func ResetRunnerRegistrationToken(ctx *context.Context) { |
|
||||||
actions_shared.RunnerResetRegistrationToken(ctx, |
|
||||||
ctx.Org.Organization.ID, 0, |
|
||||||
ctx.Org.OrgLink+"/settings/runners") |
|
||||||
} |
|
||||||
|
|
||||||
// RunnersEdit render runner edit page
|
|
||||||
func RunnersEdit(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("org.runners.edit") |
|
||||||
ctx.Data["PageIsOrgSettings"] = true |
|
||||||
ctx.Data["PageIsOrgSettingsRunners"] = true |
|
||||||
page := ctx.FormInt("page") |
|
||||||
if page <= 1 { |
|
||||||
page = 1 |
|
||||||
} |
|
||||||
|
|
||||||
actions_shared.RunnerDetails(ctx, tplSettingsRunnersEdit, page, |
|
||||||
ctx.ParamsInt64(":runnerid"), ctx.Org.Organization.ID, 0, |
|
||||||
) |
|
||||||
} |
|
||||||
|
|
||||||
// RunnersEditPost response for editing runner
|
|
||||||
func RunnersEditPost(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("org.runners.edit") |
|
||||||
ctx.Data["PageIsOrgSettings"] = true |
|
||||||
ctx.Data["PageIsOrgSettingsRunners"] = true |
|
||||||
actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), |
|
||||||
ctx.Org.Organization.ID, 0, |
|
||||||
ctx.Org.OrgLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) |
|
||||||
} |
|
||||||
|
|
||||||
// RunnerDeletePost response for deleting runner
|
|
||||||
func RunnerDeletePost(ctx *context.Context) { |
|
||||||
actions_shared.RunnerDeletePost(ctx, |
|
||||||
ctx.ParamsInt64(":runnerid"), |
|
||||||
ctx.Org.OrgLink+"/settings/runners", |
|
||||||
ctx.Org.OrgLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) |
|
||||||
} |
|
||||||
@ -0,0 +1,12 @@ |
|||||||
|
// Copyright 2022 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package setting |
||||||
|
|
||||||
|
import ( |
||||||
|
"code.gitea.io/gitea/modules/context" |
||||||
|
) |
||||||
|
|
||||||
|
func RedirectToDefaultSetting(ctx *context.Context) { |
||||||
|
ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/runners") |
||||||
|
} |
||||||
@ -1,50 +0,0 @@ |
|||||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
package org |
|
||||||
|
|
||||||
import ( |
|
||||||
"net/http" |
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/base" |
|
||||||
"code.gitea.io/gitea/modules/context" |
|
||||||
shared "code.gitea.io/gitea/routers/web/shared/secrets" |
|
||||||
) |
|
||||||
|
|
||||||
const ( |
|
||||||
tplSettingsSecrets base.TplName = "org/settings/secrets" |
|
||||||
) |
|
||||||
|
|
||||||
// Secrets render organization secrets page
|
|
||||||
func Secrets(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("secrets.secrets") |
|
||||||
ctx.Data["PageIsOrgSettings"] = true |
|
||||||
ctx.Data["PageIsOrgSettingsSecrets"] = true |
|
||||||
|
|
||||||
shared.SetSecretsContext(ctx, ctx.ContextUser.ID, 0) |
|
||||||
if ctx.Written() { |
|
||||||
return |
|
||||||
} |
|
||||||
|
|
||||||
ctx.HTML(http.StatusOK, tplSettingsSecrets) |
|
||||||
} |
|
||||||
|
|
||||||
// SecretsPost add secrets
|
|
||||||
func SecretsPost(ctx *context.Context) { |
|
||||||
shared.PerformSecretsPost( |
|
||||||
ctx, |
|
||||||
ctx.ContextUser.ID, |
|
||||||
0, |
|
||||||
ctx.Org.OrgLink+"/settings/secrets", |
|
||||||
) |
|
||||||
} |
|
||||||
|
|
||||||
// SecretsDelete delete secrets
|
|
||||||
func SecretsDelete(ctx *context.Context) { |
|
||||||
shared.PerformSecretsDelete( |
|
||||||
ctx, |
|
||||||
ctx.ContextUser.ID, |
|
||||||
0, |
|
||||||
ctx.Org.OrgLink+"/settings/secrets", |
|
||||||
) |
|
||||||
} |
|
||||||
@ -1,76 +0,0 @@ |
|||||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
package repo |
|
||||||
|
|
||||||
import ( |
|
||||||
"net/url" |
|
||||||
|
|
||||||
actions_model "code.gitea.io/gitea/models/actions" |
|
||||||
"code.gitea.io/gitea/models/db" |
|
||||||
"code.gitea.io/gitea/modules/context" |
|
||||||
actions_shared "code.gitea.io/gitea/routers/web/shared/actions" |
|
||||||
) |
|
||||||
|
|
||||||
const ( |
|
||||||
tplRunners = "repo/settings/runners" |
|
||||||
tplRunnerEdit = "repo/settings/runner_edit" |
|
||||||
) |
|
||||||
|
|
||||||
// Runners render runners page
|
|
||||||
func Runners(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("actions.runners") |
|
||||||
ctx.Data["PageIsSettingsRunners"] = true |
|
||||||
|
|
||||||
page := ctx.FormInt("page") |
|
||||||
if page <= 1 { |
|
||||||
page = 1 |
|
||||||
} |
|
||||||
|
|
||||||
opts := actions_model.FindRunnerOptions{ |
|
||||||
ListOptions: db.ListOptions{ |
|
||||||
Page: page, |
|
||||||
PageSize: 100, |
|
||||||
}, |
|
||||||
Sort: ctx.Req.URL.Query().Get("sort"), |
|
||||||
Filter: ctx.Req.URL.Query().Get("q"), |
|
||||||
RepoID: ctx.Repo.Repository.ID, |
|
||||||
WithAvailable: true, |
|
||||||
} |
|
||||||
|
|
||||||
actions_shared.RunnersList(ctx, tplRunners, opts) |
|
||||||
} |
|
||||||
|
|
||||||
func RunnersEdit(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("actions.runners") |
|
||||||
ctx.Data["PageIsSettingsRunners"] = true |
|
||||||
page := ctx.FormInt("page") |
|
||||||
if page <= 1 { |
|
||||||
page = 1 |
|
||||||
} |
|
||||||
|
|
||||||
actions_shared.RunnerDetails(ctx, tplRunnerEdit, page, |
|
||||||
ctx.ParamsInt64(":runnerid"), 0, ctx.Repo.Repository.ID, |
|
||||||
) |
|
||||||
} |
|
||||||
|
|
||||||
func RunnersEditPost(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("actions.runners") |
|
||||||
ctx.Data["PageIsSettingsRunners"] = true |
|
||||||
actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), |
|
||||||
0, ctx.Repo.Repository.ID, |
|
||||||
ctx.Repo.RepoLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) |
|
||||||
} |
|
||||||
|
|
||||||
func ResetRunnerRegistrationToken(ctx *context.Context) { |
|
||||||
actions_shared.RunnerResetRegistrationToken(ctx, |
|
||||||
0, ctx.Repo.Repository.ID, |
|
||||||
ctx.Repo.RepoLink+"/settings/runners") |
|
||||||
} |
|
||||||
|
|
||||||
// RunnerDeletePost response for deleting runner
|
|
||||||
func RunnerDeletePost(ctx *context.Context) { |
|
||||||
actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), |
|
||||||
ctx.Repo.RepoLink+"/settings/runners", |
|
||||||
ctx.Repo.RepoLink+"/settings/runners/"+url.PathEscape(ctx.Params(":runnerid"))) |
|
||||||
} |
|
||||||
@ -0,0 +1,167 @@ |
|||||||
|
// Copyright 2022 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package setting |
||||||
|
|
||||||
|
import ( |
||||||
|
"errors" |
||||||
|
"net/http" |
||||||
|
"net/url" |
||||||
|
|
||||||
|
actions_model "code.gitea.io/gitea/models/actions" |
||||||
|
"code.gitea.io/gitea/models/db" |
||||||
|
"code.gitea.io/gitea/modules/base" |
||||||
|
"code.gitea.io/gitea/modules/context" |
||||||
|
"code.gitea.io/gitea/modules/setting" |
||||||
|
actions_shared "code.gitea.io/gitea/routers/web/shared/actions" |
||||||
|
) |
||||||
|
|
||||||
|
const ( |
||||||
|
// TODO: Separate secrets from runners when layout is ready
|
||||||
|
tplRepoRunners base.TplName = "repo/settings/actions" |
||||||
|
tplOrgRunners base.TplName = "org/settings/actions" |
||||||
|
tplAdminRunners base.TplName = "admin/actions" |
||||||
|
tplRepoRunnerEdit base.TplName = "repo/settings/runner_edit" |
||||||
|
tplOrgRunnerEdit base.TplName = "org/settings/runners_edit" |
||||||
|
tplAdminRunnerEdit base.TplName = "admin/runners/edit" |
||||||
|
) |
||||||
|
|
||||||
|
type runnersCtx struct { |
||||||
|
OwnerID int64 |
||||||
|
RepoID int64 |
||||||
|
IsRepo bool |
||||||
|
IsOrg bool |
||||||
|
IsAdmin bool |
||||||
|
RunnersTemplate base.TplName |
||||||
|
RunnerEditTemplate base.TplName |
||||||
|
RedirectLink string |
||||||
|
} |
||||||
|
|
||||||
|
func getRunnersCtx(ctx *context.Context) (*runnersCtx, error) { |
||||||
|
if ctx.Data["PageIsRepoSettings"] == true { |
||||||
|
return &runnersCtx{ |
||||||
|
RepoID: ctx.Repo.Repository.ID, |
||||||
|
OwnerID: 0, |
||||||
|
IsRepo: true, |
||||||
|
RunnersTemplate: tplRepoRunners, |
||||||
|
RunnerEditTemplate: tplRepoRunnerEdit, |
||||||
|
RedirectLink: ctx.Repo.RepoLink + "/settings/actions/runners/", |
||||||
|
}, nil |
||||||
|
} |
||||||
|
|
||||||
|
if ctx.Data["PageIsOrgSettings"] == true { |
||||||
|
return &runnersCtx{ |
||||||
|
RepoID: 0, |
||||||
|
OwnerID: ctx.Org.Organization.ID, |
||||||
|
IsOrg: true, |
||||||
|
RunnersTemplate: tplOrgRunners, |
||||||
|
RunnerEditTemplate: tplOrgRunnerEdit, |
||||||
|
RedirectLink: ctx.Org.OrgLink + "/settings/actions/runners/", |
||||||
|
}, nil |
||||||
|
} |
||||||
|
|
||||||
|
if ctx.Data["PageIsAdmin"] == true { |
||||||
|
return &runnersCtx{ |
||||||
|
RepoID: 0, |
||||||
|
OwnerID: 0, |
||||||
|
IsAdmin: true, |
||||||
|
RunnersTemplate: tplAdminRunners, |
||||||
|
RunnerEditTemplate: tplAdminRunnerEdit, |
||||||
|
RedirectLink: setting.AppSubURL + "/admin/actions/runners/", |
||||||
|
}, nil |
||||||
|
} |
||||||
|
|
||||||
|
return nil, errors.New("unable to set Runners context") |
||||||
|
} |
||||||
|
|
||||||
|
// Runners render settings/actions/runners page for repo level
|
||||||
|
func Runners(ctx *context.Context) { |
||||||
|
ctx.Data["PageIsSharedSettingsRunners"] = true |
||||||
|
ctx.Data["Title"] = ctx.Tr("actions.actions") |
||||||
|
ctx.Data["PageType"] = "runners" |
||||||
|
|
||||||
|
rCtx, err := getRunnersCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getRunnersCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
|
||||||
|
page := ctx.FormInt("page") |
||||||
|
if page <= 1 { |
||||||
|
page = 1 |
||||||
|
} |
||||||
|
|
||||||
|
opts := actions_model.FindRunnerOptions{ |
||||||
|
ListOptions: db.ListOptions{ |
||||||
|
Page: page, |
||||||
|
PageSize: 100, |
||||||
|
}, |
||||||
|
Sort: ctx.Req.URL.Query().Get("sort"), |
||||||
|
Filter: ctx.Req.URL.Query().Get("q"), |
||||||
|
} |
||||||
|
if rCtx.IsRepo { |
||||||
|
opts.RepoID = rCtx.RepoID |
||||||
|
opts.WithAvailable = true |
||||||
|
} else if rCtx.IsOrg { |
||||||
|
opts.OwnerID = rCtx.OwnerID |
||||||
|
opts.WithAvailable = true |
||||||
|
} |
||||||
|
actions_shared.RunnersList(ctx, opts) |
||||||
|
|
||||||
|
ctx.HTML(http.StatusOK, rCtx.RunnersTemplate) |
||||||
|
} |
||||||
|
|
||||||
|
// RunnersEdit renders runner edit page for repository level
|
||||||
|
func RunnersEdit(ctx *context.Context) { |
||||||
|
ctx.Data["PageIsSharedSettingsRunners"] = true |
||||||
|
ctx.Data["Title"] = ctx.Tr("actions.runners.edit_runner") |
||||||
|
rCtx, err := getRunnersCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getRunnersCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
|
||||||
|
page := ctx.FormInt("page") |
||||||
|
if page <= 1 { |
||||||
|
page = 1 |
||||||
|
} |
||||||
|
|
||||||
|
actions_shared.RunnerDetails(ctx, page, |
||||||
|
ctx.ParamsInt64(":runnerid"), rCtx.OwnerID, rCtx.RepoID, |
||||||
|
) |
||||||
|
ctx.HTML(http.StatusOK, rCtx.RunnerEditTemplate) |
||||||
|
} |
||||||
|
|
||||||
|
func RunnersEditPost(ctx *context.Context) { |
||||||
|
rCtx, err := getRunnersCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getRunnersCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
actions_shared.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"), |
||||||
|
rCtx.OwnerID, rCtx.RepoID, |
||||||
|
rCtx.RedirectLink+url.PathEscape(ctx.Params(":runnerid"))) |
||||||
|
} |
||||||
|
|
||||||
|
func ResetRunnerRegistrationToken(ctx *context.Context) { |
||||||
|
rCtx, err := getRunnersCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getRunnersCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
actions_shared.RunnerResetRegistrationToken(ctx, rCtx.OwnerID, rCtx.RepoID, rCtx.RedirectLink) |
||||||
|
} |
||||||
|
|
||||||
|
// RunnerDeletePost response for deleting runner
|
||||||
|
func RunnerDeletePost(ctx *context.Context) { |
||||||
|
rCtx, err := getRunnersCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getRunnersCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
actions_shared.RunnerDeletePost(ctx, ctx.ParamsInt64(":runnerid"), rCtx.RedirectLink, rCtx.RedirectLink+url.PathEscape(ctx.Params(":runnerid"))) |
||||||
|
} |
||||||
|
|
||||||
|
func RedirectToDefaultSetting(ctx *context.Context) { |
||||||
|
ctx.Redirect(ctx.Repo.RepoLink + "/settings/actions/runners") |
||||||
|
} |
||||||
@ -0,0 +1,115 @@ |
|||||||
|
// Copyright 2022 The Gitea Authors. All rights reserved.
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
|
package setting |
||||||
|
|
||||||
|
import ( |
||||||
|
"errors" |
||||||
|
"net/http" |
||||||
|
|
||||||
|
"code.gitea.io/gitea/modules/base" |
||||||
|
"code.gitea.io/gitea/modules/context" |
||||||
|
"code.gitea.io/gitea/modules/setting" |
||||||
|
shared "code.gitea.io/gitea/routers/web/shared/secrets" |
||||||
|
) |
||||||
|
|
||||||
|
const ( |
||||||
|
// TODO: Separate secrets from runners when layout is ready
|
||||||
|
tplRepoSecrets base.TplName = "repo/settings/actions" |
||||||
|
tplOrgSecrets base.TplName = "org/settings/actions" |
||||||
|
tplUserSecrets base.TplName = "user/settings/actions" |
||||||
|
) |
||||||
|
|
||||||
|
type secretsCtx struct { |
||||||
|
OwnerID int64 |
||||||
|
RepoID int64 |
||||||
|
IsRepo bool |
||||||
|
IsOrg bool |
||||||
|
IsUser bool |
||||||
|
SecretsTemplate base.TplName |
||||||
|
RedirectLink string |
||||||
|
} |
||||||
|
|
||||||
|
func getSecretsCtx(ctx *context.Context) (*secretsCtx, error) { |
||||||
|
if ctx.Data["PageIsRepoSettings"] == true { |
||||||
|
return &secretsCtx{ |
||||||
|
OwnerID: 0, |
||||||
|
RepoID: ctx.Repo.Repository.ID, |
||||||
|
IsRepo: true, |
||||||
|
SecretsTemplate: tplRepoSecrets, |
||||||
|
RedirectLink: ctx.Repo.RepoLink + "/settings/actions/secrets", |
||||||
|
}, nil |
||||||
|
} |
||||||
|
|
||||||
|
if ctx.Data["PageIsOrgSettings"] == true { |
||||||
|
return &secretsCtx{ |
||||||
|
OwnerID: ctx.ContextUser.ID, |
||||||
|
RepoID: 0, |
||||||
|
IsOrg: true, |
||||||
|
SecretsTemplate: tplOrgSecrets, |
||||||
|
RedirectLink: ctx.Org.OrgLink + "/settings/actions/secrets", |
||||||
|
}, nil |
||||||
|
} |
||||||
|
|
||||||
|
if ctx.Data["PageIsUserSettings"] == true { |
||||||
|
return &secretsCtx{ |
||||||
|
OwnerID: ctx.Doer.ID, |
||||||
|
RepoID: 0, |
||||||
|
IsUser: true, |
||||||
|
SecretsTemplate: tplUserSecrets, |
||||||
|
RedirectLink: setting.AppSubURL + "/user/settings/actions/secrets", |
||||||
|
}, nil |
||||||
|
} |
||||||
|
|
||||||
|
return nil, errors.New("unable to set Secrets context") |
||||||
|
} |
||||||
|
|
||||||
|
func Secrets(ctx *context.Context) { |
||||||
|
ctx.Data["Title"] = ctx.Tr("actions.actions") |
||||||
|
ctx.Data["PageType"] = "secrets" |
||||||
|
ctx.Data["PageIsSharedSettingsSecrets"] = true |
||||||
|
|
||||||
|
sCtx, err := getSecretsCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getSecretsCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
|
||||||
|
if sCtx.IsRepo { |
||||||
|
ctx.Data["DisableSSH"] = setting.SSH.Disabled |
||||||
|
} |
||||||
|
|
||||||
|
shared.SetSecretsContext(ctx, sCtx.OwnerID, sCtx.RepoID) |
||||||
|
if ctx.Written() { |
||||||
|
return |
||||||
|
} |
||||||
|
ctx.HTML(http.StatusOK, sCtx.SecretsTemplate) |
||||||
|
} |
||||||
|
|
||||||
|
func SecretsPost(ctx *context.Context) { |
||||||
|
sCtx, err := getSecretsCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getSecretsCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
shared.PerformSecretsPost( |
||||||
|
ctx, |
||||||
|
sCtx.OwnerID, |
||||||
|
sCtx.RepoID, |
||||||
|
sCtx.RedirectLink, |
||||||
|
) |
||||||
|
} |
||||||
|
|
||||||
|
func SecretsDelete(ctx *context.Context) { |
||||||
|
sCtx, err := getSecretsCtx(ctx) |
||||||
|
if err != nil { |
||||||
|
ctx.ServerError("getSecretsCtx", err) |
||||||
|
return |
||||||
|
} |
||||||
|
shared.PerformSecretsDelete( |
||||||
|
ctx, |
||||||
|
sCtx.OwnerID, |
||||||
|
sCtx.RepoID, |
||||||
|
sCtx.RedirectLink, |
||||||
|
) |
||||||
|
} |
||||||
@ -1,48 +0,0 @@ |
|||||||
// Copyright 2022 The Gitea Authors. All rights reserved.
|
|
||||||
// SPDX-License-Identifier: MIT
|
|
||||||
|
|
||||||
package repo |
|
||||||
|
|
||||||
import ( |
|
||||||
"net/http" |
|
||||||
|
|
||||||
"code.gitea.io/gitea/modules/base" |
|
||||||
"code.gitea.io/gitea/modules/context" |
|
||||||
"code.gitea.io/gitea/modules/setting" |
|
||||||
shared "code.gitea.io/gitea/routers/web/shared/secrets" |
|
||||||
) |
|
||||||
|
|
||||||
const ( |
|
||||||
tplSecrets base.TplName = "repo/settings/secrets" |
|
||||||
) |
|
||||||
|
|
||||||
func Secrets(ctx *context.Context) { |
|
||||||
ctx.Data["Title"] = ctx.Tr("secrets.secrets") |
|
||||||
ctx.Data["PageIsSettingsSecrets"] = true |
|
||||||
ctx.Data["DisableSSH"] = setting.SSH.Disabled |
|
||||||
|
|
||||||
shared.SetSecretsContext(ctx, 0, ctx.Repo.Repository.ID) |
|
||||||
if ctx.Written() { |
|
||||||
return |
|
||||||
} |
|
||||||
|
|
||||||
ctx.HTML(http.StatusOK, tplSecrets) |
|
||||||
} |
|
||||||
|
|
||||||
func SecretsPost(ctx *context.Context) { |
|
||||||
shared.PerformSecretsPost( |
|
||||||
ctx, |
|
||||||
0, |
|
||||||
ctx.Repo.Repository.ID, |
|
||||||
ctx.Repo.RepoLink+"/settings/secrets", |
|
||||||
) |
|
||||||
} |
|
||||||
|
|
||||||
func DeleteSecret(ctx *context.Context) { |
|
||||||
shared.PerformSecretsDelete( |
|
||||||
ctx, |
|
||||||
0, |
|
||||||
ctx.Repo.Repository.ID, |
|
||||||
ctx.Repo.RepoLink+"/settings/secrets", |
|
||||||
) |
|
||||||
} |
|
||||||
@ -1,5 +1,7 @@ |
|||||||
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin runners")}} |
{{template "admin/layout_head" (dict "ctxData" . "pageClass" "admin actions")}} |
||||||
<div class="admin-setting-content"> |
<div class="admin-setting-content"> |
||||||
|
{{if eq .PageType "runners"}} |
||||||
{{template "shared/actions/runner_list" .}} |
{{template "shared/actions/runner_list" .}} |
||||||
|
{{end}} |
||||||
</div> |
</div> |
||||||
{{template "admin/layout_footer" .}} |
{{template "admin/layout_footer" .}} |
||||||
@ -1,5 +1,9 @@ |
|||||||
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings runners")}} |
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings actions")}} |
||||||
<div class="org-setting-content"> |
<div class="org-setting-content"> |
||||||
|
{{if eq .PageType "runners"}} |
||||||
{{template "shared/actions/runner_list" .}} |
{{template "shared/actions/runner_list" .}} |
||||||
|
{{else if eq .PageType "secrets"}} |
||||||
|
{{template "shared/secrets/add_list" .}} |
||||||
|
{{end}} |
||||||
</div> |
</div> |
||||||
{{template "org/settings/layout_footer" .}} |
{{template "org/settings/layout_footer" .}} |
||||||
@ -1,5 +0,0 @@ |
|||||||
{{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings secrets")}} |
|
||||||
<div class="org-setting-content"> |
|
||||||
{{template "shared/secrets/add_list" .}} |
|
||||||
</div> |
|
||||||
{{template "org/settings/layout_footer" .}} |
|
||||||
@ -0,0 +1,9 @@ |
|||||||
|
{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings actions")}} |
||||||
|
<div class="repo-setting-content"> |
||||||
|
{{if eq .PageType "runners"}} |
||||||
|
{{template "shared/actions/runner_list" .}} |
||||||
|
{{else if eq .PageType "secrets"}} |
||||||
|
{{template "shared/secrets/add_list" .}} |
||||||
|
{{end}} |
||||||
|
</div> |
||||||
|
{{template "repo/settings/layout_footer" .}} |
||||||
@ -1,5 +0,0 @@ |
|||||||
{{template "repo/settings/layout_head" (dict "ctxData" . "pageClass" "repository settings runners")}} |
|
||||||
<div class="repo-setting-content"> |
|
||||||
{{template "shared/actions/runner_list" .}} |
|
||||||
</div> |
|
||||||
{{template "repo/settings/layout_footer" .}} |
|
||||||
@ -1,6 +1,8 @@ |
|||||||
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings secrets")}} |
{{template "user/settings/layout_head" (dict "ctxData" . "pageClass" "user settings actions")}} |
||||||
<div class="user-setting-content"> |
<div class="user-setting-content"> |
||||||
|
{{if eq .PageType "secrets"}} |
||||||
{{template "shared/secrets/add_list" .}} |
{{template "shared/secrets/add_list" .}} |
||||||
|
{{end}} |
||||||
</div> |
</div> |
||||||
|
|
||||||
{{template "user/settings/layout_footer" .}} |
{{template "user/settings/layout_footer" .}} |
||||||
Loading…
Reference in new issue