mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-01 14:59:06 +00:00
63a401ac40
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>
115 lines
2.6 KiB
Go
115 lines
2.6 KiB
Go
// 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,
|
|
)
|
|
}
|