curben
/
cloudflared-mirror
mirror of https://github.com/cloudflare/cloudflared.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

TUN-7354: Don't warn for empty ingress rules when using --token

This commit is contained in:
Devin Carr 2023-04-06 10:08:02 -07:00
parent c51b651afb
commit 5d0bb25572
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ingress/ingress.go
View File

@ -94,7 +94,7 @@ func ParseIngress(conf *config.Configuration) (Ingress, error) {
// ParseIngressFromConfigAndCLI will parse the configuration rules from config files for ingress // ParseIngressFromConfigAndCLI will parse the configuration rules from config files for ingress
// rules and then attempt to parse CLI for ingress rules. // rules and then attempt to parse CLI for ingress rules.
// Will always return at least one valid ingress rule. If none are provided by the user, the default // Will always return at least one valid ingress rule. If none are provided by the user, the default
// will be to return 502 status code for all incoming requests. // will be to return 503 status code for all incoming requests.
func ParseIngressFromConfigAndCLI(conf *config.Configuration, c *cli.Context, log *zerolog.Logger) (Ingress, error) { func ParseIngressFromConfigAndCLI(conf *config.Configuration, c *cli.Context, log *zerolog.Logger) (Ingress, error) {
// Attempt to parse ingress rules from configuration // Attempt to parse ingress rules from configuration
ingressRules, err := ParseIngress(conf) ingressRules, err := ParseIngress(conf)
@ -110,7 +110,11 @@ func ParseIngressFromConfigAndCLI(conf *config.Configuration, c *cli.Context, lo
// --bastion for ssh bastion service // --bastion for ssh bastion service
ingressRules, err = parseCLIIngress(c, false) ingressRules, err = parseCLIIngress(c, false)
if errors.Is(err, ErrNoIngressRulesCLI) { if errors.Is(err, ErrNoIngressRulesCLI) {
// Only log a warning if the tunnel is not a remotely managed tunnel and the config
// will be loaded after connecting.
if !c.IsSet("token") {
log.Warn().Msgf(ErrNoIngressRulesCLI.Error()) log.Warn().Msgf(ErrNoIngressRulesCLI.Error())
}
return newDefaultOrigin(c, log), nil return newDefaultOrigin(c, log), nil
} }
if err != nil { if err != nil {