Simplify fx infra (#485)

* add --host and --kubeconf to `fx up`
* remove `fx infra list` and `fx infra use`
* put assets into skip dir for golangci

* fix lint issue

* upgrade go-ssh-client to consume the 'Connectable' API, enable more
friendly SSH connection error message

* parse 'host' and 'kubeconf' for `fx list` and `fx down` also

* refactor parse

* clean infra stuff

.github/workflows/ci.yml

@@ -19,8 +19,7 @@ jobs:
 
       - name: lint
         run: |
-          docker run --rm -v $(pwd):/app -w /app golangci/golangci-lint \
-          golangci-lint run -v
+          make lint
 
       - name: unit test
         env:
@@ -43,11 +42,6 @@ jobs:
           make docker-build
           make test
           # make docker-publish #TODO in release workflow
-      - name: test fx docker cloud
-        run: |
-          make start_docker_infra
-          make test_docker_infra
-          make stop_docker_infra
 
       - name: test fx cli
         env:

.golangci.yml

@@ -7,6 +7,8 @@ run:
     - examples
     - api/images
     - test/functions
+    - assets/
+    - bundler/go/assets
 linters:
   enable:
     - goimports

Makefile

@@ -4,7 +4,8 @@ DOCKER_REMOTE_HOST_ADDR ?= "127.0.0.1"
 DOCKER_REMOTE_HOST_USER ?= $(whoami)
 
 lint:
-	golangci-lint run
+	docker pull golangci/golangci-lint
+	docker run --rm -v $(CURDIR):/app -w /app golangci/golangci-lint golangci-lint run -v
 
 generate:
 	packr

bundle/bundle.go

@@ -0,0 +1,44 @@
+package bundle
+
+import (
+	"fmt"
+
+	"github.com/metrue/fx/bundler"
+	"github.com/metrue/fx/bundler/d"
+	golang "github.com/metrue/fx/bundler/go"
+	"github.com/metrue/fx/bundler/java"
+	"github.com/metrue/fx/bundler/julia"
+	"github.com/metrue/fx/bundler/node"
+	"github.com/metrue/fx/bundler/perl"
+	"github.com/metrue/fx/bundler/python"
+	"github.com/metrue/fx/bundler/ruby"
+	"github.com/metrue/fx/bundler/rust"
+)
+
+// Bundle function to project
+func Bundle(workdir string, language string, fn string, deps ...string) error {
+	var bundler bundler.Bundler
+	switch language {
+	case "d":
+		bundler = d.New()
+	case "node":
+		bundler = node.New()
+	case "go":
+		bundler = golang.New()
+	case "java":
+		bundler = java.New()
+	case "julia":
+		bundler = julia.New()
+	case "perl":
+		bundler = perl.New()
+	case "python":
+		bundler = python.New()
+	case "ruby":
+		bundler = ruby.New()
+	case "rust":
+		bundler = rust.New()
+	default:
+		return fmt.Errorf("%s not suppported yet", language)
+	}
+	return bundler.Bundle(workdir, fn, deps...)
+}

bundle/bundler_test.go

@@ -0,0 +1,117 @@
+package bundle
+
+import (
+	"io/ioutil"
+	"os"
+	"testing"
+)
+
+func createFn(content string, t *testing.T) string {
+	fd, err := ioutil.TempFile("", "fx_func_*.js")
+	if err != nil {
+		t.Fatal(err)
+	}
+	err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	return fd.Name()
+}
+
+func TestBundle(t *testing.T) {
+	workdir, err := ioutil.TempDir("", "fx-test")
+	if err != nil {
+		t.Fatal(err)
+	}
+	defer os.RemoveAll(workdir)
+
+	cases := []struct {
+		workdir  string
+		language string
+		fn       string
+		deps     []string
+	}{
+		{
+			workdir:  workdir,
+			language: "d",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+		{
+			workdir:  workdir,
+			language: "go",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+		{
+			workdir:  workdir,
+			language: "java",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+		{
+			workdir:  workdir,
+			language: "julia",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+		{
+			workdir:  workdir,
+			language: "perl",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+		{
+			workdir:  workdir,
+			language: "python",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+		{
+			workdir:  workdir,
+			language: "ruby",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+		{
+			workdir:  workdir,
+			language: "rust",
+			fn: `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}
+			`,
+		},
+	}
+
+	for _, c := range cases {
+		fn := createFn(c.fn, t)
+		defer os.Remove(fn)
+
+		if err := Bundle(c.workdir, c.language, fn, c.deps...); err != nil {
+			t.Fatal(err)
+		}
+	}
+}

bundler/bundler.go

@@ -0,0 +1,88 @@
+package bundler
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"strings"
+
+	"github.com/gobuffalo/packd"
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/constants"
+	"github.com/metrue/fx/utils"
+)
+
+// Bundler defines interface
+type Bundler interface {
+	Scaffold(output string) error
+	Bundle(output string, fn string, deps ...string) error
+}
+
+// IsHandler check if it's handle file
+func IsHandler(name string, lang string) bool {
+	basename := filepath.Base(name)
+	nameWithoutExt := strings.TrimSuffix(basename, filepath.Ext(basename))
+	if constants.ExtLangMapping[filepath.Ext(basename)] != lang {
+		return false
+	}
+
+	return (nameWithoutExt == "fx" ||
+		// Fx is for Java
+		nameWithoutExt == "Fx" ||
+		// mod.rs is for Rust)
+		nameWithoutExt == "mod")
+}
+
+// Restore directory from packr box
+func Restore(box *packr.Box, output string) error {
+	if err := box.Walk(func(name string, fd packd.File) error {
+		content, err := box.Find(name)
+		if err != nil {
+			return err
+		}
+
+		dest := filepath.Join(output, name)
+		if err := utils.EnsureFile(dest); err != nil {
+			return err
+		}
+
+		if err := ioutil.WriteFile(dest, content, 0644); err != nil {
+			return err
+		}
+
+		return nil
+	}); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Bundle bundle a function
+func Bundle(box *packr.Box, output string, language string, fn string, deps ...string) error {
+	if err := Restore(box, output); err != nil {
+		return err
+	}
+
+	if err := utils.Merge(output, deps...); err != nil {
+		return err
+	}
+
+	// Replace the default handler source file with given function source file
+	if err := filepath.Walk(output, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+
+		if IsHandler(path, language) {
+			if err := utils.CopyFile(fn, path); err != nil {
+				return err
+			}
+		}
+
+		return nil
+	}); err != nil {
+		return err
+	}
+
+	return nil
+}

bundler/bundler_test.go

@@ -0,0 +1,51 @@
+package bundler
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"testing"
+
+	"github.com/gobuffalo/packr/v2"
+)
+
+func TestBundler(t *testing.T) {
+	t.Run("Restore", func(t *testing.T) {
+		box := packr.New("", "./node/assets")
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+		if err := Restore(box, outputDir); err != nil {
+			t.Fatal(err)
+		}
+	})
+
+	t.Run("Bundle", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}`
+		if err = ioutil.WriteFile(fd.Name(), []byte(content), 0666); err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		box := packr.New("", "./node/assets")
+		if err := Bundle(box, outputDir, "node", fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+	})
+}

bundler/d/d-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package d
+
+import _ "github.com/metrue/fx/bundler/d/packrd"

bundler/d/d.go

@@ -0,0 +1,32 @@
+package d
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// D defines d bundler
+type D struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *D {
+	return &D{
+		assets: packr.New("d", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (d *D) Scaffold(output string) error {
+	return bundler.Restore(d.assets, output)
+}
+
+// Bundle a function into a koa project
+func (d *D) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(d.assets, output, "d", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &D{}
+)

bundler/go/go.go

@@ -0,0 +1,32 @@
+package golang
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// Gin defines javascript bundler
+type Gin struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Gin {
+	return &Gin{
+		assets: packr.New("go", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (g *Gin) Scaffold(output string) error {
+	return bundler.Restore(g.assets, output)
+}
+
+// Bundle a function into a koa project
+func (g *Gin) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(g.assets, output, "go", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Gin{}
+)

bundler/go/go_test.go

@@ -0,0 +1,143 @@
+package golang
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestKoaBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		koa := New()
+		if err := koa.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		koa := New()
+		if err := koa.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/fx.go")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/fx.go")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		koa := New()
+		if err := koa.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

bundler/go/golang-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package golang
+
+import _ "github.com/metrue/fx/bundler/go/packrd"

bundler/go/packrd/packed-packr.go

@@ -0,0 +1,33 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr2 clean" command to clean up this,
+// and any other packr generated files.
+package packrd
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packr/v2/file/resolver"
+)
+
+var _ = func() error {
+	const gk = "449af63614707e60b8b2ffe119b470cf"
+	g := packr.New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"76eca10e3a22b8409f5af0b284f82ee4": "1f8b08000000000000ff7ccabdaac2301407f0fd3cc59fec490af711da5e10a929115111877ee5586839a569318fefe6e8fefbf7aec23c6ceb3ed890348b6e9b3810e5aebec3c0b2d8b87696c7edb5b7a693d97e315d9d3f1607ff1b91bf9cc082761fa71e7aeac3d47084d26fe8a8a005212124c38266590c0b5179abddb9c45f9665447955e0a18c0d493de9130000ffff44ef0fc1ae000000",
+		"cf8b44c6431c48afd768cf293ee38cab": "1f8b08000000000000ff4c8cc1aac2301045d799af98975502efa585b7ab74a7b854d41f88218983edb40c0d08d27f9766e5eede03e7cc3e3c7d8e387a62001ae7491634a074a6e551ee2e4c639389fff2c414b6a5c102a4c2a12ac6e21b9460d7632676fb987c19166341893b1e6e4637fa17d3abfef3e9fa0d2861946a8abb1436bafb6fdb56db5dc53f3d320d5b5ccd9e2998286241adb0c2270000ffff1428eddcb3000000",
+		"da1f5928cfe751551db26cc0459d944e": "1f8b08000000000000ff14c9b10e82301000d0b9f715974e601089a3ab8b71d0c12fa8b5948bed1d81233621fcbb617bc91b9dffba18303b6200caa34c8a36920ecbbbf5924f91f81885c9efb200fdc21efb52792d7888c4ed555843d11a57305e4b7b7f3d1fd5b9eb1adcf7b682313687797631d80bda21a424f893297d6c0366ab61837f000000ffffe12418cf85000000",
+	})
+	if err != nil {
+		panic(err)
+	}
+	g.DefaultResolver = hgr
+
+	func() {
+		b := packr.New("go", "./assets")
+		b.SetResolver("Dockerfile", packr.Pointer{ForwardBox: gk, ForwardPath: "76eca10e3a22b8409f5af0b284f82ee4"})
+		b.SetResolver("app.go", packr.Pointer{ForwardBox: gk, ForwardPath: "cf8b44c6431c48afd768cf293ee38cab"})
+		b.SetResolver("fx.go", packr.Pointer{ForwardBox: gk, ForwardPath: "da1f5928cfe751551db26cc0459d944e"})
+	}()
+	return nil
+}()

bundler/java/java-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package java
+
+import _ "github.com/metrue/fx/bundler/java/packrd"

bundler/java/java.go

@@ -0,0 +1,32 @@
+package java
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// Java defines javascript bundler
+type Java struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Java {
+	return &Java{
+		assets: packr.New("java", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (k *Java) Scaffold(output string) error {
+	return bundler.Restore(k.assets, output)
+}
+
+// Bundle a function into a koa project
+func (k *Java) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(k.assets, output, "java", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Java{}
+)

bundler/java/java_test.go

@@ -0,0 +1,155 @@
+package java
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestJavaBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_java")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		java := New()
+		if err := java.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.java")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `package fx;
+
+import io.javalin.Javalin;
+import org.json.JSONObject;
+
+public class app {
+    public static void main(String[] args) {
+        Javalin app = Javalin.start(3000);
+        Fx handler = new Fx();
+        app.post("/", ctx -> {
+            JSONObject obj = new JSONObject(ctx.body());
+            ctx.result(""+handler.handle(obj));
+        });
+    }
+}
+		`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_java")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		java := New()
+		if err := java.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/src/main/java/fx/Fx.java")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/src/main/java/fx/Fx.java")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_java")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		java := New()
+		if err := java.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

bundler/java/packrd/packed-packr.go

@@ -0,0 +1,35 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr2 clean" command to clean up this,
+// and any other packr generated files.
+package packrd
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packr/v2/file/resolver"
+)
+
+var _ = func() error {
+	const gk = "472df26e20796ab2f7966f2dbcce8ee2"
+	g := packr.New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"3ce2296391d96d76aaff2d829f1f612d": "1f8b08000000000000ff4c4fb16ec32014dcf98a274f586da9a58e563a66c8d00c19ab0e0f4c5d2801042f2955e57faf9c10c7b71cdc9dee20a2fac651c367e91933c718128109c2e2199df16277e5fe6685340a9b8317bbc3fe6d2fad56d433164fd21905ca61ce8031c21f0300a8722624a3e01ccc0047349e1f28193fbe7f00a631b7353ca3ae5d2a36b79bc88489f84bd7756dbf44b705bed00f4e27d880d73fb02d7c65638c22864cbc796e1e415181a7d7d5d0656cf90104696bcb5de48a8a9061f8e5edaa77c66c249d4f8e78d33cd457882bf320ed3a3fd5f3c426f61f0000ffff88067e0e6b010000",
+		"74b2f70d9674f4e1a69013f26355fca9": "1f8b08000000000000ff8c55516fdb20107ecfafb0fc1eb0bb4aab2a4a1f264daad46ad3d64d7bab6ef8ec90da808024debf9f0c4e63c775dc3c85fb3eeebeef8033bb6f9b3ad9a37552abbb3427599aa012ba90aaba4b7f3d7f5ddfa4f77cc58cd55b143e699b5ab9bb74e3bdb9a5b4813d2a0206c40689b615fdfeed895e93accb1298b7ad936fecc3e1400e9f02ef2acb72fae7e9f1a7d860036ba99c0725305d254992b44edeba003c6a013e085b2c98cc314260bdbf7ec95e32d2ba22e5a1086b7481f5ef689c87148c8e62915659bd330f05d7b622ce58a9aad24283076d5f193d82910ad6cb12847f2878d9aec198f516f6c0e8201e8906c42b5452557c0b96d1d332c2fd69f08ce49da8e37215d1bf3b59f78962b27a5749e54e9141741c9cf8e9bb145bd6e7393335da3b3012bbea3650e03aee9cfa1ced3dbab822f9c0d284862d8a5d77e46e0a8e09efe3d1fc061cf2d85664342ee7e995867aa6dc88c3835d46c3fff97474211f135a95b2da59b86c2370bd05e54a6d1bb40b12cfe98be4ee271b536383caf7cf6cee5690609d58747a6705922750b244e77ff481e753dd74596690da80545f6a708e972d0163183d45968dd281d38516d28ff590d10f9c0ba317eedf003c7f8ef4fc3d1e233d91d1c1b3ee86ad41eb250ed2b0781e423746d66849ec3bbf61f47d6076a3075ba17f67630fac82b8910256a04155a01293c0bfb3312935e9865eddcd83d9e9f8c6984cc6e360c8497e3627181dd79c97d0dde1add317050478b6fa55967fceb3fce6b2003aee4a685af78de4abff010000ffff2998100355070000",
+		"9d097ccc5e31491bd2ee70619fc36101": "1f8b08000000000000ff74cbc1aac2301005d07dbe62e82ae1417ea0bced83be855df40b26718ca97512922914a4ff2ed282a87897f79e9bd15f30109c9656a978cda908a412ec5813dbffa13ff46e242fad52797653f4e027ac15fe16b8290080bd8d2c70463e4ea49f27889c6731bb7c6490123900c2efb6d940a21b6c8c95b46ddab4efdabd6af7451792b930742c14a8d88ca552c7a2d1c0cf67ebf6e7aa56750f0000ffffeb12798604010000",
+		"bde0ba82beaa4757c20608eb0bcc46bd": "1f8b08000000000000ff2ccecf4a033110c7f17b9e6288d7661351c46b71ebad562a82507a984da64bd2e60f93ece2e3cbae3dcde1cbfcf8bc1f0f7b88d478227df955016754035612e201b6cef93442cd135bda80cdb1f81b01260705ed1547029f5a06840b3608c862dbf750d982b6d991ae6cc5f1fb034e32ce496e40debfe45988ddcfe7e16b074fc618f1b6efe124f55459dffca0c31cf5ea7855b9500aeeaa30ba97673df8b486654a05e4e536e491da42c752fef9a67bec4cb7f4b3f80b0000ffff3eecd9bedf000000",
+	})
+	if err != nil {
+		panic(err)
+	}
+	g.DefaultResolver = hgr
+
+	func() {
+		b := packr.New("java", "./assets")
+		b.SetResolver("Dockerfile", packr.Pointer{ForwardBox: gk, ForwardPath: "bde0ba82beaa4757c20608eb0bcc46bd"})
+		b.SetResolver("pom.xml", packr.Pointer{ForwardBox: gk, ForwardPath: "74b2f70d9674f4e1a69013f26355fca9"})
+		b.SetResolver("src/main/java/fx/Fx.java", packr.Pointer{ForwardBox: gk, ForwardPath: "9d097ccc5e31491bd2ee70619fc36101"})
+		b.SetResolver("src/main/java/fx/app.java", packr.Pointer{ForwardBox: gk, ForwardPath: "3ce2296391d96d76aaff2d829f1f612d"})
+	}()
+	return nil
+}()

bundler/julia/assets/fx.jl

@@ -1,4 +1,3 @@
-
 struct Input
     a::Number
     b::Number

bundler/julia/julia-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package julia
+
+import _ "github.com/metrue/fx/bundler/julia/packrd"

bundler/julia/julia.go

@@ -0,0 +1,32 @@
+package julia
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// Julia defines javascript bundler
+type Julia struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Julia {
+	return &Julia{
+		assets: packr.New("julia", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (k *Julia) Scaffold(output string) error {
+	return bundler.Restore(k.assets, output)
+}
+
+// Bundle a function into a koa project
+func (k *Julia) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(k.assets, output, "julia", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Julia{}
+)

bundler/julia/julia_test.go

@@ -0,0 +1,148 @@
+package julia
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestJuliaBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.julia")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `struct Input
+    a::Number
+    b::Number
+end
+
+fx = function(input::Input)
+    return input.a + input.b
+end
+		`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle function should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/fx.jl")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/fx.jl")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

bundler/julia/packrd/packed-packr.go

@@ -0,0 +1,37 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr2 clean" command to clean up this,
+// and any other packr generated files.
+package packrd
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packr/v2/file/resolver"
+)
+
+var _ = func() error {
+	const gk = "9e78c349d756cf23066df37690663267"
+	g := packr.New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"17bc9961cffa014e8d7ac818d8a3ec14": "1f8b08000000000000ff4c8fc16ac3300c86ef7e8a9f9e6c2826b09d0a39edb2edb08d959dc61866515a975449243bf4f18793a69bc020ebe3d36f678d7cc0634ac39e642231f13cf492f0bc7f7d59fb0f3e07d163e88c89fcd3e586eca6bdf853b771c6a84ca8b1c8d6a1e92134ee76ef3466d2b48590969b0e3d2b1900882d3ae2433a5aa1d137210587ba4635c35242ea3585941535eeab055077d54b0d41949aefe2a29edfeadfca48fc4ceca98f6c3f1f8e41ece4d0f6820991b1e67d39775b75dd71fba3cf6b679f78c869fb3fec4fd324910fb6bdd879be00e2c6946324b35599b6b8abaaca99df000000ffffa9ee463365010000",
+		"516dab4c6ff105b6210ce90d2afa826f": "1f8b08000000000000ff2a2e292a4d2e51f0cc2b282de15250505048b4b2f22bcd4d4a2d02f392e0bcd4bc142eaeb40a055b85b4d2bce492ccfc3c8d4c90262b2bb05e4db0f2a2d492d2a23c05b0845ea28236949504d60d080000ffff662990f46b000000",
+		"b4a52bf8c0e242a9573eebd6bd5881fd": "1f8b08000000000000ff4ccd31cbc2301080e1fd7ec54dddd206bee103d75ab7da5211743c9b5053cf723417417fbd98415c9fe17d7743d7e29c38d0c696ff0075d79fb1c48a440086e31e49d44c5e318923f558145f094b546246f3c4691c33270d1c312daf2078a79b470e97abaa18a135fad538ffc8d13ccc93ca7989e5cc0075bbfd7512f97073eabb43837fd65a78070000ffff383c868aac000000",
+		"c85770f1f90561b2df722b26d344976a": "1f8b08000000000000ff14c9310ac3300c46e1593a85f0642fcd093a06da2d0df4002ebf5c4c832de4f4fec1c35bded74d5b0c4b365bf6f5f57eee6b48822e85096a43eee29a71d4a62396c454ba0ba43699ca44dbef7bcb404462d2069ecdf7f9d703313cced3b6ec433d24be020000ffff9afc26056c000000",
+		"ccfa88310f9e4f3419a50e352a228292": "1f8b08000000000000fff228292908482c2a4e2de2023183538bca528bb8bc82fdfdb842f372138b8a33127300010000ffffd7a8f0a324000000",
+	})
+	if err != nil {
+		panic(err)
+	}
+	g.DefaultResolver = hgr
+
+	func() {
+		b := packr.New("julia", "./assets")
+		b.SetResolver("Dockerfile", packr.Pointer{ForwardBox: gk, ForwardPath: "b4a52bf8c0e242a9573eebd6bd5881fd"})
+		b.SetResolver("REQUIRE", packr.Pointer{ForwardBox: gk, ForwardPath: "ccfa88310f9e4f3419a50e352a228292"})
+		b.SetResolver("app.jl", packr.Pointer{ForwardBox: gk, ForwardPath: "17bc9961cffa014e8d7ac818d8a3ec14"})
+		b.SetResolver("deps.jl", packr.Pointer{ForwardBox: gk, ForwardPath: "c85770f1f90561b2df722b26d344976a"})
+		b.SetResolver("fx.jl", packr.Pointer{ForwardBox: gk, ForwardPath: "516dab4c6ff105b6210ce90d2afa826f"})
+	}()
+	return nil
+}()

bundler/node/node-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package node
+
+import _ "github.com/metrue/fx/bundler/node/packrd"

bundler/node/node.go

@@ -0,0 +1,34 @@
+package node
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+const language = "node"
+
+// Node defines node bundler
+type Node struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Node {
+	return &Node{
+		assets: packr.New("node", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (k *Node) Scaffold(output string) error {
+	return bundler.Restore(k.assets, output)
+}
+
+// Bundle a function into a koa project
+func (k *Node) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(k.assets, output, language, fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Node{}
+)

bundler/node/node_test.go

@@ -0,0 +1,143 @@
+package node
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestNodeBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		koa := New()
+		if err := koa.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `
+module.exports = (ctx) => {
+  ctx.body = 'hello fx'
+}`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		koa := New()
+		if err := koa.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/fx.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/fx.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_koa")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		koa := New()
+		if err := koa.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

bundler/node/packrd/packed-packr.go

@@ -0,0 +1,33 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr2 clean" command to clean up this,
+// and any other packr generated files.
+package packrd
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packr/v2/file/resolver"
+)
+
+var _ = func() error {
+	const gk = "099a799bb033d71a85f319790ea9425b"
+	g := packr.New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"06d0f22f31cc0848f733e8dcaa11962c": "1f8b08000000000000ffcacd4f29cd49d54bad28c82f2a2956b055d0482ea9d054b0b553a8e65250482ea9d04bca4fa954b05550cf48cdc9c95728cf2fca4951e7aae502040000ffff4a686e4639000000",
+		"2c75a41a4116ea4ba707c129527fd11c": "1f8b08000000000000ff5c8ec10ac2301044eff98abd25116d0bde2c05ef5efc8558b7122ad9b869b122febbac0a091e67de63989e429ae0400e3a60bccd9ed1e8919cb6adfab2139d1f47c709f94fd908891f92ed9e3895de7e24574b9995612985aa1e16613fe862840e02dee593b1ad7231567342231be6a90088fdc5871de8955eab972d94fcd494f5b0c8bca4ab4f1306b36d9ac6b6ea1d0000ffffc9e8e169fb000000",
+		"98bb98a34bd158dd2fdd41ca90f4e64d": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd0cdcb4f49d54d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f67551885602a952d251504a2c28d0cb2a568ae502040000ffff6c95391846000000",
+	})
+	if err != nil {
+		panic(err)
+	}
+	g.DefaultResolver = hgr
+
+	func() {
+		b := packr.New("node", "./assets")
+		b.SetResolver("Dockerfile", packr.Pointer{ForwardBox: gk, ForwardPath: "98bb98a34bd158dd2fdd41ca90f4e64d"})
+		b.SetResolver("app.js", packr.Pointer{ForwardBox: gk, ForwardPath: "2c75a41a4116ea4ba707c129527fd11c"})
+		b.SetResolver("fx.js", packr.Pointer{ForwardBox: gk, ForwardPath: "06d0f22f31cc0848f733e8dcaa11962c"})
+	}()
+	return nil
+}()

bundler/perl/packrd/packed-packr.go

@@ -0,0 +1,33 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr2 clean" command to clean up this,
+// and any other packr generated files.
+package packrd
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packr/v2/file/resolver"
+)
+
+var _ = func() error {
+	const gk = "77d2d2753a1e41552ea722fb94d9bca6"
+	g := packr.New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"2e6c11f0e86d189a5f33d2eda0bc7406": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd02d482dcad14d4a2c4ee5e272747151d053d0e3e2728d08f00f765530363030e072f67551885602a952d251504a2c28d02b00b352125373f3f39462b900010000ffff0583b6ed50000000",
+		"b3a2e75d2833aa5c271d28326dee512c": "1f8b08000000000000ff2a2e4d5248ab50a8e65250c8ad5450492ea950b05528cec84c2bb1e65250284a2d292dca5350cf48cdc9c95748ab50e7aae5e232b4e602040000ffffd1aa6a1336000000",
+		"cd2f2d8e12b35147ad2b9cb35d65d3ab": "1f8b08000000000000ffb48c41aa83401044f77d8a423ea80b75efa027f83984316d32629c49770f1842ee1e067285ec8a578f9794710a6bd8fcec43d2befff7c68e48f891bc308ab65b8e366e8523bab2a1ec4a0c23349df122e0fec4df6c0706e8cd2fe6be4858316039aa7cd699e6d18cc2fb85a55a35ecb992bddad1db11c5a0bf8b4f3136a3da24e6e8130000ffff6c5481b5f1000000",
+	})
+	if err != nil {
+		panic(err)
+	}
+	g.DefaultResolver = hgr
+
+	func() {
+		b := packr.New("perl", "./assets")
+		b.SetResolver("Dockerfile", packr.Pointer{ForwardBox: gk, ForwardPath: "2e6c11f0e86d189a5f33d2eda0bc7406"})
+		b.SetResolver("app.pl", packr.Pointer{ForwardBox: gk, ForwardPath: "cd2f2d8e12b35147ad2b9cb35d65d3ab"})
+		b.SetResolver("fx.pl", packr.Pointer{ForwardBox: gk, ForwardPath: "b3a2e75d2833aa5c271d28326dee512c"})
+	}()
+	return nil
+}()

bundler/perl/perl-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package perl
+
+import _ "github.com/metrue/fx/bundler/perl/packrd"

bundler/perl/perl.go

@@ -0,0 +1,32 @@
+package perl
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// Julia defines javascript bundler
+type Julia struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Julia {
+	return &Julia{
+		assets: packr.New("perl", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (k *Julia) Scaffold(output string) error {
+	return bundler.Restore(k.assets, output)
+}
+
+// Bundle a function into a koa project
+func (k *Julia) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(k.assets, output, "perl", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Julia{}
+)

bundler/perl/perl_test.go

@@ -0,0 +1,148 @@
+package perl
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestJuliaBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.julia")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `struct Input
+    a::Number
+    b::Number
+end
+
+fx = function(input::Input)
+    return input.a + input.b
+end
+		`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle function should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/fx.pl")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/fx.pl")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

bundler/python/packrd/packed-packr.go

@@ -0,0 +1,33 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr2 clean" command to clean up this,
+// and any other packr generated files.
+package packrd
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packr/v2/file/resolver"
+)
+
+var _ = func() error {
+	const gk = "37124a38bea92e4ec995016569c93ec9"
+	g := packr.New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"0541aa67f1217ee20e491552a545a7ca": "1f8b08000000000000ff4a494d5348abd0284a2d2c4d2d2ed1b4e252505050284a2d292dca5350ca48cdc9c95728cf2fca4951e202040000ffffc6a7b4282a000000",
+		"46416dc28552c117e810b36196e043ca": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd02da82cc9c8cfd34d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f6755148cb492cce56282acd53d0cd5030d0034305dd02880240000000ffff21aa3b6b52000000",
+		"65d09a53a70631fa1bbd7c5e1906d910": "1f8b08000000000000ff34cdbd0ac23014c5f1fd3ec5d99240d05d28b8a8a382dd4442a037b4da7c98a410df5ea43a9edf19fe2e470fd730f91473856bb4ca6ccbf38fc7efd0c8fc5ab8548d478961726fb229a15b5f694cb09e8d51447b9bd226c7a5b2145ba1e1b98e7128dd4d5cced75e6888d3a1177745033b8c360c334bb52300c85c971ce09afcc5147d020000ffff9da83eeaa1000000",
+	})
+	if err != nil {
+		panic(err)
+	}
+	g.DefaultResolver = hgr
+
+	func() {
+		b := packr.New("python", "./assets")
+		b.SetResolver("Dockerfile", packr.Pointer{ForwardBox: gk, ForwardPath: "46416dc28552c117e810b36196e043ca"})
+		b.SetResolver("app.py", packr.Pointer{ForwardBox: gk, ForwardPath: "65d09a53a70631fa1bbd7c5e1906d910"})
+		b.SetResolver("fx.py", packr.Pointer{ForwardBox: gk, ForwardPath: "0541aa67f1217ee20e491552a545a7ca"})
+	}()
+	return nil
+}()

bundler/python/python-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package python
+
+import _ "github.com/metrue/fx/bundler/python/packrd"

bundler/python/python.go

@@ -0,0 +1,32 @@
+package python
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// Julia defines javascript bundler
+type Julia struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Julia {
+	return &Julia{
+		assets: packr.New("python", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (k *Julia) Scaffold(output string) error {
+	return bundler.Restore(k.assets, output)
+}
+
+// Bundle a function into a koa project
+func (k *Julia) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(k.assets, output, "python", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Julia{}
+)

bundler/python/python_test.go

@@ -0,0 +1,148 @@
+package python
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestJuliaBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.julia")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `struct Input
+    a::Number
+    b::Number
+end
+
+fx = function(input::Input)
+    return input.a + input.b
+end
+		`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle function should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/fx.py")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/fx.py")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

bundler/ruby/packrd/packed-packr.go

@@ -0,0 +1,33 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr2 clean" command to clean up this,
+// and any other packr generated files.
+package packrd
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/gobuffalo/packr/v2/file/resolver"
+)
+
+var _ = func() error {
+	const gk = "5957c0f80ccc65e6ad8f2c329312596e"
+	g := packr.New(gk, "")
+	hgr, err := resolver.NewHexGzip(map[string]string{
+		"5d0faa4e62eb53572bfc7410d0f064f9": "1f8b08000000000000ff720bf2f755c84d2d292a4dd54fabd02d2a4daad44d4a2c4ee5e272f60f8854d053d0e3728d08f00f765530363030e072f6755100a951482c28d02b4a52d02d008b2be8e62b18e8812117200000ffff79eb4a3952000000",
+		"93130b893788876c223c2a0f3de05793": "1f8b08000000000000ffccce41aac23010c6f1fd9ce2dbcda6bc577057a8579168a75a91a4ce4ca520de5ddad4780537e19ffc207c2af7695001db10836b602a2f574b91e9733fa8dc820f0f01f7f39f1e99c8c4d18c49bdc2aeae6ba2319983ff195d220038f98c16cfb58166f949ccd1eeb165f5251b5334c996bba079f0c916ca55e022a1135d65cb4caff5ece7650049ec88cef29bc3de010000ffff22ee4db77f010000",
+		"973570cec900912c2cdd5c5531be70ac": "1f8b08000000000000ff3ccd410ac2301085e1fd9ce2d16c14c40308f122e2a276a674111acd4c3022de5d6262773fef8319470e931578bcc9013825796451833fa3e7e10f7a8fab4a93d69dd446cb5aa1559f171959d26fef59e1432c33e6b29bacec09f5fb653b7e3dde22bfe0312c1242c433a6c003c9caf40d0000ffff99b9e753aa000000",
+	})
+	if err != nil {
+		panic(err)
+	}
+	g.DefaultResolver = hgr
+
+	func() {
+		b := packr.New("ruby", "./assets")
+		b.SetResolver("Dockerfile", packr.Pointer{ForwardBox: gk, ForwardPath: "5d0faa4e62eb53572bfc7410d0f064f9"})
+		b.SetResolver("app.rb", packr.Pointer{ForwardBox: gk, ForwardPath: "93130b893788876c223c2a0f3de05793"})
+		b.SetResolver("fx.rb", packr.Pointer{ForwardBox: gk, ForwardPath: "973570cec900912c2cdd5c5531be70ac"})
+	}()
+	return nil
+}()

bundler/ruby/ruby-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package ruby
+
+import _ "github.com/metrue/fx/bundler/ruby/packrd"

bundler/ruby/ruby.go

@@ -0,0 +1,32 @@
+package ruby
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// Julia defines javascript bundler
+type Julia struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Julia {
+	return &Julia{
+		assets: packr.New("ruby", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (k *Julia) Scaffold(output string) error {
+	return bundler.Restore(k.assets, output)
+}
+
+// Bundle a function into a koa project
+func (k *Julia) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(k.assets, output, "ruby", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Julia{}
+)

bundler/ruby/ruby_test.go

@@ -0,0 +1,148 @@
+package ruby
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestJuliaBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.julia")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `struct Input
+    a::Number
+    b::Number
+end
+
+fx = function(input::Input)
+    return input.a + input.b
+end
+		`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle function should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/fx.rb")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/fx.rb")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

bundler/rust/rust-packr.go

@@ -0,0 +1,8 @@
+// +build !skippackr
+// Code generated by github.com/gobuffalo/packr/v2. DO NOT EDIT.
+
+// You can use the "packr clean" command to clean up this,
+// and any other packr generated files.
+package rust
+
+import _ "github.com/metrue/fx/bundler/rust/packrd"

bundler/rust/rust.go

@@ -0,0 +1,32 @@
+package rust
+
+import (
+	"github.com/gobuffalo/packr/v2"
+	"github.com/metrue/fx/bundler"
+)
+
+// Julia defines javascript bundler
+type Julia struct {
+	assets *packr.Box
+}
+
+// New a koa bundler
+func New() *Julia {
+	return &Julia{
+		assets: packr.New("rust", "./assets"),
+	}
+}
+
+// Scaffold a koa app
+func (k *Julia) Scaffold(output string) error {
+	return bundler.Restore(k.assets, output)
+}
+
+// Bundle a function into a koa project
+func (k *Julia) Bundle(output string, fn string, deps ...string) error {
+	return bundler.Bundle(k.assets, output, "rust", fn, deps...)
+}
+
+var (
+	_ bundler.Bundler = &Julia{}
+)

bundler/rust/rust_test.go

@@ -0,0 +1,148 @@
+package rust
+
+import (
+	"io/ioutil"
+	"log"
+	"os"
+	"reflect"
+	"testing"
+
+	"github.com/metrue/fx/utils"
+)
+
+func TestJuliaBundler(t *testing.T) {
+	t.Run("Scaffold", func(t *testing.T) {
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Scaffold(outputDir); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, _, _, err := utils.Diff(outputDir, "./assets")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if diff {
+			t.Fatalf("%s is not equal with %s", outputDir, "./assets")
+		}
+	})
+
+	t.Run("BundleSingleFunc", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.julia")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content := `struct Input
+    a::Number
+    b::Number
+end
+
+fx = function(input::Input)
+    return input.a + input.b
+end
+		`
+		err = ioutil.WriteFile(fd.Name(), []byte(content), 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle function should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(content)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+
+		preHandleFunc, err := ioutil.ReadFile("./assets/src/fns/mod.rs")
+		if err != nil {
+			t.Fatal(err)
+		}
+		if !reflect.DeepEqual(pre, preHandleFunc) {
+			{
+			}
+			t.Fatalf("it should get %s but got %s", preHandleFunc, pre)
+		}
+	})
+
+	t.Run("BundleFuncAndDeps", func(t *testing.T) {
+		fd, err := ioutil.TempFile("", "fx_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+		defer os.Remove(fd.Name())
+
+		content, err := ioutil.ReadFile("./assets/src/fns/mod.rs")
+		if err != nil {
+			t.Fatal(err)
+		}
+		err = ioutil.WriteFile(fd.Name(), content, 0666)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		addFunc := `
+module.exports = (a, b) => a+b
+  `
+		addFd, err := ioutil.TempFile("", "fx_add_func_*.js")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		err = ioutil.WriteFile(addFd.Name(), []byte(addFunc), 0644)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		outputDir, err := ioutil.TempDir("", "fx_julia")
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer os.RemoveAll(outputDir)
+
+		julia := New()
+		if err := julia.Bundle(outputDir, fd.Name(), addFd.Name()); err != nil {
+			t.Fatal(err)
+		}
+
+		diff, pre, cur, err := utils.Diff("./assets", outputDir)
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if !diff {
+			t.Fatalf("handle functino should be changed")
+		}
+
+		if !reflect.DeepEqual(cur, []byte(addFunc)) {
+			t.Fatalf("it should be %s but got %s", content, cur)
+		}
+		if pre != nil {
+			t.Fatal(pre)
+		}
+	})
+}

config/config.go

@@ -1,207 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/user"
-	"path"
-	"path/filepath"
-
-	dockerInfra "github.com/metrue/fx/infra/docker"
-	"github.com/metrue/fx/types"
-	"github.com/metrue/fx/utils"
-	"github.com/mitchellh/go-homedir"
-)
-
-// Configer manage fx config
-type Configer interface {
-	GetCurrentCloud() ([]byte, error)
-	GetCurrentCloudType() (string, error)
-	GetKubeConfig() (string, error)
-	UseCloud(name string) error
-	View() ([]byte, error)
-	AddCloud(name string, meta []byte) error
-	Dir() (string, error)
-}
-
-// Config config of fx
-type Config struct {
-	configFile string
-	container  *Container
-}
-
-const defaultFxConfig = "~/.fx/config.yml"
-
-// LoadDefault load default config
-func LoadDefault() (*Config, error) {
-	configFile, err := homedir.Expand(defaultFxConfig)
-	if err != nil {
-		return nil, err
-	}
-	if os.Getenv("FX_CONFIG") != "" {
-		configFile = os.Getenv("FX_CONFIG")
-	}
-
-	if _, err := os.Stat(configFile); os.IsNotExist(err) {
-		if err := utils.EnsureFile(configFile); err != nil {
-			return nil, err
-		}
-	}
-	return load(configFile)
-}
-
-func load(configFile string) (*Config, error) {
-	container, err := CreateContainer(configFile)
-	if err != nil {
-		return nil, err
-	}
-	config := &Config{
-		configFile: configFile,
-		container:  container,
-	}
-
-	if container.get("clouds") == nil {
-		if err := config.writeDefaultConfig(); err != nil {
-			return nil, err
-		}
-	}
-	return config, nil
-}
-
-// Load config
-func Load(configFile string) (*Config, error) {
-	if configFile == "" {
-		return nil, fmt.Errorf("invalid config file")
-	}
-
-	if _, err := os.Stat(configFile); os.IsNotExist(err) {
-		if err := utils.EnsureFile(configFile); err != nil {
-			return nil, err
-		}
-	}
-	return load(configFile)
-}
-
-// AddCloud add k8s cloud
-func (c *Config) AddCloud(name string, meta []byte) error {
-	var cloudMeta map[string]interface{}
-	if err := json.Unmarshal(meta, &cloudMeta); err != nil {
-		return err
-	}
-
-	cloudType, ok := cloudMeta["type"].(string)
-	if !ok || cloudType == "" {
-		return fmt.Errorf("unknown cloud type")
-	}
-
-	if cloudType == types.CloudTypeK8S {
-		dir := path.Dir(c.configFile)
-		kubecfg := path.Join(dir, name+".kubeconfig")
-		if err := utils.EnsureFile(kubecfg); err != nil {
-			return err
-		}
-		config, ok := cloudMeta["config"].(string)
-		if !ok {
-			return fmt.Errorf("invalid k8s config")
-		}
-		if err := ioutil.WriteFile(kubecfg, []byte(config), 0666); err != nil {
-			return err
-		}
-	}
-
-	if err := c.container.set("clouds."+name, cloudMeta); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// UseCloud set cloud instance with name as current context
-func (c *Config) UseCloud(name string) error {
-	if name == "" {
-		return fmt.Errorf("could not use empty name")
-	}
-
-	if c.container.get("clouds."+name) == nil {
-		return fmt.Errorf("no such cloud with name: %s", name)
-	}
-	return c.container.set("current_cloud", name)
-}
-
-// View view current config
-func (c *Config) View() ([]byte, error) {
-	return ioutil.ReadFile(c.configFile)
-}
-
-// GetCurrentCloud get current using cloud's meta
-func (c *Config) GetCurrentCloud() ([]byte, error) {
-	name, ok := c.container.get("current_cloud").(string)
-	if !ok {
-		return nil, fmt.Errorf("no active cloud")
-	}
-	meta := c.container.get("clouds." + name)
-	if meta == nil {
-		return nil, fmt.Errorf("invalid config")
-	}
-	return json.Marshal(meta)
-}
-
-// GetCurrentCloudType get current cloud type
-func (c *Config) GetCurrentCloudType() (string, error) {
-	name, ok := c.container.get("current_cloud").(string)
-	if !ok {
-		return "", fmt.Errorf("no active cloud")
-	}
-	return c.container.get("clouds." + name + ".type").(string), nil
-}
-
-// GetKubeConfig get kubeconfig
-func (c *Config) GetKubeConfig() (string, error) {
-	name, ok := c.container.get("current_cloud").(string)
-	if !ok {
-		return "", fmt.Errorf("no active cloud")
-	}
-	dir := path.Dir(c.configFile)
-	kubecfg := path.Join(dir, name+".kubeconfig")
-	return kubecfg, nil
-}
-
-func (c *Config) writeDefaultConfig() error {
-	me, err := user.Current()
-	if err != nil {
-		return err
-	}
-
-	defaultCloud := &dockerInfra.Cloud{
-		IP:   "127.0.0.1",
-		User: me.Username,
-		Name: "default",
-		Type: types.CloudTypeDocker,
-	}
-	meta, err := defaultCloud.Dump()
-	if err != nil {
-		return err
-	}
-	if err := c.container.set("clouds", map[string]interface{}{}); err != nil {
-		return err
-	}
-	if err := c.AddCloud("default", meta); err != nil {
-		return err
-	}
-	return c.UseCloud("default")
-}
-
-// Dir get directory of config
-func (c *Config) Dir() (string, error) {
-	p, err := filepath.Abs(c.configFile)
-	if err != nil {
-		return "", err
-	}
-	return path.Dir(p), nil
-}
-
-var (
-	_ Configer = &Config{}
-)

config/config_test.go

@@ -1,131 +0,0 @@
-package config
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"os/user"
-	"path/filepath"
-	"reflect"
-	"testing"
-
-	k8sInfra "github.com/metrue/fx/infra/k8s"
-	"github.com/metrue/fx/types"
-)
-
-func TestConfig(t *testing.T) {
-	configPath := "./tmp/config.yml"
-	defer func() {
-		if err := os.RemoveAll("./tmp/config.yml"); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// default cloud
-	c, err := Load(configPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defaultMeta, err := c.GetCurrentCloud()
-	if err != nil {
-		t.Fatal(err)
-	}
-	var cloudMeta map[string]string
-	if err := json.Unmarshal(defaultMeta, &cloudMeta); err != nil {
-		t.Fatal(err)
-	}
-	if cloudMeta["ip"] != "127.0.0.1" {
-		t.Fatalf("should get %s but got %s", "127.0.0.1", cloudMeta["ip"])
-	}
-
-	me, _ := user.Current()
-	if cloudMeta["user"] != me.Username {
-		t.Fatalf("should get %s but got %s", me.Username, cloudMeta["user"])
-	}
-	if cloudMeta["type"] != types.CloudTypeDocker {
-		t.Fatalf("should get %s but got %s", types.CloudTypeDocker, cloudMeta["type"])
-	}
-	if cloudMeta["name"] != "default" {
-		t.Fatalf("should get %s but got %s", "default", cloudMeta["name"])
-	}
-
-	n1, err := k8sInfra.CreateNode(
-		"1.1.1.1",
-		"user-1",
-		"k3s-master",
-		"master-node",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-	n2, err := k8sInfra.CreateNode(
-		"1.1.1.1",
-		"user-1",
-		"k3s-agent",
-		"agent-node-1",
-	)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	kName := "k8s-1"
-	kubeconf := "./tmp/" + kName + "config.yml"
-	defer func() {
-		if err := os.RemoveAll(kubeconf); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// add k8s cloud
-	kCloud := k8sInfra.NewCloud(kubeconf, n1, n2)
-	kMeta, err := kCloud.Dump()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := c.AddCloud(kName, kMeta); err != nil {
-		t.Fatal(err)
-	}
-
-	curMeta, err := c.GetCurrentCloud()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(curMeta, defaultMeta) {
-		t.Fatalf("should get %v but got %v", defaultMeta, curMeta)
-	}
-
-	if err := c.UseCloud("cloud-not-existed"); err == nil {
-		t.Fatalf("should get error when there is not given cloud name")
-	}
-
-	if err := c.UseCloud(kName); err != nil {
-		t.Fatal(err)
-	}
-
-	curMeta, err = c.GetCurrentCloud()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if reflect.DeepEqual(curMeta, kMeta) {
-		t.Fatalf("should get %v but got %v", kMeta, curMeta)
-	}
-
-	body, err := c.View()
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Println(string(body))
-
-	dir, err := c.Dir()
-	if err != nil {
-		t.Fatal(err)
-	}
-	here, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if dir != filepath.Join(here, "./tmp") {
-		t.Fatalf("should get %s but got %s", "./tmp", dir)
-	}
-}

config/container.go

@@ -1,73 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-	"sync"
-
-	"github.com/metrue/fx/utils"
-	"github.com/spf13/viper"
-)
-
-// Container config container, wrap viper as a key-value store with lock
-type Container struct {
-	mux   sync.Mutex
-	store string
-}
-
-// CreateContainer new a container
-func CreateContainer(storeFile string) (*Container, error) {
-	if err := utils.EnsureFile(storeFile); err != nil {
-		return nil, err
-	}
-
-	dir := filepath.Dir(storeFile)
-	ext := filepath.Ext(storeFile)
-	name := filepath.Base(storeFile)
-	viper.AddConfigPath(dir)
-	viper.SetConfigName(strings.Replace(name, ext, "", 1))
-	viper.SetConfigType(strings.Replace(ext, ".", "", 1))
-	if err := viper.ReadInConfig(); err != nil {
-		return nil, err
-	}
-	return &Container{
-		store: storeFile,
-	}, nil
-
-}
-
-func (c *Container) set(key string, value interface{}) error {
-	c.mux.Lock()
-	defer c.mux.Unlock()
-
-	if key == "" {
-		return fmt.Errorf("empty key not allowed")
-	}
-
-	keys := strings.Split(key, ".")
-	if len(keys) == 1 {
-		viper.Set(key, value)
-	} else {
-		prePath := keys[0]
-		for i := 1; i < len(keys)-2; i++ {
-			prePath += "." + keys[i]
-		}
-		if viper.Get(prePath) == nil {
-			return fmt.Errorf("%s not existed", prePath)
-		}
-		viper.Set(key, value)
-	}
-	// viper.Set(key, value)
-	if err := viper.WriteConfig(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (c *Container) get(key string) interface{} {
-	c.mux.Lock()
-	defer c.mux.Unlock()
-
-	return viper.Get(key)
-}

config/container_test.go

@@ -1,84 +0,0 @@
-package config
-
-import (
-	"os"
-	"testing"
-)
-
-func TestContainer(t *testing.T) {
-	configPath := "./tmp/container.yml"
-	defer func() {
-		if err := os.RemoveAll("./tmp/container.yml"); err != nil {
-			t.Fatal(err)
-		}
-	}()
-	c, err := CreateContainer(configPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := c.set("", ""); err == nil {
-		t.Fatalf("should get error when key is empty")
-	}
-
-	if c.get("1") != nil {
-		t.Fatalf("should get %v but got %v", nil, c.get("key"))
-	}
-
-	// create
-	if err := c.set("1", "1"); err != nil {
-		t.Fatal(err)
-	}
-
-	// read
-	if c.get("1").(string) != "1" {
-		t.Fatalf("should get %s but got %s", "val-1", c.get("key"))
-	}
-
-	// invaliad set
-	if err := c.set("1.1", "1.1"); err != nil {
-		t.Fatal(err)
-	}
-	if c.get("1.1").(string) != "1.1" {
-		t.Fatalf("should get 1.1 but got %s", c.get("1.1"))
-	}
-
-	// update
-	if err := c.set("1", "11"); err != nil {
-		t.Fatal(err)
-	}
-	if c.get("1").(string) != "11" {
-		t.Fatalf("should get 11 but got %s", c.get("1").(string))
-	}
-
-	// nested set
-	if err := c.set("2.2.2.2", "2222"); err == nil {
-		t.Fatalf("should throw error since 2.2.2 not ready yet")
-	}
-
-	if err := c.set("2", map[string]interface{}{
-		"2": map[string]interface{}{
-			"2": "2",
-		},
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if c.get("2.2.2").(string) != "2" {
-		t.Fatalf("should get 2 but got %s", c.get("2.2.2"))
-	}
-	if err := c.set("2.2.2.2", "2222"); err != nil {
-		t.Fatal(err)
-	}
-	if c.get("2.2.2.2").(string) != "2222" {
-		t.Fatalf("should get 2222 but got %s", c.get("2.2.2.2"))
-	}
-
-	if err := c.set("2.2.2.1", "1111"); err != nil {
-		t.Fatal(err)
-	}
-
-	if c.get("2.2.2.1").(string) != "1111" {
-		t.Fatalf("should get 1111 but got %s", c.get("2.2.2.1"))
-	}
-}

constants/languages.go

@@ -0,0 +1,15 @@
+package constants
+
+// ExtLangMapping file extension mapping with programming language
+var ExtLangMapping = map[string]string{
+	".js":   "node",
+	".go":   "go",
+	".rb":   "ruby",
+	".py":   "python",
+	".php":  "php",
+	".jl":   "julia",
+	".java": "java",
+	".d":    "d",
+	".rs":   "rust",
+	".pl":   "perl",
+}

container_runtimes/docker/http/api.go

@@ -18,7 +18,6 @@ import (
 	"github.com/apex/log"
 	dockerTypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
-	dockerTypesContainer "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	"github.com/docker/go-connections/nat"
 	"github.com/google/go-querystring/query"
@@ -397,12 +396,12 @@ func (api *API) StartContainer(ctx context.Context, name string, image string, b
 		portSet[port] = struct{}{}
 		portMap[port] = bindings
 	}
-	config := &dockerTypesContainer.Config{
+	config := &container.Config{
 		Image:        image,
 		ExposedPorts: portSet,
 	}
 
-	hostConfig := &dockerTypesContainer.HostConfig{
+	hostConfig := &container.HostConfig{
 		AutoRemove:   !fxConfig.DisableContainerAutoremove,
 		PortBindings: portMap,
 	}

context/context.go

@@ -52,6 +52,7 @@ func (ctx *Context) GetCliContext() *cli.Context {
 
 // Set a value with name
 func (ctx *Context) Set(name string, value interface{}) {
+	// nolint
 	newCtx := context.WithValue(ctx.Context, name, value)
 	ctx.Context = newCtx
 }

fx.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"os/user"
 	"regexp"
 
 	"github.com/apex/log"
@@ -13,11 +14,12 @@ import (
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/handlers"
 	"github.com/metrue/fx/middlewares"
+	"github.com/mitchellh/go-homedir"
 	"github.com/urfave/cli"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
-const version = "0.9.2"
+const version = "0.9.31"
 
 func init() {
 	go checkForUpdate()
@@ -77,61 +79,18 @@ func main() {
 			fmt.Println(aurora.Red("*****************"))
 		}
 	}()
+	user, err := user.Current()
+	if err != nil {
+		panic(err)
+	}
+	defaultHost := user.Username + "@localhost"
+
+	defaultSSHKeyFile, err := homedir.Expand("~/.ssh/id_rsa")
+	if err != nil {
+		panic(err)
+	}
 
 	app.Commands = []cli.Command{
-		{
-			Name:  "infra",
-			Usage: "manage infrastructure",
-			Subcommands: []cli.Command{
-				{
-					Name:  "create",
-					Usage: "create a infra for fx service",
-					Flags: []cli.Flag{
-						cli.StringFlag{
-							Name:  "type, t",
-							Usage: "infracture type, 'docker', 'k8s' and 'k3s' support",
-						},
-						cli.StringFlag{
-							Name:  "name, n",
-							Usage: "name to identify the infrastructure",
-						},
-						cli.StringFlag{
-							Name:  "host",
-							Usage: "user and ip of your host, eg. 'root@182.12.1.12'",
-						},
-						cli.StringFlag{
-							Name:  "master",
-							Usage: "serve as master node in K3S cluster, eg. 'root@182.12.1.12'",
-						},
-						cli.StringFlag{
-							Name:  "agents",
-							Usage: "serve as agent node in K3S cluster, eg. 'root@187.1. 2. 3,root@123.3.2.1'",
-						},
-					},
-
-					Action: handle(
-						middlewares.LoadConfig,
-						handlers.Setup,
-					),
-				},
-				{
-					Name:  "list",
-					Usage: "list all infrastructures",
-					Action: handle(
-						middlewares.LoadConfig,
-						handlers.ListInfra,
-					),
-				},
-				{
-					Name:  "use",
-					Usage: "set current context to target cloud with given name",
-					Action: handle(
-						middlewares.LoadConfig,
-						handlers.UseInfra,
-					),
-				},
-			},
-		},
 		{
 			Name:      "up",
 			Usage:     "deploy a function",
@@ -146,6 +105,25 @@ func main() {
 					Name:  "port, p",
 					Usage: "port number",
 				},
+				cli.StringFlag{
+					Name:  "host, H",
+					Usage: "target host, <user>@<host>",
+					Value: defaultHost,
+				},
+				cli.StringFlag{
+					Name:  "ssh_port, P",
+					Usage: "SSH port for target host",
+					Value: "22",
+				},
+				cli.StringFlag{
+					Name:  "ssh_key, K",
+					Usage: "SSH key file for login target host",
+					Value: defaultSSHKeyFile,
+				},
+				cli.StringFlag{
+					Name:  "kubeconf, C",
+					Usage: "kubeconf of kubernetes cluster",
+				},
 				cli.BoolFlag{
 					Name:  "healthcheck, hc",
 					Usage: "do a health check after service up",
@@ -156,10 +134,11 @@ func main() {
 				},
 			},
 			Action: handle(
-				middlewares.LoadConfig,
-				middlewares.Provision,
 				middlewares.Parse("up"),
+				middlewares.Provision,
+				middlewares.Language(),
 				middlewares.Binding,
+				middlewares.Driver,
 				middlewares.Build,
 				handlers.Up,
 			),
@@ -168,10 +147,31 @@ func main() {
 			Name:      "down",
 			Usage:     "destroy a service",
 			ArgsUsage: "[service 1, service 2, ....]",
+			Flags: []cli.Flag{
+				cli.StringFlag{
+					Name:  "ssh_port, P",
+					Usage: "SSH port for target host",
+					Value: "22",
+				},
+				cli.StringFlag{
+					Name:  "ssh_key, K",
+					Usage: "SSH key file for login target host",
+					Value: defaultSSHKeyFile,
+				},
+				cli.StringFlag{
+					Name:  "host, H",
+					Usage: "target host, <user>@<host>",
+					Value: defaultHost,
+				},
+				cli.StringFlag{
+					Name:  "kubeconf, C",
+					Usage: "kubeconf of kubernetes cluster",
+				},
+			},
 			Action: handle(
 				middlewares.Parse("down"),
-				middlewares.LoadConfig,
 				middlewares.Provision,
+				middlewares.Driver,
 				handlers.Down,
 			),
 		},
@@ -185,11 +185,30 @@ func main() {
 					Value: "table",
 					Usage: "output format, 'table' and 'JSON' supported",
 				},
+				cli.StringFlag{
+					Name:  "ssh_port, P",
+					Usage: "SSH port for target host",
+					Value: "22",
+				},
+				cli.StringFlag{
+					Name:  "ssh_key, K",
+					Usage: "SSH key file for login target host",
+					Value: defaultSSHKeyFile,
+				},
+				cli.StringFlag{
+					Name:  "host, H",
+					Usage: "target host, <user>@<host>",
+					Value: defaultHost,
+				},
+				cli.StringFlag{
+					Name:  "kubeconf, C",
+					Usage: "kubeconf of kubernetes cluster",
+				},
 			},
 			Action: handle(
 				middlewares.Parse("list"),
-				middlewares.LoadConfig,
 				middlewares.Provision,
+				middlewares.Driver,
 				handlers.List,
 			),
 		},
@@ -197,9 +216,20 @@ func main() {
 			Name:  "call",
 			Usage: "run a function instantly",
 			Flags: []cli.Flag{
+				cli.StringFlag{
+					Name:  "ssh_port, P",
+					Usage: "SSH port for target host",
+					Value: "22",
+				},
+				cli.StringFlag{
+					Name:  "ssh_key, K",
+					Usage: "SSH key file for login target host",
+					Value: defaultSSHKeyFile,
+				},
 				cli.StringFlag{
 					Name:  "host, H",
 					Usage: "fx server host, default is localhost",
+					Value: defaultHost,
 				},
 			},
 			Action: handle(handlers.Call),
@@ -212,15 +242,26 @@ func main() {
 					Name:  "build",
 					Usage: "build a image",
 					Flags: []cli.Flag{
+						cli.StringFlag{
+							Name:  "ssh_port, P",
+							Usage: "SSH port for target host",
+							Value: "22",
+						},
+						cli.StringFlag{
+							Name:  "ssh_key, K",
+							Usage: "SSH key file for login target host",
+							Value: defaultSSHKeyFile,
+						},
 						cli.StringFlag{
 							Name:  "tag, t",
 							Usage: "image tag",
+							Value: uuid.New().String(),
 						},
 					},
 					Action: handle(
-						middlewares.LoadConfig,
-						middlewares.Provision,
 						middlewares.Parse("image_build"),
+						middlewares.Provision,
+						middlewares.Language(),
 						handlers.BuildImage,
 					),
 				},
@@ -234,9 +275,8 @@ func main() {
 						},
 					},
 					Action: handle(
-						middlewares.LoadConfig,
-						middlewares.Provision,
 						middlewares.Parse("image_export"),
+						middlewares.Language(),
 						handlers.ExportImage,
 					),
 				},

go.mod

@@ -14,8 +14,9 @@ require (
 	github.com/dsnet/compress v0.0.1 // indirect
 	github.com/gin-gonic/gin v1.4.0
 	github.com/gobuffalo/envy v1.8.1 // indirect
-	github.com/gobuffalo/packr v1.30.1
-	github.com/golang/mock v1.4.1
+	github.com/gobuffalo/packd v1.0.0
+	github.com/gobuffalo/packr/v2 v2.8.0
+	github.com/golang/mock v1.4.2
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0
 	github.com/google/uuid v1.1.1
@@ -23,7 +24,7 @@ require (
 	github.com/gorilla/mux v1.7.3 // indirect
 	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434
-	github.com/metrue/go-ssh-client v0.0.0-20191219103445-1f07b67e2b29
+	github.com/metrue/go-ssh-client v0.0.0-20200317035802-7c3bc0c87929
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/morikuni/aec v1.0.0 // indirect
@@ -31,16 +32,15 @@ require (
 	github.com/olekukonko/tablewriter v0.0.4
 	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
 	github.com/opencontainers/image-spec v1.0.1 // indirect
-	github.com/otiai10/copy v1.0.2
+	github.com/otiai10/copy v1.1.1
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/pierrec/lz4 v0.0.0-20190222153722-062282ea0dcf // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/rogpeppe/go-internal v1.5.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.6.2
 	github.com/stretchr/testify v1.5.1
 	github.com/ugorji/go v1.1.7 // indirect
-	github.com/urfave/cli v1.22.2
+	github.com/urfave/cli v1.22.3
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 // indirect
 	golang.org/x/sys v0.0.0-20191223224216-5a3cf8467b4e // indirect

go.sum

@@ -21,8 +21,6 @@ github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
 github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/apex/log v1.1.1 h1:BwhRZ0qbjYtTob0I+2M+smavV0kOC8XgcnGZcyL9liA=
-github.com/apex/log v1.1.1/go.mod h1:Ls949n1HFtXfbDcjiTTFQqkVUrte0puoIBfO3SVgwOA=
 github.com/apex/log v1.1.2 h1:bnDuVoi+o98wOdVqfEzNDlY0tcmBia7r4YkjS9EqGYk=
 github.com/apex/log v1.1.2/go.mod h1:SyfRweFO+TlkIJ3DVizTSeI1xk7jOIIqOnUPZQTTsww=
 github.com/apex/logs v0.0.3/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo=
@@ -33,8 +31,6 @@ github.com/aws/aws-sdk-go v1.20.6/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/briandowns/spinner v1.7.0 h1:aan1hBBOoscry2TXAkgtxkJiq7Se0+9pt+TUWaPrB4g=
-github.com/briandowns/spinner v1.7.0/go.mod h1://Zf9tMcxfRUA36V23M6YGEAv+kECGfvpnLTnb8n4XQ=
 github.com/briandowns/spinner v1.9.0 h1:+OMAisemaHar1hjuJ3Z2hIvNhQl9Y7GLPWUwwz2Pxo8=
 github.com/briandowns/spinner v1.9.0/go.mod h1://Zf9tMcxfRUA36V23M6YGEAv+kECGfvpnLTnb8n4XQ=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -49,6 +45,8 @@ github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -97,12 +95,16 @@ github.com/gobuffalo/envy v1.8.1 h1:RUr68liRvs0TS1D5qdW3mQv2SjAsu1QWMCx1tG4kDjs=
 github.com/gobuffalo/envy v1.8.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w=
 github.com/gobuffalo/logger v1.0.0 h1:xw9Ko9EcC5iAFprrjJ6oZco9UpzS5MQ4jAwghsLHdy4=
 github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs=
+github.com/gobuffalo/logger v1.0.3 h1:YaXOTHNPCvkqqA7w05A4v0k2tCdpr+sgFlgINbQ6gqc=
+github.com/gobuffalo/logger v1.0.3/go.mod h1:SoeejUwldiS7ZsyCBphOGURmWdwUFXs0J7TCjEhjKxM=
 github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4=
 github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q=
-github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg=
-github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk=
+github.com/gobuffalo/packd v1.0.0 h1:6ERZvJHfe24rfFmA9OaoKBdC7+c9sydrytMg8SdFGBM=
+github.com/gobuffalo/packd v1.0.0/go.mod h1:6VTc4htmJRFB7u1m/4LeMTWjFoYrUiBkU9Fdec9hrhI=
 github.com/gobuffalo/packr/v2 v2.5.1 h1:TFOeY2VoGamPjQLiNDT3mn//ytzk236VMO2j7iHxJR4=
 github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw=
+github.com/gobuffalo/packr/v2 v2.8.0 h1:IULGd15bQL59ijXLxEvA5wlMxsmx/ZkQv9T282zNVIY=
+github.com/gobuffalo/packr/v2 v2.8.0/go.mod h1:PDk2k3vGevNE3SwVyVRgQCCXETC9SaONCNSXT1Q8M1g=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d h1:3PaI8p3seN09VjbTYC/QWlUZdZ1qS1zGjy7LH2Wt07I=
@@ -115,10 +117,10 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1 h1:qGJ6qTW+x6xX/my+8YUVl4WNpX9B7+/l2tRsHGZ7f2s=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0 h1:Rd1kQnQu0Hq3qvJppYSG0HtP+f5LPPUiDswTLiEegLg=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/mock v1.4.1 h1:ocYkMQY5RrXTYgXl7ICpV0IXwlEQGwKIsery4gyXa1U=
 github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.2 h1:fXIkPzOBCwDUPvYmOPzETABgbqpYlYNigQ2o64eMr5c=
+github.com/golang/mock v1.4.2/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -179,6 +181,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/karrick/godirwalk v1.10.12 h1:BqUm+LuJcXjGv1d2mj3gBiQyrQ57a0rYoAmhvJQ7RDU=
 github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA=
+github.com/karrick/godirwalk v1.15.3 h1:0a2pXOgtB16CqIqXTiT7+K9L73f74n/aNQUnH6Ortew=
+github.com/karrick/godirwalk v1.15.3/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -200,6 +204,12 @@ github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czP
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI=
+github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc=
+github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY=
+github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI=
+github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI=
+github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
@@ -213,6 +223,10 @@ github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/metrue/go-ssh-client v0.0.0-20191219103445-1f07b67e2b29 h1:ENoMPMVc24XbBuVZ7guZmTB/7MSd+vqOkImSu9UUiJw=
 github.com/metrue/go-ssh-client v0.0.0-20191219103445-1f07b67e2b29/go.mod h1:aPG/JtXTyLliKDDlkv+nzHbSbz2p2CBMAjNJRK4uhzY=
+github.com/metrue/go-ssh-client v0.0.0-20200317034720-e3f45ef1916d h1:vLJfcEJfjiL2LBGBoZbS1mcNjVBXxM4v2vZuUX5XiBE=
+github.com/metrue/go-ssh-client v0.0.0-20200317034720-e3f45ef1916d/go.mod h1:aPG/JtXTyLliKDDlkv+nzHbSbz2p2CBMAjNJRK4uhzY=
+github.com/metrue/go-ssh-client v0.0.0-20200317035802-7c3bc0c87929 h1:Z/+UhJcqXfrTgosjU8s91ASl8JOqh29/YJh8Tu26hw8=
+github.com/metrue/go-ssh-client v0.0.0-20200317035802-7c3bc0c87929/go.mod h1:aPG/JtXTyLliKDDlkv+nzHbSbz2p2CBMAjNJRK4uhzY=
 github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
@@ -248,10 +262,14 @@ github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVo
 github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
 github.com/otiai10/copy v1.0.2 h1:DDNipYy6RkIkjMwy+AWzgKiNTyj2RUI9yEMeETEpVyc=
 github.com/otiai10/copy v1.0.2/go.mod h1:c7RpqBkwMom4bYTSkLSym4VSJz/XtncWRAj/J4PEIMY=
+github.com/otiai10/copy v1.1.1 h1:PH7IFlRQ6Fv9vYmuXbDRLdgTHoP1w483kPNUP2bskpo=
+github.com/otiai10/copy v1.1.1/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95 h1:+OLn68pqasWca0z5ryit9KGfp3sUsW4Lqg32iRMJyzs=
 github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
+github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
 github.com/otiai10/mint v1.3.0 h1:Ady6MKVezQwHBkGzLFbrsywyp09Ah7rkmfjV3Bcr5uc=
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
+github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
@@ -262,8 +280,6 @@ github.com/pierrec/lz4 v0.0.0-20190222153722-062282ea0dcf/go.mod h1:3/3N9NVKO0je
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.0 h1:J8lpUdobwIeCI7OiSxHqEwJUKvJwicL5+3v1oe2Yb4k=
-github.com/pkg/errors v0.9.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA=
@@ -287,6 +303,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.5.1 h1:asQ0uD7BN9RU5Im41SEEZTwCi/zAXdMOLS3npYaos2g=
 github.com/rogpeppe/go-internal v1.5.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q=
@@ -314,6 +331,7 @@ github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
+github.com/spf13/cobra v0.0.6/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -323,8 +341,7 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.3.2 h1:VUFqw5KcqRf7i70GOzW7N+Q7+gxVBkSSqiXB12+JQ4M=
 github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
-github.com/spf13/viper v1.6.1 h1:VPZzIkznI1YhVMRi6vNFLHSwhnhReBfgTxIPccpfdZk=
-github.com/spf13/viper v1.6.1/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
+github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.6.2 h1:7aKfF+e8/k68gda3LOjo5RxiUqddoFxVq4BKBPrxk5E=
 github.com/spf13/viper v1.6.2/go.mod h1:t3iDnF5Jlj76alVNuyFBk5oUMCvsrkbvZK0WQdfDi5k=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -355,6 +372,8 @@ github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
 github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
 github.com/urfave/cli v1.22.2 h1:gsqYFH8bb9ekPA12kRo0hfjngWQjkJPlN9R0N78BoUo=
 github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli v1.22.3 h1:FpNT6zq26xNpHZy08emi755QwzLPs6Pukqjlc7RfOMU=
+github.com/urfave/cli v1.22.3/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
@@ -373,6 +392,8 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4 h1:HuIa8hRrWRSrqYzx1qI49NNxhdi2PrY7gxVSq1JjLDc=
 golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 h1:aJ0ex187qoXrJHPo8ZasVTASQB7llQP6YeNzgDALPRk=
 golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -380,6 +401,7 @@ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20170114055629-f2499483f923/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -396,6 +418,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
 golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be h1:vEDujvNQGv4jgYKudGeI/+DAX4Jffq6hpD55MmoEvKs=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -407,6 +431,7 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58 h1:8gQV6CLnAEikrhgkHFbMAEhagSSnXWGV915qUMm9mrU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -445,6 +470,11 @@ golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c h1:KfpJVdWhuRqNk4XVXzjXf2KAV4TBEP77SYdFGjeGuIE=
 golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200308013534-11ec41452d41/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

handlers/image.go

@@ -6,14 +6,12 @@ import (
 	"time"
 
 	"github.com/apex/log"
+	"github.com/metrue/fx/bundle"
 	"github.com/metrue/fx/constants"
 	containerruntimes "github.com/metrue/fx/container_runtimes"
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/hook"
-	"github.com/metrue/fx/packer"
 	"github.com/metrue/fx/pkg/spinner"
-	"github.com/metrue/fx/utils"
-	"github.com/otiai10/copy"
 )
 
 // BuildImage build image
@@ -25,24 +23,16 @@ func BuildImage(ctx context.Contexter) (err error) {
 	workdir := fmt.Sprintf("/tmp/fx-%d", time.Now().Unix())
 	defer os.RemoveAll(workdir)
 
-	sources := ctx.Get("sources").([]string)
+	fn := ctx.Get("fn").(string)
+	deps := ctx.Get("deps").([]string)
+	language := ctx.Get("language").(string)
 
-	if len(sources) == 0 {
-		return fmt.Errorf("source file/directory of function required")
+	if err := bundle.Bundle(workdir, language, fn, deps...); err != nil {
+		return err
 	}
-	if len(sources) == 1 &&
-		utils.IsDir(sources[0]) &&
-		utils.HasDockerfile(sources[0]) {
-		if err := copy.Copy(sources[0], workdir); err != nil {
-			return err
-		}
-	} else {
-		if err := packer.Pack(workdir, sources...); err != nil {
-			return err
-		}
-		if err := hook.RunBeforeBuildHook(workdir); err != nil {
-			return err
-		}
+
+	if err := hook.RunBeforeBuildHook(workdir); err != nil {
+		return err
 	}
 
 	docker := ctx.Get("docker").(containerruntimes.ContainerRuntime)
@@ -57,24 +47,17 @@ func BuildImage(ctx context.Contexter) (err error) {
 // ExportImage export service's code into a directory
 func ExportImage(ctx context.Contexter) (err error) {
 	outputDir := ctx.Get("output").(string)
-	sources := ctx.Get("sources").([]string)
+	fn := ctx.Get("fn").(string)
+	deps := ctx.Get("deps").([]string)
 
-	if len(sources) == 0 {
-		return fmt.Errorf("source file/directory of function required")
+	language := ctx.Get("language").(string)
+
+	if err := bundle.Bundle(outputDir, language, fn, deps...); err != nil {
+		return err
 	}
-	if len(sources) == 1 &&
-		utils.IsDir(sources[0]) &&
-		utils.HasDockerfile(sources[0]) {
-		if err := copy.Copy(sources[0], outputDir); err != nil {
-			return err
-		}
-	} else {
-		if err := packer.Pack(outputDir, sources...); err != nil {
-			return err
-		}
-		if err := hook.RunBeforeBuildHook(outputDir); err != nil {
-			return err
-		}
+
+	if err := hook.RunBeforeBuildHook(outputDir); err != nil {
+		return err
 	}
 
 	log.Infof("exported to %v: %v", outputDir, constants.CheckedSymbol)

handlers/infra.go

@@ -1,113 +0,0 @@
-package handlers
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/metrue/fx/config"
-	"github.com/metrue/fx/context"
-	dockerInfra "github.com/metrue/fx/infra/docker"
-	k8sInfra "github.com/metrue/fx/infra/k8s"
-	"github.com/metrue/fx/pkg/spinner"
-)
-
-func setupK8S(configDir string, name, masterInfo string, agentsInfo string) ([]byte, error) {
-	info := strings.Split(masterInfo, "@")
-	if len(info) != 2 {
-		return nil, fmt.Errorf("incorrect master info, should be <user>@<ip> format")
-	}
-	master, err := k8sInfra.CreateNode(info[1], info[0], "k3s_master", "master")
-	if err != nil {
-		return nil, err
-	}
-	nodes := []k8sInfra.Noder{master}
-	if agentsInfo != "" {
-		agentsInfoList := strings.Split(agentsInfo, ",")
-		for idx, agent := range agentsInfoList {
-			info := strings.Split(agent, "@")
-			if len(info) != 2 {
-				return nil, fmt.Errorf("incorrect agent info, should be <user>@<ip> format")
-			}
-			node, err := k8sInfra.CreateNode(info[1], info[0], "k3s_agent", fmt.Sprintf("agent-%d", idx))
-			if err != nil {
-				return nil, err
-			}
-
-			nodes = append(nodes, node)
-		}
-	}
-	kubeconfigPath := filepath.Join(configDir, name+".kubeconfig")
-	cloud := k8sInfra.NewCloud(kubeconfigPath, nodes...)
-	if err := cloud.Provision(); err != nil {
-		return nil, err
-	}
-	return cloud.Dump()
-}
-
-func setupDocker(hostInfo string, name string) ([]byte, error) {
-	info := strings.Split(hostInfo, "@")
-	if len(info) != 2 {
-		return nil, fmt.Errorf("incorrect master info, should be <user>@<ip> format")
-	}
-	user := info[0]
-	host := info[1]
-
-	cloud, err := dockerInfra.Create(host, user, name)
-	if err != nil {
-		return nil, err
-	}
-	if err := cloud.Provision(); err != nil {
-		return nil, err
-	}
-	return cloud.Dump()
-}
-
-// Setup infra
-func Setup(ctx context.Contexter) (err error) {
-	const task = "setup infra"
-	spinner.Start(task)
-	defer func() {
-		spinner.Stop(task, err)
-	}()
-
-	cli := ctx.GetCliContext()
-	typ := cli.String("type")
-	name := cli.String("name")
-	if name == "" {
-		return fmt.Errorf("name required")
-	}
-	if typ == "docker" {
-		if cli.String("host") == "" {
-			return fmt.Errorf("host required, eg. 'root@123.1.2.12'")
-		}
-	} else if typ == "k8s" {
-		if cli.String("master") == "" {
-			return fmt.Errorf("master required, eg. 'root@123.1.2.12'")
-		}
-	} else {
-		return fmt.Errorf("invalid type, 'docker' and 'k8s' support")
-	}
-
-	fxConfig := ctx.Get("config").(*config.Config)
-
-	switch strings.ToLower(typ) {
-	case "k8s":
-		dir, err := fxConfig.Dir()
-		if err != nil {
-			return err
-		}
-		kubeconf, err := setupK8S(dir, name, cli.String("master"), cli.String("agents"))
-		if err != nil {
-			return err
-		}
-		return fxConfig.AddCloud(name, kubeconf)
-	case "docker":
-		config, err := setupDocker(cli.String("host"), name)
-		if err != nil {
-			return err
-		}
-		return fxConfig.AddCloud(name, config)
-	}
-	return nil
-}

handlers/list.go

@@ -9,13 +9,20 @@ import (
 // List command handle
 func List(ctx context.Contexter) (err error) {
 	cli := ctx.GetCliContext()
-	deployer := ctx.Get("deployer").(infra.Deployer)
 	format := ctx.Get("format").(string)
 
-	services, err := deployer.List(ctx.GetContext(), cli.Args().First())
-	if err != nil {
-		return err
+	for _, targetdriver := range []string{"docker_driver", "k8s_driver"} {
+		driver, ok := ctx.Get(targetdriver).(infra.Deployer)
+		if !ok {
+			continue
+		}
+		services, err := driver.List(ctx.GetContext(), cli.Args().First())
+		if err != nil {
+			return err
+		}
+		if err := renderrer.Render(services, format); err != nil {
+			return err
+		}
 	}
-
-	return renderrer.Render(services, format)
+	return nil
 }

handlers/list_infra.go

@@ -1,19 +0,0 @@
-package handlers
-
-import (
-	"fmt"
-
-	"github.com/metrue/fx/config"
-	"github.com/metrue/fx/context"
-)
-
-// ListInfra list infra
-func ListInfra(ctx context.Contexter) (err error) {
-	fxConfig := ctx.Get("config").(*config.Config)
-	conf, err := fxConfig.View()
-	if err != nil {
-		return err
-	}
-	fmt.Println(string(conf))
-	return nil
-}

handlers/up.go

@@ -19,28 +19,37 @@ func Up(ctx context.Contexter) (err error) {
 		image = ""
 	}
 	name := ctx.Get("name").(string)
-	deployer := ctx.Get("deployer").(infra.Deployer)
 	bindings := ctx.Get("bindings").([]types.PortBinding)
 	force := ctx.Get("force").(bool)
-	if force && name != "" {
-		if err := deployer.Destroy(ctx.GetContext(), name); err != nil {
-			log.Warnf("destroy service %s failed: %v", name, err)
+
+	for _, targetdriver := range []string{"docker_driver", "k8s_driver"} {
+		driver, ok := ctx.Get(targetdriver).(infra.Deployer)
+		if !ok {
+			continue
+		}
+		if force && name != "" {
+			if err := driver.Destroy(ctx.GetContext(), name); err != nil {
+				log.Warnf("destroy service %s failed: %v", name, err)
+			}
+		}
+
+		if err := driver.Deploy(
+			ctx.GetContext(),
+			fn,
+			name,
+			image,
+			bindings,
+		); err != nil {
+			return err
+		}
+
+		service, err := driver.GetStatus(ctx.GetContext(), name)
+		if err != nil {
+			return err
+		}
+		if err := renderrer.Render([]types.Service{service}, "table"); err != nil {
+			return err
 		}
 	}
-
-	if err := deployer.Deploy(
-		ctx.GetContext(),
-		fn,
-		name,
-		image,
-		bindings,
-	); err != nil {
-		return err
-	}
-
-	service, err := deployer.GetStatus(ctx.GetContext(), name)
-	if err != nil {
-		return err
-	}
-	return renderrer.Render([]types.Service{service}, "table")
+	return nil
 }

handlers/up_test.go

@@ -16,7 +16,7 @@ func TestUp(t *testing.T) {
 		defer ctrl.Finish()
 
 		ctx := mockCtx.NewMockContexter(ctrl)
-		deployer := mockDeployer.NewMockDeployer(ctrl)
+		driver := mockDeployer.NewMockDeployer(ctrl)
 
 		bindings := []types.PortBinding{}
 		name := "sample-name"
@@ -24,18 +24,19 @@ func TestUp(t *testing.T) {
 		data := "sample-data"
 		ctx.EXPECT().Get("name").Return(name)
 		ctx.EXPECT().Get("image").Return(image)
-		ctx.EXPECT().Get("deployer").Return(deployer)
+		ctx.EXPECT().Get("docker_driver").Return(driver)
+		ctx.EXPECT().Get("k8s_driver").Return(driver)
 		ctx.EXPECT().Get("bindings").Return(bindings)
 		ctx.EXPECT().Get("data").Return(data)
 		ctx.EXPECT().Get("force").Return(false)
-		ctx.EXPECT().GetContext().Return(context.Background()).Times(2)
-		deployer.EXPECT().Deploy(gomock.Any(), data, name, image, bindings).Return(nil)
-		deployer.EXPECT().GetStatus(gomock.Any(), name).Return(types.Service{
+		ctx.EXPECT().GetContext().Return(context.Background()).Times(4)
+		driver.EXPECT().Deploy(gomock.Any(), data, name, image, bindings).Return(nil).Times(2)
+		driver.EXPECT().GetStatus(gomock.Any(), name).Return(types.Service{
 			ID:   "id-1",
 			Name: name,
 			Host: "127.0.0.1",
 			Port: 2100,
-		}, nil)
+		}, nil).Times(2)
 		if err := Up(ctx); err != nil {
 			t.Fatal(err)
 		}
@@ -46,7 +47,7 @@ func TestUp(t *testing.T) {
 		defer ctrl.Finish()
 
 		ctx := mockCtx.NewMockContexter(ctrl)
-		deployer := mockDeployer.NewMockDeployer(ctrl)
+		driver := mockDeployer.NewMockDeployer(ctrl)
 
 		bindings := []types.PortBinding{}
 		name := "sample-name"
@@ -54,19 +55,20 @@ func TestUp(t *testing.T) {
 		data := "sample-data"
 		ctx.EXPECT().Get("name").Return(name)
 		ctx.EXPECT().Get("image").Return(image)
-		ctx.EXPECT().Get("deployer").Return(deployer)
+		ctx.EXPECT().Get("docker_driver").Return(driver)
+		ctx.EXPECT().Get("k8s_driver").Return(driver)
 		ctx.EXPECT().Get("bindings").Return(bindings)
 		ctx.EXPECT().Get("data").Return(data)
 		ctx.EXPECT().Get("force").Return(true)
-		ctx.EXPECT().GetContext().Return(context.Background()).Times(3)
-		deployer.EXPECT().Deploy(gomock.Any(), data, name, image, bindings).Return(nil)
-		deployer.EXPECT().Destroy(gomock.Any(), name).Return(nil)
-		deployer.EXPECT().GetStatus(gomock.Any(), name).Return(types.Service{
+		ctx.EXPECT().GetContext().Return(context.Background()).Times(6)
+		driver.EXPECT().Deploy(gomock.Any(), data, name, image, bindings).Return(nil).Times(2)
+		driver.EXPECT().Destroy(gomock.Any(), name).Return(nil).Times(2)
+		driver.EXPECT().GetStatus(gomock.Any(), name).Return(types.Service{
 			ID:   "id-1",
 			Name: name,
 			Host: "127.0.0.1",
 			Port: 2100,
-		}, nil)
+		}, nil).Times(2)
 		if err := Up(ctx); err != nil {
 			t.Fatal(err)
 		}

handlers/use_infra.go

@@ -1,13 +0,0 @@
-package handlers
-
-import (
-	"github.com/metrue/fx/config"
-	"github.com/metrue/fx/context"
-)
-
-// UseInfra use infra
-func UseInfra(ctx context.Contexter) error {
-	fxConfig := ctx.Get("config").(*config.Config)
-	cli := ctx.GetCliContext()
-	return fxConfig.UseCloud(cli.Args().First())
-}

infra/docker/cloud.go

@@ -1,52 +1,50 @@
 package docker
 
 import (
-	"encoding/json"
 	"fmt"
 	"os"
 	"os/exec"
-	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/metrue/fx/infra"
 	"github.com/metrue/fx/types"
 	"github.com/metrue/go-ssh-client"
-	"github.com/mitchellh/go-homedir"
 )
 
 // Cloud define a docker host
 type Cloud struct {
-	IP   string `json:"ip"`
-	User string `json:"user"`
-	Name string `json:"name"`
-	Type string `json:"type"`
+	IP      string `json:"ip"`
+	User    string `json:"user"`
+	Port    string `json:"port"`
+	Type    string `json:"type"`
+	KeyFile string `json:"key_file"`
 
 	sshClient ssh.Clienter
 }
 
+const sshConnectionTimeout = 10 * time.Second
+
 // New new a docker cloud
-func New(ip string, user string, name string) *Cloud {
+func New(ip string, user string, port string, keyfile string) *Cloud {
 	return &Cloud{
-		IP:   ip,
-		User: user,
-		Name: name,
-		Type: types.CloudTypeDocker,
+		IP:      ip,
+		User:    user,
+		Port:    port,
+		KeyFile: keyfile,
+		Type:    types.CloudTypeDocker,
 	}
 }
 
 // Create a docker node
-func Create(ip string, user string, name string) (*Cloud, error) {
-	key, err := sshkey()
-	if err != nil {
-		return nil, err
-	}
-	port := sshport()
-	sshClient := ssh.New(ip).WithUser(user).WithKey(key).WithPort(port)
+func Create(ip string, user string, port string, keyfile string) (*Cloud, error) {
+	sshClient := ssh.New(ip).WithUser(user).WithKey(keyfile).WithPort(port)
 	return &Cloud{
-		IP:   ip,
-		User: user,
-		Name: name,
-		Type: types.CloudTypeDocker,
+		IP:      ip,
+		User:    user,
+		Port:    port,
+		Type:    types.CloudTypeDocker,
+		KeyFile: keyfile,
 
 		sshClient: sshClient,
 	}, nil
@@ -54,19 +52,7 @@ func Create(ip string, user string, name string) (*Cloud, error) {
 
 // Load a docker node from meta
 func Load(meta []byte) (*Cloud, error) {
-	var cloud Cloud
-	if err := json.Unmarshal(meta, &cloud); err != nil {
-		return nil, err
-	}
-	key, err := sshkey()
-	if err != nil {
-		return nil, err
-	}
-	port := sshport()
-	sshClient := ssh.New(cloud.IP).WithUser(cloud.User).WithKey(key).WithPort(port)
-	cloud.sshClient = sshClient
-
-	return &cloud, nil
+	return nil, nil
 }
 
 // Provision a host
@@ -89,25 +75,19 @@ func (c *Cloud) Provision() error {
 	return nil
 }
 
-// GetType cloud type
-func (c *Cloud) GetType() string {
-	return c.Type
-}
-
-func (c *Cloud) GetConfig() (string, error) {
-	data, err := json.Marshal(c)
-	if err != nil {
-		return "", err
-	}
-	return string(data), nil
-}
-
-func (c *Cloud) Dump() ([]byte, error) {
-	return json.Marshal(c)
-}
-
 // IsHealth check if cloud is in health
 func (c *Cloud) IsHealth() (bool, error) {
+	local := c.IP == "127.0.0.1" || c.IP == "localhost"
+	if !local || os.Getenv("CI") != "" {
+		ok, err := c.sshClient.Connectable(sshConnectionTimeout)
+		if err != nil {
+			return false, fmt.Errorf("could not connect to %s@%s:%s via SSH: '%s'", c.User, c.IP, c.Port, err)
+		}
+		if !ok {
+			return false, fmt.Errorf("could not connect to %s@%s:%s via SSH ", c.User, c.IP, c.Port)
+		}
+	}
+
 	if err := c.runCmd(infra.Scripts["check_fx_agent"].(string)); err != nil {
 		if err := c.runCmd(infra.Scripts["start_fx_agent"].(string)); err != nil {
 			return false, err
@@ -123,7 +103,9 @@ func (c *Cloud) setsshClient(client ssh.Clienter) {
 
 // nolint:unparam
 func (c *Cloud) runCmd(script string, options ...ssh.CommandOptions) error {
-	option := ssh.CommandOptions{}
+	option := ssh.CommandOptions{
+		Timeout: sshConnectionTimeout,
+	}
 	if len(options) >= 1 {
 		option = options[0]
 	}
@@ -148,33 +130,6 @@ func (c *Cloud) runCmd(script string, options ...ssh.CommandOptions) error {
 	return c.sshClient.RunCommand(script, option)
 }
 
-// NOTE the reason putting sshkey() and sshport here inside node.go is because
-// ssh key and ssh port is related to node it self, we may extend this in future
-func sshkey() (string, error) {
-	path := os.Getenv("SSH_KEY_FILE")
-	if path != "" {
-		absPath, err := filepath.Abs(path)
-		if err != nil {
-			return "", err
-		}
-		return absPath, nil
-	}
-
-	key, err := homedir.Expand("~/.ssh/id_rsa")
-	if err != nil {
-		return "", err
-	}
-	return key, nil
-}
-
-func sshport() string {
-	port := os.Getenv("SSH_PORT")
-	if port != "" {
-		return port
-	}
-	return "22"
-}
-
 var (
 	_ infra.Clouder = &Cloud{}
 )

infra/docker/cloud_test.go

@@ -2,58 +2,56 @@ package docker
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/metrue/fx/infra"
 	"github.com/metrue/go-ssh-client"
 	sshMocks "github.com/metrue/go-ssh-client/mocks"
-	"github.com/mitchellh/go-homedir"
 )
 
 func TestCloudProvision(t *testing.T) {
-	t.Run("fx agent started", func(t *testing.T) {
+	t.Run("FxAgentStarted", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 
-		n := New("127.0.0.1", "fx", "master")
+		n := New("127.0.0.1", "fx", "22", "~/.ssh/id_rsa")
 		sshClient := sshMocks.NewMockClienter(ctrl)
 		n.setsshClient(sshClient)
-		sshClient.EXPECT().RunCommand(infra.Scripts["docker_version"].(string), ssh.CommandOptions{}).Return(nil)
-		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{}).Return(nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["docker_version"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		if err := n.Provision(); err != nil {
 			t.Fatal(err)
 		}
 	})
 
-	t.Run("fx agent not started", func(t *testing.T) {
+	t.Run("FxAgentNotStarted", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 
-		n := New("127.0.0.1", "fx", "master")
+		n := New("127.0.0.1", "fx", "22", "~/.ssh/id_rsa")
 		sshClient := sshMocks.NewMockClienter(ctrl)
 		n.setsshClient(sshClient)
-		sshClient.EXPECT().RunCommand(infra.Scripts["docker_version"].(string), ssh.CommandOptions{}).Return(nil)
-		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{}).Return(fmt.Errorf("no such container"))
-		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{}).Return(nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["docker_version"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(fmt.Errorf("no such container"))
+		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		if err := n.Provision(); err != nil {
 			t.Fatal(err)
 		}
 	})
 
-	t.Run("docker not installed and fx agent not started", func(t *testing.T) {
+	t.Run("DockerNotInstalledAndFxAgentNotStarted", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
 
-		n := New("127.0.0.1", "fx", "master")
+		n := New("127.0.0.1", "fx", "22", "~/.ssh/id_rsa")
 		sshClient := sshMocks.NewMockClienter(ctrl)
 		n.setsshClient(sshClient)
-		sshClient.EXPECT().RunCommand(infra.Scripts["docker_version"].(string), ssh.CommandOptions{}).Return(fmt.Errorf("no such command"))
-		sshClient.EXPECT().RunCommand(infra.Scripts["install_docker"].(string), ssh.CommandOptions{}).Return(nil)
-		sshClient.EXPECT().RunCommand(infra.Scripts["start_dockerd"].(string), ssh.CommandOptions{}).Return(nil)
-		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{}).Return(fmt.Errorf("no such container"))
-		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{}).Return(nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["docker_version"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(fmt.Errorf("no such command"))
+		sshClient.EXPECT().RunCommand(infra.Scripts["install_docker"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["start_dockerd"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(fmt.Errorf("no such container"))
+		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		if err := n.Provision(); err != nil {
 			t.Fatal(err)
 		}
@@ -61,14 +59,33 @@ func TestCloudProvision(t *testing.T) {
 }
 
 func TestCloudIsHealth(t *testing.T) {
-	t.Run("agent started", func(t *testing.T) {
+	t.Run("Connectable", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		cloud := New("127.0.0.1", "fx", "master")
+
+		n := New("127.0.0.1", "fx", "22", "~/.ssh/id_rsa")
+		sshClient := sshMocks.NewMockClienter(ctrl)
+		n.setsshClient(sshClient)
+
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(false, nil)
+		ok, err := n.IsHealth()
+		if ok {
+			t.Fatalf("should not be healthy")
+		}
+		if err == nil {
+			t.Fatal("error should not be nil")
+		}
+	})
+
+	t.Run("FxAgentStarted", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+		cloud := New("127.0.0.1", "fx", "22", "~/.ssh/id_rsa")
 		sshClient := sshMocks.NewMockClienter(ctrl)
 		cloud.setsshClient(sshClient)
 
-		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{}).Return(nil)
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		ok, err := cloud.IsHealth()
 		if err != nil {
 			t.Fatal(err)
@@ -78,15 +95,16 @@ func TestCloudIsHealth(t *testing.T) {
 		}
 	})
 
-	t.Run("agent not started, and retart ok", func(t *testing.T) {
+	t.Run("FxAgentNotStartedAndStartItOK", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		cloud := New("127.0.0.1", "fx", "master")
+		cloud := New("127.0.0.1", "fx", "22", "~/.ssh/id_rsa")
 		sshClient := sshMocks.NewMockClienter(ctrl)
 		cloud.setsshClient(sshClient)
 
-		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{}).Return(fmt.Errorf("fx agent not started"))
-		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{}).Return(nil)
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(fmt.Errorf("fx agent not started"))
+		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		ok, err := cloud.IsHealth()
 		if err != nil {
 			t.Fatal(err)
@@ -96,15 +114,16 @@ func TestCloudIsHealth(t *testing.T) {
 		}
 	})
 
-	t.Run("agent not started, but restart failed", func(t *testing.T) {
+	t.Run("FxAgentNotStartedAndStartItNotOK", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()
-		cloud := New("127.0.0.1", "fx", "master")
+		cloud := New("127.0.0.1", "fx", "22", "~/.ssh/id_rsa")
 		sshClient := sshMocks.NewMockClienter(ctrl)
 		cloud.setsshClient(sshClient)
 
-		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{}).Return(fmt.Errorf("fx agent not started"))
-		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{}).Return(fmt.Errorf("fx agent started failed"))
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil)
+		sshClient.EXPECT().RunCommand(infra.Scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(fmt.Errorf("fx agent not started"))
+		sshClient.EXPECT().RunCommand(infra.Scripts["start_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(fmt.Errorf("fx agent started failed"))
 		ok, err := cloud.IsHealth()
 		if err == nil {
 			t.Fatal("should got failed starting")
@@ -114,45 +133,3 @@ func TestCloudIsHealth(t *testing.T) {
 		}
 	})
 }
-
-func TestGetSSHKeyFile(t *testing.T) {
-	t.Run("defaut", func(t *testing.T) {
-		defau, err := sshkey()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		defaultPath, _ := homedir.Expand("~/.ssh/id_rsa")
-		if defau != defaultPath {
-			t.Fatalf("should get %s but got %s", defaultPath, defau)
-		}
-	})
-
-	t.Run("override from env", func(t *testing.T) {
-		os.Setenv("SSH_KEY_FILE", "/tmp/id_rsa")
-		keyFile, err := sshkey()
-		if err != nil {
-			t.Fatal(err)
-		}
-		if keyFile != "/tmp/id_rsa" {
-			t.Fatalf("should get %s but got %s", "/tmp/id_rsa", keyFile)
-		}
-	})
-}
-
-func TestGetSSHPort(t *testing.T) {
-	t.Run("defaut", func(t *testing.T) {
-		defau := sshport()
-		if defau != "22" {
-			t.Fatalf("should get %s but got %s", "22", defau)
-		}
-	})
-
-	t.Run("override from env", func(t *testing.T) {
-		os.Setenv("SSH_PORT", "2222")
-		defau := sshport()
-		if defau != "2222" {
-			t.Fatalf("should get %s but got %s", "2222", defau)
-		}
-	})
-}

infra/infra.go

@@ -9,9 +9,6 @@ import (
 // Clouder cloud interface
 type Clouder interface {
 	Provision() error
-	GetConfig() (string, error)
-	GetType() string
-	Dump() ([]byte, error)
 	IsHealth() (bool, error)
 }
 
@@ -24,8 +21,3 @@ type Deployer interface {
 	List(ctx context.Context, name string) ([]types.Service, error)
 	Ping(ctx context.Context) error
 }
-
-// Infra infrastructure provision interface
-type Infra interface {
-	Deployer
-}

infra/k8s/cloud.go

@@ -1,270 +0,0 @@
-package k8s
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-
-	"github.com/metrue/fx/infra"
-	"github.com/metrue/fx/types"
-	"github.com/metrue/fx/utils"
-)
-
-// Cloud define a cloud
-type Cloud struct {
-	//  Define where is the location of kubeconf would be saved to
-	KubeConfig string           `json:"config"`
-	Type       string           `json:"type"`
-	Nodes      map[string]Noder `json:"nodes"`
-
-	token string
-	url   string
-}
-
-// Load a cloud from config
-func Load(meta []byte, messup ...func(n Noder) (Noder, error)) (*Cloud, error) {
-	var cloud Cloud
-	if err := json.Unmarshal(meta, &cloud); err != nil {
-		return nil, err
-	}
-
-	for name, n := range cloud.Nodes {
-		// NOTE messup function is just for unit testing
-		// we use it to replace the real not with mock node
-		if len(messup) > 0 {
-			node, err := messup[0](n)
-			if err != nil {
-				return nil, err
-			}
-			cloud.Nodes[name] = node
-		}
-	}
-	return &cloud, nil
-}
-
-// NewCloud new a cloud
-func NewCloud(kubeconf string, node ...Noder) *Cloud {
-	nodes := map[string]Noder{}
-	for _, n := range node {
-		nodes[n.GetName()] = n
-	}
-
-	return &Cloud{
-		KubeConfig: kubeconf,
-		Type:       types.CloudTypeK8S,
-		Nodes:      nodes,
-	}
-}
-
-// Provision provision cloud
-func (c *Cloud) Provision() error {
-	var master Noder
-	agents := []Noder{}
-	for _, n := range c.Nodes {
-		if n.GetType() == NodeTypeMaster {
-			master = n
-		} else {
-			agents = append(agents, n)
-		}
-	}
-
-	// when it's k3s cluster
-	if master != nil {
-		c.url = fmt.Sprintf("https://%s:6443", master.GetIP())
-		if err := master.Provision(map[string]string{}); err != nil {
-			return err
-		}
-
-		tok, err := master.GetToken()
-		if err != nil {
-			return err
-		}
-		c.token = tok
-
-		config, err := master.GetConfig()
-		if err != nil {
-			return err
-		}
-
-		if err := utils.EnsureFile(c.KubeConfig); err != nil {
-			return err
-		}
-		if err := ioutil.WriteFile(c.KubeConfig, []byte(config), 0666); err != nil {
-			return err
-		}
-	}
-
-	if len(agents) > 0 {
-		errCh := make(chan error, len(agents))
-		defer close(errCh)
-
-		for _, agent := range agents {
-			go func(node Noder) {
-				errCh <- node.Provision(map[string]string{
-					"url":   c.url,
-					"token": c.token,
-				})
-			}(agent)
-		}
-
-		for range agents {
-			err := <-errCh
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-// AddNode a node
-func (c *Cloud) AddNode(n Noder, skipProvision bool) error {
-	if !skipProvision {
-		if err := n.Provision(map[string]string{
-			"url":   c.url,
-			"token": c.token,
-		}); err != nil {
-			return err
-		}
-	}
-
-	c.Nodes[n.GetName()] = n
-	return nil
-}
-
-// DeleteNode a node
-func (c *Cloud) DeleteNode(name string) error {
-	node, ok := c.Nodes[name]
-	if ok {
-		delete(c.Nodes, name)
-	}
-	if node.GetType() == NodeTypeMaster && len(c.Nodes) > 0 {
-		return fmt.Errorf("could not delete master node since there is still agent node running")
-	}
-	return nil
-}
-
-// State get cloud state
-func (c *Cloud) State() {}
-
-// UnmarshalJSON unmarsha json
-func (c *Cloud) UnmarshalJSON(data []byte) error {
-	var m map[string]interface{}
-	if err := json.Unmarshal(data, &m); err != nil {
-		return err
-	}
-
-	c.Nodes = make(map[string]Noder)
-
-	for k, v := range m {
-		if k == "nodes" {
-			nodes, ok := v.(map[string]interface{})
-			if !ok {
-				return fmt.Errorf("invalid nodes data")
-			}
-			for name, n := range nodes {
-				node, ok := n.(map[string]interface{})
-				if !ok {
-					return fmt.Errorf("invalid node data")
-				}
-				n, err := CreateNode(node["ip"].(string), node["user"].(string), node["type"].(string), node["name"].(string))
-				if err != nil {
-					return err
-				}
-				c.Nodes[name] = n
-			}
-		} else if k == "token" {
-			tok, ok := v.(string)
-			if ok {
-				c.token = tok
-			} else {
-				c.token = ""
-			}
-		} else if k == "config" {
-			config, ok := v.(string)
-			if ok {
-				c.KubeConfig = config
-			} else {
-				c.KubeConfig = ""
-			}
-		} else if k == "type" {
-			typ, ok := v.(string)
-			if ok {
-				c.Type = typ
-			} else {
-				c.Type = ""
-			}
-		} else if k == "url" {
-			url, ok := v.(string)
-			if ok {
-				c.url = url
-			} else {
-				c.url = ""
-			}
-		}
-	}
-
-	return nil
-}
-
-// MarshalJSON cloud information
-func (c *Cloud) MarshalJSON() ([]byte, error) {
-	nodes := map[string]Node{}
-	for name, node := range c.Nodes {
-		nodes[name] = Node{
-			IP:   node.GetIP(),
-			Type: node.GetType(),
-			User: node.GetUser(),
-			Name: node.GetName(),
-		}
-	}
-
-	body, err := json.Marshal(struct {
-		URL        string          `json:"url"`
-		KubeConfig string          `json:"config"`
-		Type       string          `json:"type"`
-		Token      string          `json:"token"`
-		Nodes      map[string]Node `json:"nodes"`
-	}{
-		KubeConfig: c.KubeConfig,
-		Type:       c.Type,
-		Token:      c.token,
-		URL:        c.url,
-		Nodes:      nodes,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return body, nil
-}
-
-// GetType get type of cloud
-func (c *Cloud) GetType() string {
-	return c.Type
-}
-
-// Dump cloud data
-func (c *Cloud) Dump() ([]byte, error) {
-	return json.Marshal(c)
-}
-
-// GetConfig get config
-func (c *Cloud) GetConfig() (string, error) {
-	if c.KubeConfig != "" {
-		return c.KubeConfig, nil
-	}
-	if err := c.Provision(); err != nil {
-		return "", err
-	}
-	return c.KubeConfig, nil
-}
-
-// IsHealth check if cloud is in health
-func (c *Cloud) IsHealth() (bool, error) {
-	return true, nil
-}
-
-var (
-	_ infra.Clouder = &Cloud{}
-)

infra/k8s/cloud_test.go

@@ -1,170 +0,0 @@
-package k8s
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/golang/mock/gomock"
-	mock_infra "github.com/metrue/fx/infra/k8s/mocks"
-)
-
-func TestLoad(t *testing.T) {
-	t.Run("empty meta", func(t *testing.T) {
-		ctrl := gomock.NewController(t)
-		defer ctrl.Finish()
-
-		var createNodeFn = func(n Noder) (Noder, error) {
-			return nil, nil
-		}
-
-		_, err := Load([]byte{}, createNodeFn)
-		if err == nil {
-			t.Fatalf("should load with error")
-		}
-	})
-
-	t.Run("only master node", func(t *testing.T) {
-		kubeconfig := "./kubeconfig.yml"
-		defer func() {
-			if err := os.RemoveAll("./kubeconfig.yml"); err != nil {
-				t.Fatal(err)
-			}
-		}()
-
-		ctrl := gomock.NewController(t)
-		defer ctrl.Finish()
-
-		master := mock_infra.NewMockNoder(ctrl)
-		var createNodeFn = func(n Noder) (Noder, error) {
-			return master, nil
-		}
-		typ := NodeTypeMaster
-		name := "master"
-		ip := "127.0.0.1"
-		user := "testuser"
-		kubeconfContent := "sample-content"
-		master.EXPECT().GetName().Return(name)
-		master.EXPECT().GetType().Return(typ).Times(2)
-		master.EXPECT().GetIP().Return(ip).Times(2)
-		master.EXPECT().GetUser().Return(user)
-		master.EXPECT().GetConfig().Return(kubeconfContent, nil)
-
-		claud := &Cloud{
-			KubeConfig: kubeconfig,
-			Type:       "k8s",
-			url:        "",
-			token:      "",
-			Nodes:      map[string]Noder{"master-node": master},
-		}
-
-		meta, err := json.Marshal(claud)
-		if err != nil {
-			t.Fatal(err)
-		}
-		cloud, err := Load(meta, createNodeFn)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(cloud.Nodes) != 1 {
-			t.Fatalf("should get %d but got %d", 1, len(cloud.Nodes))
-		}
-
-		master.EXPECT().Provision(map[string]string{}).Return(nil)
-		master.EXPECT().GetToken().Return("tok-1", nil)
-		if err := cloud.Provision(); err != nil {
-			t.Fatal(err)
-		}
-
-		content, err := ioutil.ReadFile(claud.KubeConfig)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(content) != kubeconfContent {
-			t.Fatalf("should get %s but got %s", kubeconfContent, content)
-		}
-	})
-
-	t.Run("one master node and one agent", func(t *testing.T) {
-		kubeconfig := "./kubeconfig.yml"
-		defer func() {
-			if err := os.RemoveAll("./kubeconfig.yml"); err != nil {
-				t.Fatal(err)
-			}
-		}()
-
-		ctrl := gomock.NewController(t)
-		defer ctrl.Finish()
-
-		master := mock_infra.NewMockNoder(ctrl)
-		node := mock_infra.NewMockNoder(ctrl)
-		var createNodeFn = func(n Noder) (Noder, error) {
-			if n.GetType() == NodeTypeMaster {
-				return master, nil
-			}
-			return node, nil
-		}
-		typ := NodeTypeMaster
-		name := "master"
-		ip := "127.0.0.1"
-		user := "testuser"
-		kubeconfContent := "sample-config"
-		master.EXPECT().GetName().Return(name)
-		master.EXPECT().GetType().Return(typ).Times(2)
-		master.EXPECT().GetIP().Return(ip).Times(3)
-		master.EXPECT().GetConfig().Return(kubeconfContent, nil)
-		master.EXPECT().GetUser().Return(user)
-
-		nodeType := NodeTypeAgent
-		nodeName := "agent_name"
-		nodeIP := "12.12.12.12"
-		nodeUser := "testuser"
-		node.EXPECT().GetName().Return(nodeName)
-		node.EXPECT().GetType().Return(nodeType).Times(2)
-		node.EXPECT().GetIP().Return(nodeIP)
-		node.EXPECT().GetUser().Return(nodeUser)
-
-		url := fmt.Sprintf("https://%s:6443", master.GetIP())
-		tok := "tok-1"
-		claud := &Cloud{
-			KubeConfig: kubeconfig,
-			url:        url,
-			token:      tok,
-			Type:       "k8s",
-			Nodes:      map[string]Noder{"master-node": master, "agent-node": node},
-		}
-		meta, err := json.Marshal(claud)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		cloud, err := Load(meta, createNodeFn)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(cloud.Nodes) != 2 {
-			t.Fatalf("should get %d but got %d", 2, len(cloud.Nodes))
-		}
-
-		master.EXPECT().Provision(map[string]string{}).Return(nil)
-		master.EXPECT().GetToken().Return(tok, nil)
-		node.EXPECT().Provision(map[string]string{
-			"url":   cloud.url,
-			"token": cloud.token,
-		}).Return(nil)
-		if err := cloud.Provision(); err != nil {
-			t.Fatal(err)
-		}
-		content, err := ioutil.ReadFile(claud.KubeConfig)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(content) != kubeconfContent {
-			t.Fatalf("should get %s but got %s", kubeconfContent, content)
-		}
-	})
-}
-
-func TestProvision(t *testing.T) {}

infra/k8s/deployment.go

@@ -6,7 +6,6 @@ import (
 	"github.com/metrue/fx/types"
 	appsv1 "k8s.io/api/apps/v1"
 	apiv1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -29,7 +28,7 @@ func generateDeploymentSpec(
 		Name:            "fx-placeholder-container-name",
 		Image:           image,
 		Ports:           ports,
-		ImagePullPolicy: v1.PullIfNotPresent,
+		ImagePullPolicy: apiv1.PullIfNotPresent,
 	}
 	return &appsv1.Deployment{
 		ObjectMeta: metav1.ObjectMeta{