mirror of
https://github.com/fumiama/terasu-cloudflared.git
synced 2026-06-05 09:00:23 +08:00
9018ee5d5e
This change has two parts: 1. Update to newer version of the urfave/cli fork that correctly sets flag value along the context hierarchy while respecting config file overide behavior of the most specific instance of the flag. 2. Redefine --credentials-file flag so that create and delete subcommand don't use value from the config file.
40 lines
927 B
Go
40 lines
927 B
Go
package cliutil
|
|
|
|
import (
|
|
"github.com/urfave/cli/v2"
|
|
"github.com/urfave/cli/v2/altsrc"
|
|
|
|
"github.com/cloudflare/cloudflared/config"
|
|
"github.com/cloudflare/cloudflared/logger"
|
|
)
|
|
|
|
func Action(actionFunc cli.ActionFunc) cli.ActionFunc {
|
|
return WithErrorHandler(actionFunc)
|
|
}
|
|
|
|
func ConfiguredAction(actionFunc cli.ActionFunc) cli.ActionFunc {
|
|
return WithErrorHandler(func(c *cli.Context) error {
|
|
if err := setFlagsFromConfigFile(c); err != nil {
|
|
return err
|
|
}
|
|
return actionFunc(c)
|
|
})
|
|
}
|
|
|
|
func setFlagsFromConfigFile(c *cli.Context) error {
|
|
const errorExitCode = 1
|
|
log := logger.CreateLoggerFromContext(c, logger.EnableTerminalLog)
|
|
inputSource, err := config.ReadConfigFile(c, log)
|
|
if err != nil {
|
|
if err == config.ErrNoConfigFile {
|
|
return nil
|
|
}
|
|
return cli.Exit(err, errorExitCode)
|
|
}
|
|
|
|
if err := altsrc.ApplyInputSource(c, inputSource); err != nil {
|
|
return cli.Exit(err, errorExitCode)
|
|
}
|
|
return nil
|
|
}
|