v0.31.0 refinements

cmd/lw/reload_test.go

@@ -11,6 +11,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/lixenwraith/logwisp/internal/authz"
 	"github.com/lixenwraith/logwisp/internal/plugin"
 	"github.com/lixenwraith/logwisp/internal/session"
 	"github.com/lixenwraith/logwisp/internal/testutil"
@@ -60,6 +61,25 @@ func TestShippedConfigurationBuildsWithCheckedPluginDecoder(t *testing.T) {
 	svc.Shutdown() // A later reload failure or process exit can close it again.
 }
 
+// Once the first service is built a reload reads no descriptor, pipe or
+// terminal, which a console source may be reading
+func TestStartupEndsWithTheFirstService(t *testing.T) {
+	testLogger(t)
+	path := filepath.Join(t.TempDir(), "empty.toml")
+	testutil.WriteFile(t, path, "")
+	svc, cancel, err := bootstrapInitial(context.Background(), loadTestConfig(t, path, "--source", "null", "--sink", "null"))
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer svc.Shutdown()
+	if cancel != nil {
+		defer cancel()
+	}
+	if _, err := authz.ReadPassword(os.DevNull, "late", false); err == nil || !strings.Contains(err.Error(), "only at startup") {
+		t.Fatalf("a device after the first service: %v", err)
+	}
+}
+
 func TestInvalidReloadLeavesStatusReporterRunning(t *testing.T) {
 	testLogger(t)
 	path := filepath.Join(t.TempDir(), "config.toml")
@@ -124,8 +144,8 @@ func TestCheckBuildsWithoutStarting(t *testing.T) {
 	dir := t.TempDir()
 	path, out := filepath.Join(dir, "empty.toml"), filepath.Join(dir, "out")
 	testutil.WriteFile(t, path, "")
-	if code := checkConfig(loadTestConfig(t, path, "--source", "null", "--sink", "http,host=127.0.0.1,port=15862",
-		"--sink", "file,name=check,directory="+out)); code != 0 {
+	if code := checkConfig(loadTestConfig(t, path, "--source", "null", "--sink", "http:host=127.0.0.1,port=15862",
+		"--sink", "file:name=check,directory="+out)); code != 0 {
 		t.Fatalf("valid configuration: exit %d", code)
 	}
 	ln, err := net.Listen("tcp4", "127.0.0.1:15862")
@@ -138,7 +158,7 @@ func TestCheckBuildsWithoutStarting(t *testing.T) {
 	}
 	missing := filepath.Join(dir, "missing")
 	if code := checkConfig(loadTestConfig(t, path, "--source", "null", "--sink",
-		"http,port=15862,tls.enabled=true,tls.cert_file="+missing+",tls.key_file="+missing)); code != 1 {
+		"http:port=15862,tls.enabled=true,tls.cert_file="+missing+",tls.key_file="+missing)); code != 1 {
 		t.Fatalf("listener TLS without its certificate file: exit %d, want 1", code)
 	}
 }