TUN-3555: Single origin service should default to localhost:8080

adamchalmers · adamchalmers · commit 029f7e03783c · 2020-11-17T23:12:32.000Z
diff --git a/cmd/cloudflared/tunnel/cmd.go b/cmd/cloudflared/tunnel/cmd.go
@@ -369,6 +369,7 @@ func StartServer(
 
 	tunnelConfig, ingressRules, err := prepareTunnelConfig(c, buildInfo, version, generalLogger, transportLogger, namedTunnel, isUIEnabled)
 	if err != nil {
+		generalLogger.Errorf("Couldn't start tunnel: %v", err)
 		return err
 	}
 
diff --git a/ingress/ingress.go b/ingress/ingress.go
@@ -103,7 +103,8 @@ func parseSingleOriginService(c *cli.Context, allowURLFromArgs bool) (OriginServ
 		}
 		return &unixSocketPath{path: path}, nil
 	}
-	return nil, errors.New("You must either set ingress rules in your config file, or use --url, or use --unix-socket")
+	u, err := url.Parse("http://localhost:8080")
+	return &localService{URL: u, RootURL: u}, err
 }
 
 // IsEmpty checks if there are any ingress rules.

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ func StartServer(`
`369`	`369`
`370`	`370`	`tunnelConfig, ingressRules, err := prepareTunnelConfig(c, buildInfo, version, generalLogger, transportLogger, namedTunnel, isUIEnabled)`
`371`	`371`	`if err != nil {`
	`372`	`+ generalLogger.Errorf("Couldn't start tunnel: %v", err)`
`372`	`373`	`return err`
`373`	`374`	`}`
`374`	`375`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,8 @@ func parseSingleOriginService(c *cli.Context, allowURLFromArgs bool) (OriginServ`
`103`	`103`	`}`
`104`	`104`	`return &unixSocketPath{path: path}, nil`
`105`	`105`	`}`
`106`		`- return nil, errors.New("You must either set ingress rules in your config file, or use --url, or use --unix-socket")`
	`106`	`+ u, err := url.Parse("http://localhost:8080")`
	`107`	`+ return &localService{URL: u, RootURL: u}, err`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`// IsEmpty checks if there are any ingress rules.`