Wrap up v0.0.1

Author: sirrobot01

.air.toml

@@ -5,7 +5,7 @@ tmp_dir = "tmp"
 cmd = "templ generate && go build -o ./tmp/lamba ."
 bin = "tmp/lamba"
 full_bin = "./tmp/lamba"
-args_bin = ["--port", "8000", "--engine", "containerd", "--debug"]
+args_bin = ["--port", "8000", "--engine", "docker", "--debug"]
 include_ext = ["go", "tpl", "tmpl", "html", "so", "templ"]
 exclude_dir = ["assets", "tmp", "vendor"]
 exclude_regex = [".*_templ.go"]

README.md

@@ -34,10 +34,10 @@ sudo ./lamba --engine containerd --port 8080
 ```
 
 ## Function Structure
+You can find examples in the [examples](examples) directory.
 ```
-function/
-├── function.py
-├── requirements.txt
+function_name/
+├── function_name.py
 
 # Create deployment package
 zip -r function.zip function

cmd/cmd.go renamed to cmd/lamba/cmd.go

@@ -1,16 +1,16 @@
-package cmd
+package lamba
 
 import (
 	"flag"
 	"fmt"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
-	"github.com/sirrobot01/lamba/pkg/event"
-	"github.com/sirrobot01/lamba/pkg/executor"
-	"github.com/sirrobot01/lamba/pkg/function"
-	"github.com/sirrobot01/lamba/pkg/runtime"
-	"github.com/sirrobot01/lamba/pkg/runtime/engines"
-	"github.com/sirrobot01/lamba/server"
+	"github.com/sirrobot01/lamba/internal/engines"
+	"github.com/sirrobot01/lamba/internal/event"
+	"github.com/sirrobot01/lamba/internal/executor"
+	"github.com/sirrobot01/lamba/internal/function"
+	"github.com/sirrobot01/lamba/internal/runtime"
+	"github.com/sirrobot01/lamba/internal/server/handlers"
 	"os"
 	"strings"
 )
@@ -76,8 +76,8 @@ func Start() error {
 		log.Info().Err(err).Msg("Failed to register runtimes")
 		return err
 	}
