feat: Create a "runtime" package that contains all runtime specific code

This is to make it easy to implement an new one.

Author: asalkeld

pkg/build/build.go

@@ -21,12 +21,12 @@ import (
 	"os"
 	"os/exec"
 	"path"
+	"strings"
 
 	"github.com/nitrictech/newcli/pkg/containerengine"
-	"github.com/nitrictech/newcli/pkg/functiondockerfile"
+	"github.com/nitrictech/newcli/pkg/runtime"
 	"github.com/nitrictech/newcli/pkg/stack"
 	"github.com/nitrictech/newcli/pkg/target"
-	"github.com/nitrictech/newcli/pkg/utils"
 )
 
 func Create(s *stack.Stack, t *target.Target) error {
@@ -50,7 +50,11 @@ func Create(s *stack.Stack, t *target.Target) error {
 		}
 		defer func() { os.Remove(fh.Name()) }()
 
-		err = functiondockerfile.Generate(&f, f.VersionString(s), t.Provider, fh)
+		rt, err := runtime.NewRunTimeFromHandler(f.Handler)
+		if err != nil {
+			return err
+		}
+		err = rt.FunctionDockerfile(f.ContextDirectory, f.VersionString(s), t.Provider, fh)
 		if err != nil {
 			return err
 		}
@@ -81,11 +85,11 @@ func CreateBaseDev(s *stack.Stack) error {
 	}
 	imagesToBuild := map[string]string{}
 	for _, f := range s.Functions {
-		rt, err := utils.NewRunTimeFromFilename(f.Handler)
+		rt, err := runtime.NewRunTimeFromHandler(f.Handler)
 		if err != nil {
 			return err
 		}
-		lang := rt.String()
+		lang := strings.Replace(path.Ext(f.Handler), ".", "", 1)
 		_, ok := imagesToBuild[lang]
 		if ok {
 			continue
@@ -101,7 +105,7 @@ func CreateBaseDev(s *stack.Stack) error {
 			os.Remove(f.Name())
 		}()
 
-		if err := functiondockerfile.GenerateForCodeAsConfig("handler."+lang, f); err != nil {
+		if err := rt.FunctionDockerfileForCodeAsConfig(f); err != nil {
 			return err
 		}
 

pkg/codeconfig/codeconfig.go

@@ -20,15 +20,12 @@ import (
 	"fmt"
 	"net"
 	"os"
-	"path"
-	"runtime"
+	osruntime "runtime"
 	"strings"
 	"sync"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/strslice"
 	"github.com/getkin/kin-openapi/openapi3"
 	"github.com/imdario/mergo"
 	"github.com/moby/moby/pkg/stdcopy"
@@ -39,7 +36,7 @@ import (
 	"github.com/nitrictech/newcli/pkg/containerengine"
 	"github.com/nitrictech/newcli/pkg/cron"
 	"github.com/nitrictech/newcli/pkg/output"
-	"github.com/nitrictech/newcli/pkg/run"
+	"github.com/nitrictech/newcli/pkg/runtime"
 	"github.com/nitrictech/newcli/pkg/stack"
 	"github.com/nitrictech/newcli/pkg/utils"
 	v1 "github.com/nitrictech/nitric/pkg/api/nitric/v1"
@@ -138,10 +135,14 @@ func (c *codeConfig) apiSpec(api string) (*openapi3.T, error) {
 
 	// Collect all workers
 	for handler, f := range c.functions {
+		rt, err := runtime.NewRunTimeFromHandler(handler)
+		if err != nil {
+			return nil, err
+		}
 		if f.apis[api] != nil {
 			for _, w := range f.apis[api].workers {
 				workers = append(workers, &apiHandler{
-					target: containerNameFromHandler(handler),
+					target: rt.ContainerName(),
 					worker: w,
 				})
 			}
@@ -203,7 +204,7 @@ func (c *codeConfig) apiSpec(api string) (*openapi3.T, error) {
 					Extensions: map[string]interface{}{
 						"x-nitric-target": map[string]string{
 							"type": "function",
-							"name": containerNameFromHandler(w.target),
+							"name": w.target,
 						},
 					},
 				},
@@ -214,35 +215,6 @@ func (c *codeConfig) apiSpec(api string) (*openapi3.T, error) {
 	return doc, nil
 }
 
-func launchOptsForFunctionCollect(runCtx, handler string) (run.LaunchOpts, error) {
-	rt, err := utils.NewRunTimeFromFilename(handler)
-	if err != nil {
-		return run.LaunchOpts{}, err
-	}
-
-	switch rt {
-	case utils.RuntimeJavascript, utils.RuntimeTypescript:
-		return run.LaunchOpts{
-			Image:      rt.DevImageName(),
-			Entrypoint: strslice.StrSlice{"ts-node"},
-			Cmd:        strslice.StrSlice{"-T " + "/app/" + handler},
-		}, nil
-	case utils.RuntimeGolang:
-		module, err := utils.GoModule(runCtx)
-		if err != nil {
-			return run.LaunchOpts{}, err
-		}
-		return run.LaunchOpts{
-			Image:      rt.DevImageName(),
-			TargetWD:   path.Join("/go/src", module),
-			Entrypoint: strslice.StrSlice{"go", "run"},
-			Cmd:        strslice.StrSlice{"./" + handler},
-		}, nil
-	default:
-		return run.LaunchOpts{}, errors.New("could not get launchOpts from " + handler + ", runtime not supported")
-	}
-}
-
 // collectOne - Collects information about a function for a nitric stack
 // handler - the specific handler for the application
 func (c *codeConfig) collectOne(handler string) error {
@@ -271,26 +243,24 @@ func (c *codeConfig) collectOne(handler string) error {
 	// Specify the service bind as the port with the docker gateway IP (running in bridge mode)
 	ce, err := containerengine.Discover()
 	if err != nil {
-		return errors.WithMessage(err, "error running the handler")
+		return errors.WithMessage(err, "error discovering container engine")
 	}
 
-	opts, err := launchOptsForFunctionCollect(c.initialStack.Dir, handler)
+	rt, err := runtime.NewRunTimeFromHandler(handler)
+	if err != nil {
+		return errors.WithMessage(err, "error getting the runtime from handler "+handler)
+	}
+
+	opts, err := rt.LaunchOptsForFunctionCollect(c.initialStack.Dir)
 	if err != nil {
 		return err
 	}
-	fmt.Println(opts.String())
 
 	hostConfig := &container.HostConfig{
 		AutoRemove: true,
-		Mounts: []mount.Mount{
-			{
-				Type:   "bind",
-				Source: c.initialStack.Dir,
-				Target: opts.TargetWD,
-			},
-		},
+		Mounts:     opts.Mounts,
 	}
-	if runtime.GOOS == "linux" {
+	if osruntime.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"}
@@ -308,7 +278,7 @@ func (c *codeConfig) collectOne(handler string) error {
 		Cmd:        opts.Cmd,
 		Entrypoint: opts.Entrypoint,
 		WorkingDir: opts.TargetWD,
-	}, hostConfig, nil, containerNameFromHandler(handler))
+	}, hostConfig, nil, rt.ContainerName())
 	if err != nil {
 		return err
 	}
@@ -356,11 +326,6 @@ func (c *codeConfig) collectOne(handler string) error {
 	return errs.Aggregate()
 }
 
-func containerNameFromHandler(handler string) string {
-	rt, _ := utils.NewRunTimeFromFilename(handler)
-	return rt.ContainerName(handler)
-}
-
 func (c *codeConfig) addFunction(fun *FunctionDependencies, handler string) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
@@ -378,7 +343,11 @@ func (c *codeConfig) ToStack() (*stack.Stack, error) {
 
 	errs := utils.NewErrorList()
 	for handler, f := range c.functions {
-		name := containerNameFromHandler(handler)
+		rt, err := runtime.NewRunTimeFromHandler(handler)
+		if err != nil {
+			return nil, err
+		}
+
 		topicTriggers := make([]string, 0, len(f.subscriptions)+len(f.schedules))
 
 		for k := range f.apis {
@@ -459,14 +428,14 @@ func (c *codeConfig) ToStack() (*stack.Stack, error) {
 			}
 		}
 
-		f, ok := s.Functions[name]
+		f, ok := s.Functions[rt.ContainerName()]
 		if !ok {
 			f = stack.FunctionFromHandler(handler, s.Dir)
 		}
 		f.ComputeUnit.Triggers = stack.Triggers{
 			Topics: topicTriggers,
 		}
-		s.Functions[name] = f
+		s.Functions[rt.ContainerName()] = f
 	}
 
 	return s, errs.Aggregate()