feat: introduce the new initd

Author: lucas-jacques

.goreleaser.yaml

@@ -17,3 +17,19 @@ builds:
       - linux
     goarch:
       - amd64
+  - id: jailer
+    env: [CGO_ENABLED=0]
+    main: ./cmd/jailer/jailer.go
+    binary: jailer
+    goos:
+      - linux
+    goarch:
+      - amd64
+  - id: initd
+    env: [CGO_ENABLED=0]
+    main: ./cmd/initd/initd.go
+    binary: initd
+    goos:
+      - linux
+    goarch:
+      - amd64

Makefile

@@ -5,7 +5,8 @@ run-api:
 	air
 build-ravel:
 	CGO_ENABLED=0 go build -o bin/ravel cmd/ravel/ravel.go
-
+build-initd:
+	CGO_ENABLED=0 go build -o bin/initd cmd/initd/initd.go
 build-jailer:
 	CGO_ENABLED=0 go build -o bin/jailer cmd/jailer/jailer.go
 

api/initd/initd.go

@@ -0,0 +1,25 @@
+package initd
+
+type FSEntry struct {
+	Name    string `json:"name"`
+	Path    string `json:"path"`
+	IsDir   bool   `json:"is_dir"`
+	Size    int64  `json:"size"`
+	ModTime int64  `json:"mod_time"`
+}
+
+type MkdirOptions struct {
+	Dir string `json:"dir"`
+}
+
+type Status struct {
+	Ok bool `json:"ok"`
+}
+
+type WatchFSEvent struct {
+	Path   string `json:"path"`
+	Create bool   `json:"create"`
+	Write  bool   `json:"write"`
+	Remove bool   `json:"remove"`
+	Rename bool   `json:"rename"`
+}

client/daemon.go

@@ -66,7 +66,7 @@ func (a *DaemonClient) InstanceExec(ctx context.Context, id string, cmd []string
 		TimeoutMs: int(timeout.Milliseconds()),
 	}
 	var result api.ExecResult
-	err := a.client.Post(ctx, "/instances/"+id+"/exec", result, httpclient.WithJSONBody(&opt))
+	err := a.client.Post(ctx, "/instances/"+id+"/exec", &result, httpclient.WithJSONBody(&opt))
 	if err != nil {
 		return nil, err
 	}

cmd/initd/initd.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"log/slog"
+
+	"github.com/valyentdev/ravel/initd/api"
+	"github.com/valyentdev/ravel/initd/environment"
+)
+
+func main() {
+	env := &environment.Env{}
+
+	if err := env.Init(); err != nil {
+		panic(err)
+	}
+
+	go env.Run()
+
+	if err := api.ServeInitdAPI(env); err != nil {
+		slog.Error("[ravel-initd] Failed to start API server: %v", "err", err)
+	}
+}

cmd/ravel/commands/instance/exec.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 	"time"
 
 	"github.com/spf13/cobra"
@@ -18,7 +19,7 @@ func newInstanceExec() *cobra.Command {
 	var execOptions execOptions
 
 	cmd := &cobra.Command{
-		Use:   "exec [instance-id] -- [command...]",
+		Use:   "exec instance-id command [...args] | --",
 		Short: "Execute a command on a instance",
 		Long:  `Execute a command on a instance.`,
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -36,7 +37,7 @@ func runInstanceExec(cmd *cobra.Command, args []string, timeout time.Duration) e
 		return fmt.Errorf("please specify a instance id, then the command")
 	}
 
-	var cmdLine []string
+	var toExec string
 
 	if args[1] == "--" {
 		println("reading from stdin")
@@ -54,12 +55,16 @@ func runInstanceExec(cmd *cobra.Command, args []string, timeout time.Duration) e
 			str = str[:len(str)-1]
 		}
 
-		cmdLine = []string{
-			"/bin/sh",
-			"-c",
-			str,
-		}
+		toExec = str
+
+	} else {
+		toExec = strings.Join(args[1:], " ")
+	}
 
+	cmdLine := []string{
+		"/bin/sh",
+		"-c",
+		toExec,
 	}
 
 	instanceId := args[0]

go.mod

