network-tunnel: retain last logged error of tunnel and bubble up

go/network-tunnel/network_tunnel.go

@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"syscall"
 
+	cerrors "github.com/estuary/connectors/go/connector-errors"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -112,7 +113,7 @@ func (t *SshTunnel) Start() error {
 		// an error that we would like to surface to the user without logging anything further
 		// ourselves
 		if err == io.EOF {
-			os.Exit(1)
+			return cerrors.NewTransparentError(err)
 		}
 		return fmt.Errorf("reading READY signal from network-tunnel: %w", err)
 	} else if !bytes.Equal(readyBuf, ready) {

materialize-elasticsearch/driver.go

@@ -240,7 +240,7 @@ func (c config) toClient(disableRetry bool) (*client, error) {
 		var tunnel = sshConfig.CreateTunnel()
 
 		if err := tunnel.Start(); err != nil {
-			return nil, fmt.Errorf("error starting network tunnel: %w", err)
+			return nil, err
 		}
 
 		// If SSH Tunnel is configured, we are going to create a tunnel from localhost:9200 to

materialize-mongodb/driver.go

@@ -44,7 +44,7 @@ func (d *driver) connect(ctx context.Context, cfg config) (*mongo.Client, error)
 		var tunnel = sshConfig.CreateTunnel()
 
 		if err := tunnel.Start(); err != nil {
-			return nil, fmt.Errorf("error starting network tunnel: %w", err)
+			return nil, err
 		}
 	}
 

materialize-mysql/driver.go

@@ -245,7 +245,7 @@ func newMysqlDriver() *sql.Driver {
 				// FIXME/question: do we need to shut down the tunnel manually if it is a child process?
 				// at the moment tunnel.Stop is not being called anywhere, but if the connector shuts down, the child process also shuts down.
 				if err := tunnel.Start(); err != nil {
-					return fmt.Errorf("error starting network tunnel: %w", err)
+					return err
 				}
 			}
 

materialize-postgres/driver.go

@@ -203,7 +203,7 @@ func newPostgresDriver() *sql.Driver {
 				// FIXME/question: do we need to shut down the tunnel manually if it is a child process?
 				// at the moment tunnel.Stop is not being called anywhere, but if the connector shuts down, the child process also shuts down.
 				if err := tunnel.Start(); err != nil {
-					return fmt.Errorf("error starting network tunnel: %w", err)
+					return err
 				}
 			}
 

materialize-redshift/driver.go

@@ -210,7 +210,7 @@ func newRedshiftDriver() *sql.Driver {
 				var tunnel = sshConfig.CreateTunnel()
 
 				if err := tunnel.Start(); err != nil {
-					return fmt.Errorf("error starting network tunnel: %w", err)
+					return err
 				}
 			}
 

source-mongodb/main.go

@@ -228,7 +228,7 @@ func (d *driver) Connect(ctx context.Context, cfg config) (*mongo.Client, error)
 		var tunnel = sshConfig.CreateTunnel()
 
 		if err := tunnel.Start(); err != nil {
-			return nil, fmt.Errorf("error starting network tunnel: %w", err)
+			return nil, err
 		}
 	} else if isDocDB {
 		return nil, fmt.Errorf("the provided address %q appears to be for Amazon DocumentDB, which requires an SSH tunnel configuration", cfg.Address)

source-mysql/main.go

@@ -75,7 +75,7 @@ func connectMySQL(ctx context.Context, name string, cfg json.RawMessage) (sqlcap
 		// FIXME/question: do we need to shut down the tunnel manually if it is a child process?
 		// at the moment tunnel.Stop is not being called anywhere, but if the connector shuts down, the child process also shuts down.
 		if err := tunnel.Start(); err != nil {
-			return nil, fmt.Errorf("error starting network tunnel: %w", err)
+			return nil, err
 		}
 	}
 

source-oracle/main.go

@@ -73,7 +73,7 @@ func connectOracle(ctx context.Context, name string, cfg json.RawMessage) (sqlca
 		db.tunnel = sshConfig.CreateTunnel()
 
 		if err := db.tunnel.Start(); err != nil {
-			return nil, fmt.Errorf("error starting network tunnel: %w", err)
+			return nil, err
 		}
 	}
 

source-postgres/main.go

@@ -72,7 +72,7 @@ func connectPostgres(ctx context.Context, name string, cfg json.RawMessage) (sql
 		// FIXME/question: do we need to shut down the tunnel manually if it is a child process?
 		// at the moment tunnel.Stop is not being called anywhere, but if the connector shuts down, the child process also shuts down.
 		if err := tunnel.Start(); err != nil {
-			return nil, fmt.Errorf("error starting network tunnel: %w", err)
+			return nil, err
 		}
 	}
 

source-sqlserver/main.go

@@ -179,7 +179,7 @@ func connectSQLServer(ctx context.Context, name string, cfg json.RawMessage) (sq
 		// FIXME/question: do we need to shut down the tunnel manually if it is a child process?
 		// at the moment tunnel.Stop is not being called anywhere, but if the connector shuts down, the child process also shuts down.
 		if err := tunnel.Start(); err != nil {
-			return nil, fmt.Errorf("error starting network tunnel: %w", err)
+			return nil, err
 		}
 	}