chore: trim unused runtime helpers

Author: MarcStdt

apps/druid/adapters/cli/output.go

@@ -520,14 +520,6 @@ func dataRootHash(dataRoot string) string {
 	return hex.EncodeToString(hash[:])[:10]
 }
 
-func commandProcedureName(commandName string, idx int, procedure *domain.Procedure) string {
-	procedureName := fmt.Sprintf("%s.%d", commandName, idx)
-	if procedure != nil && procedure.Id != nil {
-		procedureName = *procedure.Id
-	}
-	return procedureName
-}
-
 func runtimeConsoleID(scrollID string, procedureName string) string {
 	if scrollID == "" {
 		return procedureName

internal/runtime/docker/backend.go

@@ -961,14 +961,6 @@ func portsByName(ports []domain.Port) map[string]domain.Port {
 	return result
 }
 
-func commandProcedureName(commandName string, idx int, procedure *domain.Procedure) string {
-	procedureName := fmt.Sprintf("%s.%d", commandName, idx)
-	if procedure != nil && procedure.Id != nil {
-		procedureName = *procedure.Id
-	}
-	return procedureName
-}
-
 func runtimeConsoleID(scrollID string, procedureName string) string {
 	if scrollID == "" {
 		return procedureName

internal/runtime/kubernetes/backend.go

@@ -53,7 +53,9 @@ func TestDockerBackendCLIComplexLifecycle(t *testing.T) {
 
 	e2e.RunClient(t, bins, socket, "run", created.ID, "record")
 	dataRoot := filepath.Join(stateDir, "scrolls", created.ID, "data")
-	assertFileContains(t, filepath.Join(dataRoot, "finite.txt"), "finite-ok")
+	if got := readFile(t, filepath.Join(dataRoot, "finite.txt")); !strings.Contains(got, "finite-ok") {
+		t.Fatalf("finite file = %q, want finite-ok", got)
+	}
 	recordEnv := e2e.ParseEnv(readFile(t, filepath.Join(dataRoot, "record-env.txt")))
 	e2e.AssertRuntimeEnv(t, recordEnv, fixture, "docker", created.ID)
 	if recordEnv["USER_ENV"] != "finite" {
@@ -84,14 +86,6 @@ func assertPortBound(t *testing.T, statuses []e2e.RuntimePortStatus, fixture e2e
 	t.Fatalf("http port for %s not found in %#v", fixture.ServeProc, statuses)
 }
 
-func assertFileContains(t *testing.T, path string, want string) {
-	t.Helper()
-	got := readFile(t, path)
-	if !strings.Contains(got, want) {
-		t.Fatalf("%s = %q, want to contain %q", path, got, want)
-	}
-}
-
 func readFile(t *testing.T, path string) string {
 	t.Helper()
 	data, err := os.ReadFile(path)

test/integration/docker/docker_cli_test.go

@@ -25,24 +25,20 @@ type Binaries struct {
 }
 
 type Fixture struct {
-	Dir           string
-	Name          string
-	ServeProc     string
-	RecordProc    string
-	Port          int
-	RouteHost     string
-	RouteURL      string
-	RoutePort     int
-	RoutingFile   string
-	Assignment    string
-	ScrollRootRef string
+	Dir         string
+	Name        string
+	ServeProc   string
+	RecordProc  string
+	Port        int
+	RouteHost   string
+	RouteURL    string
+	RoutePort   int
+	RoutingFile string
 }
 
 type RuntimeScroll struct {
-	ID         string `json:"id"`
-	DataRoot   string `json:"data_root"`
-	ScrollName string `json:"scroll_name"`
-	Status     string `json:"status"`
+	ID     string `json:"id"`
+	Status string `json:"status"`
 }
 
 type RuntimePortStatus struct {
@@ -51,14 +47,11 @@ type RuntimePortStatus struct {
 	Port      int    `json:"port"`
 	Bound     bool   `json:"bound"`
 	HostPort  int    `json:"host_port"`
-	Source    string `json:"source"`
 }
 
 type RuntimeRoutingTarget struct {
-	Name        string `json:"name"`
 	Procedure   string `json:"procedure"`
 	PortName    string `json:"port_name"`
-	Port        int    `json:"port"`
 	Namespace   string `json:"namespace"`
 	ServiceName string `json:"service_name"`
 	ServicePort int    `json:"service_port"`
@@ -289,7 +282,6 @@ commands:
 		RouteURL:    routeURL,
 		RoutePort:   routePort,
 		RoutingFile: routingFile,
-		Assignment:  serveProc + "-http",
 	}
 }
 

test/integration/internal/e2e/harness.go

@@ -26,7 +26,6 @@ func TestKubernetesBackendCLIComplexLifecycle(t *testing.T) {
 	ref := fmt.Sprintf("k8s://%s/%s", namespace, pvc)
 	name := "k8s-cli-" + suffix
 	fixture := e2e.WriteFixture(t, filepath.Join(t.TempDir(), "scroll"), name, port, routePort)
-	fixture.ScrollRootRef = ref
 
 	e2e.Run(t, "kubectl", "create", "namespace", namespace)
 	t.Cleanup(func() {
@@ -94,12 +93,12 @@ func TestKubernetesBackendCLIComplexLifecycle(t *testing.T) {
 	if stopped.Status != "stopped" {
 		t.Fatalf("stopped status = %s, want stopped", stopped.Status)
 	}
-	waitKubernetesWorkloadsGone(t, namespace, pvc)
+	waitKubernetesResourcesGone(t, namespace, pvc, "statefulset,job,pod")
 	deleted := e2e.RunClient(t, bins, socket, "delete", created.ID)
 	if !strings.Contains(deleted, `"status": "deleted"`) {
 		t.Fatalf("delete response = %s, want deleted status", deleted)
 	}
-	waitKubernetesServicesGone(t, namespace, pvc)
+	waitKubernetesResourcesGone(t, namespace, pvc, "service")
 }
 
 func requireKubernetes(t *testing.T) {
@@ -313,16 +312,6 @@ func kubectlOutput(args ...string) (string, error) {
 	return string(out), err
 }
 
-func waitKubernetesWorkloadsGone(t *testing.T, namespace string, pvc string) {
-	t.Helper()
-	waitKubernetesResourcesGone(t, namespace, pvc, "statefulset,job,pod")
-}
-
-func waitKubernetesServicesGone(t *testing.T, namespace string, pvc string) {
-	t.Helper()
-	waitKubernetesResourcesGone(t, namespace, pvc, "service")
-}
-
 func waitKubernetesResourcesGone(t *testing.T, namespace string, pvc string, resource string) {
 	t.Helper()
 	selector := "app.kubernetes.io/managed-by=druid,druid.gg/scroll-id=" + pvc