@@ -12,6 +12,7 @@ require (
 	github.com/containerd/errdefs v0.1.0
 	github.com/coreos/go-iptables v0.7.0
 	github.com/danielgtaylor/huma/v2 v2.26.0
+	github.com/fsnotify/fsnotify v1.7.0
 	github.com/gammazero/deque v0.2.1
 	github.com/google/go-containerregistry v0.20.2
 	github.com/jackc/pgx/v5 v5.6.0
@@ -25,10 +26,8 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/u-root/u-root v0.14.0
 	github.com/valyentdev/corroclient v0.1.0
-	github.com/valyentdev/ravel-init v0.1.0
 	go.etcd.io/bbolt v1.3.11
 	google.golang.org/grpc v1.67.1
-	google.golang.org/protobuf v1.35.2
 	sigs.k8s.io/yaml v1.4.0
 
 )
@@ -59,7 +58,6 @@ require (
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
@@ -111,6 +109,7 @@ require (
 	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/tools v0.27.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.120.1 // indirect
 	tags.cncf.io/container-device-interface v0.6.2 // indirect
@@ -120,7 +119,6 @@ require (
 require (
 	github.com/mdlayher/vsock v1.2.1
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/runc v1.1.15 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/sirupsen/logrus v1.9.3
 	github.com/valyentdev/ravel/api v0.0.0-00010101000000-000000000000

go.sum

@@ -224,8 +224,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
-github.com/opencontainers/runc v1.1.15 h1:QMmSU2q1YUg3iOJX11phnaDi2A5/zhx4BR6h+XZ1DMA=
-github.com/opencontainers/runc v1.1.15/go.mod h1:E4C2z+7BxR7GHXp0hAY53mek+x49X1LjPNeMTfRGvOA=
 github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
 github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
@@ -288,8 +286,6 @@ github.com/urfave/cli v1.19.1/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijb
 github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8=
 github.com/valyentdev/corroclient v0.1.0 h1:Q9o1wkDkZjmisi0F8kNsXl2ixL6+IxZF7C4szzld7tY=
 github.com/valyentdev/corroclient v0.1.0/go.mod h1:q7jt7jJvWdk/qlRqBdNB/eA88m47vv/y/fDzbHttsvM=
-github.com/valyentdev/ravel-init v0.1.0 h1:qxtU0rNS9nNgDVvoKYa82zz0vJ+IN60mrVzbCfPXyns=
-github.com/valyentdev/ravel-init v0.1.0/go.mod h1:kCJWNPnxXQjtGBzwQup7BgLe78jLrVdqol9tZpJ2Z5s=
 github.com/vbatts/tar-split v0.11.3 h1:hLFqsOLQ1SsppQNTMpkpPXClLDfC2A3Zgy9OUU+RVck=
 github.com/vbatts/tar-split v0.11.3/go.mod h1:9QlHN18E+fEH7RdG+QAJJcuya3rqT7eXSTY7wGrAokY=
 github.com/vishvananda/netlink v1.3.0 h1:X7l42GfcV4S6E4vHTsw48qbrV+9PVojNfIhZcwQdrZk=

initd/api/internal.go

@@ -0,0 +1,53 @@
+package api
+
+import (
+	"context"
+
+	"github.com/danielgtaylor/huma/v2"
+	"github.com/valyentdev/ravel/initd"
+	"github.com/valyentdev/ravel/initd/environment"
+)
+
+type InternalEndpoint struct {
+	env *environment.Env
+}
+
+func (e *InternalEndpoint) registerRoutes(api huma.API) {
+	huma.Register(api, huma.Operation{
+		Method:      "GET",
+		Path:        "/wait",
+		OperationID: "waitExit",
+		Description: "Wait for the container main process to exit",
+	}, e.wait)
+
+	huma.Register(api, huma.Operation{
+		Path:        "/signal",
+		Method:      "POST",
+		OperationID: "signal",
+		Description: "Send a signal to the container main process",
+	}, e.signal)
+}
+
+type WaitRequest struct{}
+
+type WaitResponse struct {
+	Body initd.WaitResult
+}
+
+func (e *InternalEndpoint) wait(ctx context.Context, req *WaitRequest) (*WaitResponse, error) {
+	return &WaitResponse{Body: e.env.Wait()}, nil
+}
+
+type SignalRequest struct {
+	Body initd.SignalOptions
+}
+
+type SignalResponse struct{}
+
+func (e *InternalEndpoint) signal(ctx context.Context, req *SignalRequest) (*SignalResponse, error) {
+	err := e.env.Signal(req.Body.Signal)
+	if err != nil {
+		return nil, err
+	}
+	return &SignalResponse{}, nil
+}