-	s := server.NewServer(executor.NewExecutor(registry, runtimeManager, eventManager, memory), port)
-	if err := s.Start(); err != nil {
+	h := handlers.New(executor.New(registry, runtimeManager, eventManager, memory), port)
+	if err := h.Start(); err != nil {
 		log.Info().Err(err).Msgf("Failed to start server")
 		return err
 	}

examples/golang/hello/hello.go

@@ -0,0 +1,5 @@
+package main
+
+func Runner(event map[string]interface{}, context map[string]interface{}) map[string]interface{} {
+	return event
+}

examples/nodejs/hello/hello.js

@@ -0,0 +1,7 @@
+function runner(event, context) {
+    return event;
+}
+
+module.exports = {
+    runner
+};

examples/python/hello/hello.py

@@ -0,0 +1,2 @@
+def handler(event, context):
+    return event

pkg/runtime/engines/containerd/containerd.go renamed to internal/engines/containerd/containerd.go

@@ -10,6 +10,7 @@ import (
 	"github.com/containerd/containerd/oci"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/rs/zerolog/log"
+	"github.com/sirrobot01/lamba/internal/function"
 	"strings"
 	"sync"
 	"syscall"
@@ -19,16 +20,13 @@ import (
 const defaultNamespace = "lamba"
 
 type Engine struct {
-	image         string
-	containerID   string
-	containerName string
-	lastUsed      time.Time
-	mutex         sync.Mutex
-	CodePath      string
-	client        *containerd.Client
+	image    string
+	lastUsed time.Time
+	mutex    sync.Mutex
+	client   *containerd.Client
 }
 
-func NewEngine(containerId, name, image, codePath string) *Engine {
+func NewEngine(image string) *Engine {
 	cl, err := containerd.New(
 		"/run/containerd/containerd.sock",
 		containerd.WithDefaultNamespace("lamba"),
@@ -45,20 +43,11 @@ func NewEngine(containerId, name, image, codePath string) *Engine {
 		image = "docker.io/library/" + image
 	}
 	return &Engine{
-		client:        cl,
-		image:         image,
-		containerID:   containerId,
-		containerName: name,
-		CodePath:      codePath,
+		client: cl,
+		image:  image,
 	}
 }
 
-func (e *Engine) UpdateEngine(containerId, name, codePath string) {
-	e.containerID = containerId
-	e.containerName = name
-	e.CodePath = codePath
-}
-
 func (e *Engine) PullImage(ctx context.Context) error {
 	ctx = namespaces.WithNamespace(ctx, defaultNamespace)
 
@@ -73,22 +62,22 @@ func (e *Engine) PullImage(ctx context.Context) error {
 	return nil
 }
 
-func (e *Engine) GetOrCreateContainer(ctx context.Context) (string, error) {
+func (e *Engine) GetOrCreateContainer(ctx context.Context, fn *function.Function) error {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 
 	ctx = namespaces.WithNamespace(ctx, defaultNamespace)
 
 	// Check if container exists
-	if e.containerID != "" {
-		container, err := e.client.LoadContainer(ctx, e.containerID)
+	if fn.ContainerID != "" {
+		container, err := e.client.LoadContainer(ctx, fn.ContainerID)
 		if err == nil {
 			task, err := container.Task(ctx, nil)
 			if err == nil {
 				status, err := task.Status(ctx)
 				if err == nil && status.Status == containerd.Running {
 					e.lastUsed = time.Now()
-					return container.ID(), nil
+					return nil
 				}
 			}
 		}
@@ -99,21 +88,21 @@ func (e *Engine) GetOrCreateContainer(ctx context.Context) (string, error) {
 		log.Info().Msgf("Pulling image...")
 		image, err = e.client.Pull(ctx, e.image, containerd.WithPullUnpack)
 		if err != nil {
-			return "", err
+			return err
 		}
 	}
 
 	// Create container
 	container, err := e.client.NewContainer(
 		ctx,
-		e.containerName,
-		containerd.WithNewSnapshot(e.containerName+"-snapshot", image),
+		fn.ContainerName,
+		containerd.WithNewSnapshot(fn.ContainerName+"snapshot", image),
 		containerd.WithNewSpec(
 			oci.WithImageConfig(image),
 			oci.WithMounts([]specs.Mount{
 				{
 					Type:        "bind",
-					Source:      e.CodePath,
+					Source:      fn.CodePath,
 					Destination: "/app",
 					Options:     []string{"rbind", "rw"},
 				},
@@ -122,33 +111,31 @@ func (e *Engine) GetOrCreateContainer(ctx context.Context) (string, error) {
 		),
 	)
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	// Create and start the task
 	task, err := container.NewTask(ctx, cio.NewCreator(cio.WithStdio))
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	if err := task.Start(ctx); err != nil {
-		return "", err
+		return err
 	}
-	containerId := container.ID()
-	e.containerID = containerId
+	fn.ContainerID = container.ID()
 	e.lastUsed = time.Now()
-	return containerId, nil
+	return nil
 }
 
-func (e *Engine) RunCommand(ctx context.Context, cmd []string) (string, string, error) {
+func (e *Engine) RunCommand(ctx context.Context, fn *function.Function, cmd []string) (string, string, error) {
 
 	ctx = namespaces.WithNamespace(ctx, defaultNamespace)
 
-	containerId, err := e.GetOrCreateContainer(ctx)
-	if err != nil || containerId == "" {
+	if err := e.GetOrCreateContainer(ctx, fn); err != nil || fn.ContainerID == "" {
 		return "", "", err
 	}
-	container, err := e.client.LoadContainer(ctx, containerId)
+	container, err := e.client.LoadContainer(ctx, fn.ContainerID)
 	if err != nil {
 		return "", "", err
 	}
@@ -171,7 +158,7 @@ func (e *Engine) RunCommand(ctx context.Context, cmd []string) (string, string,
 	stderr := bytes.NewBuffer(nil)
 
 	process, err := task.Exec(ctx,
-		fmt.Sprintf("%s-exec-%d", e.containerName, time.Now().UnixNano()),
+		fmt.Sprintf("%s-exec-%d", fn.ContainerName, time.Now().UnixNano()),
 		spec.Process,
 		cio.NewCreator(
 			cio.WithStreams(nil, stdout, stderr),
@@ -213,15 +200,15 @@ func (e *Engine) RunCommand(ctx context.Context, cmd []string) (string, string,
 	return stdout.String(), stderr.String(), nil
 }
 
-func (e *Engine) Cleanup(force bool) error {
+func (e *Engine) Cleanup(fn *function.Function, force bool) error {
 	e.mutex.Lock()
 	defer e.mutex.Unlock()
 	ctx := context.Background()
 	ctx = namespaces.WithNamespace(ctx, defaultNamespace)
 
-	if e.containerID != "" && (time.Since(e.lastUsed) > 10*time.Minute || force) {
+	if fn.ContainerID != "" && (time.Since(e.lastUsed) > 10*time.Minute || force) {
 
-		container, err := e.client.LoadContainer(ctx, e.containerID)
+		container, err := e.client.LoadContainer(ctx, fn.ContainerID)
 		if err != nil {
 			return err
 		}
@@ -252,7 +239,7 @@ func (e *Engine) Cleanup(force bool) error {
 			return err
 		}
 
-		e.containerID = ""
+		fn.ContainerID = ""
 	}
 	return nil
 }
@@ -282,19 +269,3 @@ func (e *Engine) isContainerHealthy(containerID string) bool {
 func (e *Engine) LastUsed() time.Time {
 	return e.lastUsed
 }
-
-func (e *Engine) ContainerID() string {
-	return e.containerID
-}
-
-func (e *Engine) ContainerName() string {
-	return e.containerName
-}
-
-func (e *Engine) Image() string {
-	return e.image
-}
-
-func (e *Engine) GetCodePath() string {
-	return e.CodePath
-}