Skip to content

Commit 5d0bb25

Browse files
committed
TUN-7354: Don't warn for empty ingress rules when using --token
1 parent c51b651 commit 5d0bb25

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ingress/ingress.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func ParseIngress(conf *config.Configuration) (Ingress, error) {
9494
// ParseIngressFromConfigAndCLI will parse the configuration rules from config files for ingress
9595
// rules and then attempt to parse CLI for ingress rules.
9696
// Will always return at least one valid ingress rule. If none are provided by the user, the default
97-
// will be to return 502 status code for all incoming requests.
97+
// will be to return 503 status code for all incoming requests.
9898
func ParseIngressFromConfigAndCLI(conf *config.Configuration, c *cli.Context, log *zerolog.Logger) (Ingress, error) {
9999
// Attempt to parse ingress rules from configuration
100100
ingressRules, err := ParseIngress(conf)
@@ -110,7 +110,11 @@ func ParseIngressFromConfigAndCLI(conf *config.Configuration, c *cli.Context, lo
110110
// --bastion for ssh bastion service
111111
ingressRules, err = parseCLIIngress(c, false)
112112
if errors.Is(err, ErrNoIngressRulesCLI) {
113-
log.Warn().Msgf(ErrNoIngressRulesCLI.Error())
113+
// Only log a warning if the tunnel is not a remotely managed tunnel and the config
114+
// will be loaded after connecting.
115+
if !c.IsSet("token") {
116+
log.Warn().Msgf(ErrNoIngressRulesCLI.Error())
117+
}
114118
return newDefaultOrigin(c, log), nil
115119
}
116120
if err != nil {

0 commit comments

Comments
 (0)