feat: Cleanup functions start.

Author: tjholm

pkg/cmd/run/root.go

@@ -21,15 +21,10 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"runtime"
 	"syscall"
 	"time"
 
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/strslice"
 	"github.com/nitrictech/newcli/pkg/build"
-	"github.com/nitrictech/newcli/pkg/containerengine"
 	"github.com/nitrictech/newcli/pkg/provider/run"
 	"github.com/nitrictech/nitric/pkg/membrane"
 	boltdb_service "github.com/nitrictech/nitric/pkg/plugins/document/boltdb"
@@ -56,8 +51,6 @@ var runCmd = &cobra.Command{
 			cobra.CheckErr(err)
 		}
 
-		ce, err := containerengine.Discover()
-
 		// Prepare development images
 		ctx, _ := filepath.Abs(".")
 		if err := build.CreateBaseDev(ctx, map[string]string{
@@ -134,41 +127,13 @@ var runCmd = &cobra.Command{
 
 		time.Sleep(time.Second * time.Duration(2))
 
-		// Start the functions
-		// cids := make([]string, 0)
-		fmt.Println("found files:", files)
-		for i, f := range files {
-			hostConfig := &container.HostConfig{
-				AutoRemove: true,
-				Mounts: []mount.Mount{
-					{
-						Type:   "bind",
-						Source: ctx,
-						Target: "/app",
-					},
-				},
-			}
-			if runtime.GOOS == "linux" {
-				// setup host.docker.internal to route to host gateway
-				// to access rpc server hosted by local CLI run
-				hostConfig.ExtraHosts = []string{"host.docker.internal:172.17.0.1"}
-			}
-
-			cID, err := ce.ContainerCreate(&container.Config{
-				Image: "nitric-ts-dev", // Select an image to use based on the handler
-				// Set the address to the bound port
-				Env:        []string{fmt.Sprintf("SERVICE_ADDRESS=host.docker.internal:%d", 50051)},
-				Entrypoint: strslice.StrSlice{"nodemon"},
-				Cmd:        strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,json", "--exec", "ts-node -T " + "/app/" + f},
-			}, hostConfig, nil, fmt.Sprintf("test-container-%d", i))
-
-			if err != nil {
-				cobra.CheckErr(err)
-			}
-
-			// cids = append(cids, cID)
-
-			err = ce.Start(cID)
+		functions, err := run.FunctionsFromHandlers(".", files)
+		if err != nil {
+			cobra.CheckErr(err)
+		}
+
+		for _, f := range functions {
+			err = f.Start()
 		}
 
 		fmt.Println("Local running, use ctrl-C to stop")

pkg/provider/run/function.go

@@ -0,0 +1,117 @@
+package run
+
+import (
+	"fmt"
+	"path/filepath"
+	"runtime"
+	"strings"
+
+	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/mount"
+	"github.com/nitrictech/newcli/pkg/containerengine"
+)
+
+type Function struct {
+	handler string
+	runCtx  string
+	runtime Runtime
+	ce      containerengine.ContainerEngine
+	// Container id populated after a call to Start
+	cid string
+}
+
+func (f *Function) Name() string {
+	return strings.Replace(filepath.Base(f.handler), filepath.Ext(f.handler), "", 1)
+}
+
+func (f *Function) Start() error {
+	hostConfig := &container.HostConfig{
+		AutoRemove: true,
+		Mounts: []mount.Mount{
+			{
+				Type:   "bind",
+				Source: f.runCtx,
+				Target: "/app",
+			},
+		},
+	}
+	if runtime.GOOS == "linux" {
+		// setup host.docker.internal to route to host gateway
+		// to access rpc server hosted by local CLI run
+		hostConfig.ExtraHosts = []string{"host.docker.internal:172.17.0.1"}
+	}
+
+	launchOpts, err := launchOptsForFunction(f)
+	if err != nil {
+		return err
+	}
+
+	cID, err := f.ce.ContainerCreate(&container.Config{
+		Image: devImageNameForRuntime(f.runtime), // Select an image to use based on the handler
+		// Set the address to the bound port
+		Env:        []string{fmt.Sprintf("SERVICE_ADDRESS=host.docker.internal:%d", 50051)},
+		Entrypoint: launchOpts.Entrypoint,
+		Cmd:        launchOpts.Cmd,
+	}, hostConfig, nil, f.Name())
+
+	if err != nil {
+		return err
+	}
+
+	f.cid = cID
+
+	return f.ce.Start(cID)
+}
+
+func (f *Function) Stop() error {
+	return f.ce.Stop(f.cid, nil)
+}
+
+type FunctionOpts struct {
+	Handler         string
+	RunCtx          string
+	ContainerEngine containerengine.ContainerEngine
+}
+
+func NewFunction(opts FunctionOpts) (*Function, error) {
+
+	var runtime Runtime = RuntimeTypescript
+
+	switch Runtime(filepath.Ext(opts.Handler)) {
+	case RuntimeTypescript:
+		runtime = RuntimeTypescript
+	case RuntimeJavascript:
+		runtime = RuntimeJavascript
+	default:
+		return nil, fmt.Errorf("no runtime supported for handler: %s", opts.Handler)
+	}
+
+	return &Function{
+		runtime: runtime,
+		handler: opts.Handler,
+		runCtx:  opts.RunCtx,
+	}, nil
+}
+
+func FunctionsFromHandlers(runCtx string, handlers []string) ([]*Function, error) {
+	funcs := make([]*Function, 0, len(handlers))
+	ce, err := containerengine.Discover()
+
+	if err != nil {
+		return nil, err
+	}
+
+	for _, h := range handlers {
+		if f, err := NewFunction(FunctionOpts{
+			RunCtx:          runCtx,
+			Handler:         h,
+			ContainerEngine: ce,
+		}); err != nil {
+			return nil, err
+		} else {
+			funcs = append(funcs, f)
+		}
+	}
+
+	return funcs, nil
+}

pkg/provider/run/runtime.go

@@ -0,0 +1,63 @@
+package run
+
+import (
+	"fmt"
+	"path/filepath"
+
+	"github.com/docker/docker/api/types/strslice"
+	"github.com/nitrictech/newcli/pkg/build"
+	"github.com/spf13/cobra"
+)
+
+type Runtime string
+
+const (
+	RuntimeTypescript Runtime = "ts"
+	RuntimeJavascript Runtime = "js"
+)
+
+func devImageNameForRuntime(runtime Runtime) string {
+	return fmt.Sprintf("nitric-%s-dev", runtime)
+}
+
+type LaunchOpts struct {
+	Entrypoint []string
+	Cmd        []string
+}
+
+func launchOptsForFunction(f *Function) (LaunchOpts, error) {
+	switch f.runtime {
+	// Javascript will re-use typescript runtime
+	case RuntimeJavascript:
+	case RuntimeTypescript:
+		return LaunchOpts{
+			Entrypoint: strslice.StrSlice{"nodemon"},
+			Cmd:        strslice.StrSlice{"--watch", "/app/**", "--ext", "ts,js,json", "--exec", "ts-node -T " + "/app/" + f.handler},
+		}, nil
+	}
+
+	return LaunchOpts{}, fmt.Errorf("unsupported runtime")
+}
+
+func CreateBaseDevForFunctions(funcs []*Function) error {
+	ctx, _ := filepath.Abs(".")
+	if err := build.CreateBaseDev(ctx, map[string]string{
+		"ts": "nitric-ts-dev",
+	}); err != nil {
+		cobra.CheckErr(err)
+	}
+
+	imageBuilds := make(map[string]string)
+
+	for _, f := range funcs {
+		switch f.runtime {
+		// Javascript will re-use typescript runtime
+		case RuntimeJavascript:
+		case RuntimeTypescript:
+			imageBuilds[string(RuntimeTypescript)] = devImageNameForRuntime(RuntimeTypescript)
+		}
+	}
+
+	// Currently the file context does not matter (base runtime images should not copy files)
+	return build.CreateBaseDev(".", imageBuilds)
+}