fumiama/terasu-cloudflared
1
0
Fork 0
mirror of https://github.com/fumiama/terasu-cloudflared.git synced 2026-06-08 12:00:36 +08:00
Code Activity

TUN-3475: Unify config file handling with typed config for new fields

Browse Source
This commit is contained in:
Igor Postelnik
2020-10-19 17:33:40 -05:00
parent 051908aaef
commit eaf03305bd
8 changed files with 333 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
cmd/cloudflared/tunnel/cmd.go
View File

@@ -206,10 +206,8 @@ func TunnelCommand(c *cli.Context) error {
if name := c.String("name"); name != "" { // Start a named tunnel
return runAdhocNamedTunnel(sc, name)
}
if ref, err := sc.getConfigFileTunnelRef(); err != nil {
return err
} else if ref != "" {
return runNamedTunnel(sc, ref)
if ref := config.GetConfiguration().TunnelID; ref != "" {
return fmt.Errorf("Use `cloudflared tunnel run` to start tunnel %s", ref)
}
// Start a classic tunnel
@@ -312,7 +310,7 @@ func StartServer(
connectedSignal := signal.New(make(chan struct{}))
dnsReadySignal := make(chan struct{})
if c.String("config") == "" {
if config.GetConfiguration().Source() == "" {
log.Infof(config.ErrNoConfigFile.Error())
}
@@ -576,7 +574,7 @@ func SetFlagsFromConfigFile(c *cli.Context) error {
return cliutil.PrintLoggerSetupError("error setting up logger", err)
}
inputSource, err := config.GetConfigFileSource(c, log)
inputSource, err := config.ReadConfigFile(c, log)
if err != nil {
if err == config.ErrNoConfigFile {
return nil
@@ -1269,7 +1267,16 @@ func buildRuleCommand() *cli.Command {
// Validates the ingress rules in the cloudflared config file
func ValidateCommand(c *cli.Context) error {
_, err := config.ReadRules(c)
logger, err := createLogger(c, false, false)
if err != nil {
return err
}
configFile, err := config.ReadConfigFile(c, logger)
if err != nil {
return err
}
fmt.Println("Validating rules from", configFile.Source())
_, err = config.ReadIngressRules(configFile)
if err != nil {
return errors.Wrap(err, "Validation failed")
}
@@ -1282,7 +1289,15 @@ func ValidateCommand(c *cli.Context) error {
// Checks which ingress rule matches the given URL.
func RuleCommand(c *cli.Context) error {
rules, err := config.ReadRules(c)
logger, err := createLogger(c, false, false)
if err != nil {
return err
}
configFile, err := config.ReadConfigFile(c, logger)
if err != nil {
return err
}
rules, err := config.ReadIngressRules(configFile)
if err != nil {
return err
}