Revert legacy support for jetstream:// scheme

Existing deployments using this scheme will effectively ignore the
embedded server options.

Signed-off-by: Byron Ruth <byron@nats.io>

pkg/drivers/nats/nats.go

@@ -115,6 +115,16 @@ type JSValue struct {
 // New return an implementation of server.Backend using NATS + JetStream.
 // See the `examples/nats.md` file for examples of connection strings.
 func New(ctx context.Context, connection string, tlsInfo tls.Config) (server.Backend, error) {
+	return newBackend(ctx, connection, tlsInfo, false)
+}
+
+// NewLegacy return an implementation of server.Backend using NATS + JetStream
+// with legacy jetstream:// behavior, ignoring the embedded server.
+func NewLegacy(ctx context.Context, connection string, tlsInfo tls.Config) (server.Backend, error) {
+	return newBackend(ctx, connection, tlsInfo, true)
+}
+
+func newBackend(ctx context.Context, connection string, tlsInfo tls.Config, legacy bool) (server.Backend, error) {
 	config, err := parseConnection(connection, tlsInfo)
 	if err != nil {
 		return nil, err
@@ -123,7 +133,7 @@ func New(ctx context.Context, connection string, tlsInfo tls.Config) (server.Bac
 	nopts := append(config.clientOptions, nats.Name("kine using bucket: "+config.bucket))
 
 	// Run an embedded server if available and not disabled.
-	if natsserver.Embedded && !config.noEmbed {
+	if !legacy && natsserver.Embedded && !config.noEmbed {
 		logrus.Infof("using an embedded NATS server")
 
 		ns, err := natsserver.New(&natsserver.Config{

pkg/endpoint/endpoint.go

@@ -247,7 +247,9 @@ func getKineStorageBackend(ctx context.Context, driver, dsn string, cfg Config)
 		backend, err = pgsql.New(ctx, dsn, cfg.BackendTLSConfig, cfg.ConnectionPoolConfig, cfg.MetricsRegisterer)
 	case MySQLBackend:
 		backend, err = mysql.New(ctx, dsn, cfg.BackendTLSConfig, cfg.ConnectionPoolConfig, cfg.MetricsRegisterer)
-	case NATSBackend, JetStreamBackend:
+	case JetStreamBackend:
+		backend, err = nats.NewLegacy(ctx, dsn, cfg.BackendTLSConfig)
+	case NATSBackend:
 		backend, err = nats.New(ctx, dsn, cfg.BackendTLSConfig)
 	default:
 		return false, nil, fmt.Errorf("storage backend is not defined")