mirror of
https://gitea.com/gitea/tea.git
synced 2026-04-05 16:03:32 +02:00
replace log.Fatal/os.Exit with error returns (#941)
* Use stdlib encoders * Reduce some duplication * Remove global pagination state * Dedupe JSON detail types * Bump golangci-lint Reviewed-on: https://gitea.com/gitea/tea/pulls/941 Co-authored-by: techknowlogick <techknowlogick@gitea.com> Co-committed-by: techknowlogick <techknowlogick@gitea.com>
This commit is contained in:
committed by
techknowlogick
parent
21881525a8
commit
b05e03416b
@@ -59,7 +59,10 @@ func runWebhooksCreate(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
return fmt.Errorf("webhook URL is required")
|
||||
}
|
||||
|
||||
c := context.InitCommand(cmd)
|
||||
c, err := context.InitCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
client := c.Login.Client()
|
||||
|
||||
webhookType := gitea.HookType(cmd.String("type"))
|
||||
@@ -95,7 +98,6 @@ func runWebhooksCreate(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
}
|
||||
|
||||
var hook *gitea.Hook
|
||||
var err error
|
||||
if c.IsGlobal {
|
||||
return fmt.Errorf("global webhooks not yet supported in this version")
|
||||
} else if len(c.Org) > 0 {
|
||||
|
||||
@@ -37,7 +37,10 @@ func runWebhooksDelete(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
return fmt.Errorf("webhook ID is required")
|
||||
}
|
||||
|
||||
c := context.InitCommand(cmd)
|
||||
c, err := context.InitCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
client := c.Login.Client()
|
||||
|
||||
webhookID, err := utils.ArgToIndex(cmd.Args().First())
|
||||
|
||||
@@ -30,26 +30,27 @@ var CmdWebhooksList = cli.Command{
|
||||
|
||||
// RunWebhooksList list webhooks
|
||||
func RunWebhooksList(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
c := context.InitCommand(cmd)
|
||||
c, err := context.InitCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
client := c.Login.Client()
|
||||
|
||||
var hooks []*gitea.Hook
|
||||
var err error
|
||||
if c.IsGlobal {
|
||||
return fmt.Errorf("global webhooks not yet supported in this version")
|
||||
} else if len(c.Org) > 0 {
|
||||
hooks, _, err = client.ListOrgHooks(c.Org, gitea.ListHooksOptions{
|
||||
ListOptions: flags.GetListOptions(),
|
||||
ListOptions: flags.GetListOptions(cmd),
|
||||
})
|
||||
} else {
|
||||
hooks, _, err = client.ListRepoHooks(c.Owner, c.Repo, gitea.ListHooksOptions{
|
||||
ListOptions: flags.GetListOptions(),
|
||||
ListOptions: flags.GetListOptions(cmd),
|
||||
})
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
print.WebhooksList(hooks, c.Output)
|
||||
return nil
|
||||
return print.WebhooksList(hooks, c.Output)
|
||||
}
|
||||
|
||||
@@ -61,7 +61,10 @@ func runWebhooksUpdate(ctx stdctx.Context, cmd *cli.Command) error {
|
||||
return fmt.Errorf("webhook ID is required")
|
||||
}
|
||||
|
||||
c := context.InitCommand(cmd)
|
||||
c, err := context.InitCommand(cmd)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
client := c.Login.Client()
|
||||
|
||||
webhookID, err := utils.ArgToIndex(cmd.Args().First())
|
||||
|
||||
Reference in New Issue
Block a user