use lighter-weight node image (#518)

Bumps [github.com/urfave/cli](https://github.com/urfave/cli) from 1.22.3 to 1.22.4.
- [Release notes](https://github.com/urfave/cli/releases)
- [Changelog](https://github.com/urfave/cli/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/urfave/cli/compare/v1.22.3...v1.22.4)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Minghe <h.minghe@gmail.com>

Makefile

@@ -27,13 +27,13 @@ clean:
 	rm -rf ${DIST_DIR}
 
 unit-test:
-	CI=true ./scripts/coverage.sh
+	./scripts/coverage.sh
 
 cli-test-ci:
 	./scripts/test_cli.sh 'js'
 
 cli-test:
-	./scripts/test_cli.sh 'js rb py go php java d rs pl'
+	./scripts/test_cli.sh 'js rb py go java d pl'
 
 http-test:
 	./scripts/http_test.sh

README.md

@@ -15,9 +15,6 @@ Poor man's function as a service.
 - [Introduction](#introduction)
 - [Installation](#installation)
 - [Usage](#usage)
-- [Manage Infrastructure](#manage-infrastructure)
-- [Contribute](#contribute)
-
 
 ## Introduction
 
@@ -71,8 +68,6 @@ You can go the release page to [download](https://github.com/metrue/fx/releases)
 
 ## Usage
 
-Make sure [Docker](https://docs.docker.com/engine/installation/) installed and running on your server first. then type `fx -h` on your terminal to check out basic help.
-
 ```
 NAME:
    fx - makes function as a service
@@ -80,17 +75,11 @@ NAME:
 USAGE:
    fx [global options] command [command options] [arguments...]
 
-VERSION:
-   0.8.7
-
 COMMANDS:
-   infra     manage infrastructure
    up        deploy a function
    down      destroy a service
    list, ls  list deployed services
-   call      run a function instantly
    image     manage image of service
-   doctor    health check for fx
    help, h   Shows a list of commands or help for one command
 
 GLOBAL OPTIONS:
@@ -98,22 +87,40 @@ GLOBAL OPTIONS:
    --version, -v  print the version
 ```
 
-### Deploy your function to Docker
+### Deploy function
+
+#### Local Docker environment
+
+By default, function will be deployed on localhost， make sure [Docker](https://docs.docker.com/engine/installation/) installed and running on your server first. then type `fx -h` on your terminal to check out basic help.
 
 ```
-$ fx up --name hello-fx ./examples/functions/JavaScript/func.js
+$ fx up --name hello ./examples/functions/JavaScript/func.js
 
 +------------------------------------------------------------------+-----------+---------------+
 |                                ID                                |   NAME    |   ENDPOINT    |
 +------------------------------------------------------------------+-----------+---------------+
-| 5b24d36608ee392c937a61a530805f74551ddec304aea3aca2ffa0fabcf98cf3 | /hello-fx | 0.0.0.0:58328 |
+| 5b24d36608ee392c937a61a530805f74551ddec304aea3aca2ffa0fabcf98cf3 | /hello    | 0.0.0.0:58328 |
 +------------------------------------------------------------------+-----------+---------------+
 ```
 
-### Deploy your function to Kubernetes
+#### Remote host
+
+Use `--host` to specify the target host for your function, or you can just set it to `FX_HOST` environment variable.
+
+```shell
+$ fx up --host roo@<your host> --name hello ./examples/functions/JavaScript/func.js
+
++------------------------------------------------------------------+-----------+---------------+
+|                                ID                                |   NAME    |   ENDPOINT    |
++------------------------------------------------------------------+-----------+---------------+
+| 5b24d36608ee392c937a61a530805f74551ddec304aea3aca2ffa0fabcf98cf3 | /hello    | 0.0.0.0:58345 |
++------------------------------------------------------------------+-----------+---------------+
+```
+
+#### Kubernetes
 
 ```
-$ KUBECONFIG=~/.kube/config ./build/fx up examples/functions/JavaScript/func.js --name hello-fx
+$ FX_KUBECONF=~/.kube/config fx up examples/functions/JavaScript/func.js --name hello
 
 +-------------------------------+------+----------------+
 | ID                     | NAME        |    ENDPOINT    |
@@ -122,7 +129,7 @@ $ KUBECONFIG=~/.kube/config ./build/fx up examples/functions/JavaScript/func.js
 +------------------------+-------------+----------------+
 ```
 
-### Test your service
+### Test service
 
 then you can test your service:
 
@@ -149,31 +156,6 @@ hello world
 
 ```
 
-## Manage Infrastructure
-
-**fx** is originally designed to turn a function into a runnable Docker container in a easiest way, on a host with Docker running, you can just deploy your function with `fx up` command,  and now **fx** supports deploy function to be a service onto Kubernetes cluster infrasture, and we encourage you to do that other than on bare Docker environment, there are lots of advantage to run your function on Kubernetes like self-healing, load balancing, easy horizontal scaling, etc. It's pretty simple to deploy your function onto Kubernetes with **fx**, you just set KUBECONFIG in your enviroment.
-
-By default. **fx** use localhost as target infrastructure to run your service, and you can also setup your remote virtual machines as **fx**'s infrastructure and deploy your functions onto it.
-
-### `fx infra create`
-
-You can create types (docker and k8s) of infrastructures for **fx** to deploy functions
-
-```shell
-$ fx infra create --name infra_us --type docker --host <user>@<ip>                                            ## create docker type infrasture on <ip>
-$ fx infra create --name infra_bj --type k8s --master <user>@<ip> --agents '<user1>@<ip1>,<user2>@<ip2>'      ## create k8s type infrasture use <ip> as master node, and <ip1> and <ip2> as agents nodes
-```
-
-### `fx infra use`
-
-To use a infrastructure, you can use `fx infra use` command to activate it.
-
-```shell
-fx infra use <infrastructure name>
-```
-
-and you can list your infrastructure with `fx infra list`
-
 ## Use Public Cloud Kubernetes Service as infrastructure to run your functions
 
 * Azure Kubernetes Service (AKS)
@@ -198,7 +180,7 @@ aks-nodepool1-31718369-0   Ready    agent   6m44s   v1.12.8
 Since AKS's config will be merged into `~/.kube/config` and set to be current context after you run `az aks get-credentials` command, so you can just set KUBECONFIG to default config also,
 
 ```shell
-$ export KUBECONFIG=~/.kube/config  # then fx will take the config to deloy function
+$ export FX_KUBECONF=~/.kube/config  # then fx will take the config to deloy function
 ```
 
 But we would suggest you run `kubectl config current-context` to check if the current context is what you want.
@@ -224,7 +206,7 @@ $ kubectl config current-context
 Then you can deploy your function onto GKE cluster with,
 
 ```shell
-$ KUBECONFIG=~/.kube/config fx up examples/functions/JavaScript/func.js --name hellojs
+$ FX_KUBECONF=~/.kube/config fx up examples/functions/JavaScript/func.js --name hellojs
 ```
 
 * Setup your own Kubernetes cluster
@@ -233,31 +215,6 @@ $ KUBECONFIG=~/.kube/config fx up examples/functions/JavaScript/func.js --name h
 fx infra create --type k3s --name fx-cluster-1 --master root@123.11.2.3 --agents 'root@1.1.1.1,root@2.2.2.2'
 ```
 
-## Contribute
-
-fx uses [Project](https://github.com/metrue/fx/projects/4) to manage the development.
-
-#### Prerequisites
-
-Docker: make sure [Docker](https://docs.docker.com/engine/installation/) installed and running on your server.
-
-
-<a name="buildtest"></a>
-#### Build & Test
-
-```
-$ git clone https://github.com/metrue/fx
-$ cd fx
-$ make build
-```
-
-Then you can build and test:
-
-```
-$ make build
-$ ./build/fx -h
-```
-
 
 ## Contributors
 

assets/dockerfiles/base/node/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:latest
+FROM node:alpine
 
 COPY . .
 RUN npm install

bundler/README.md

@@ -0,0 +1,63 @@
+The only thing `fx` does is to make a single function to be an HTTP service, `fx` takes two steps to finish the process,
+* Wraps the function into a web server project and make it be the handler function of the HTTP request.
+* Builds the bundled web server to be Docker image, then run it as a Docker container and expose the service port.
+
+`bundler` is the component responsible for step 1: wrap a single function (and its dependencies) into a web server.  Take a Node web service as an example, the project looks like this,
+```
+helloworld
+├── Dockerfile
+├── app.js
+└── fx.js
+```
+
+And the codes is pretty simple,
+
+**app.js**
+```javascript
+const Koa = require('koa');
+const bodyParser = require('koa-bodyparser');
+const cors = require('@koa/cors');
+const fx = require('./fx');
+
+const app = new Koa();
+app.use(cors({
+  origin: '*',
+}));
+app.use(bodyParser());
+app.use(fx);
+
+app.listen(3000);
+```
+
+**fx.js**
+```javascript
+module.exports = (ctx) => {
+  ctx.body = 'hello world'
+}
+```
+
+**Dockerfile**
+```dockerfile
+FROM metrue/fx-node-base
+
+COPY . .
+EXPOSE 3000
+CMD ["node", "app.js"]
+```
+
+You can see that it's a web service built with `Koa`,  the request handler function defined in `fx.js` to response plain text `hello world`,  so to make a general JavaScript/Node function to be a web service, we only have to put it into `fx.js` above, then build and run it with Docker and that's it.
+
+To support different programming languages, `fx` needs to implement different `bundlers`, the reasons are,
+* The way to set up a web service is different in different languages
+* The way to manage dependency is different in different languages.
+
+So there will be (are) different `bundlers` in `fx`.
+```
+go-bundler: based on Gin
+ruby-bundler: based on Sinatra
+node-bundler: based on Koa
+python-bundler: based on flask
+...
+```
+
+

bundler/bundler.go

@@ -46,7 +46,7 @@ func Restore(box *packr.Box, output string) error {
 			return err
 		}
 
-		if err := ioutil.WriteFile(dest, content, 0644); err != nil {
+		if err := ioutil.WriteFile(dest, content, 0600); err != nil {
 			return err
 		}
 

bundler/d/d-packr.go

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package d
 
-import _ "github.com/metrue/fx/bundler/d/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/go/golang-packr.go

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package golang
 
-import _ "github.com/metrue/fx/bundler/go/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/go/packrd/packed-packr.go

@@ -1,33 +0,0 @@
-// +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

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package java
 
-import _ "github.com/metrue/fx/bundler/java/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/java/packrd/packed-packr.go

@@ -1,35 +0,0 @@
-// +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/julia-packr.go

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package julia
 
-import _ "github.com/metrue/fx/bundler/julia/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/julia/packrd/packed-packr.go

@@ -1,37 +0,0 @@
-// +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

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package node
 
-import _ "github.com/metrue/fx/bundler/node/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/node/packrd/packed-packr.go

@@ -1,33 +0,0 @@
-// +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

@@ -1,33 +0,0 @@
-// +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

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package perl
 
-import _ "github.com/metrue/fx/bundler/perl/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/python/packrd/packed-packr.go

@@ -1,33 +0,0 @@
-// +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

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package python
 
-import _ "github.com/metrue/fx/bundler/python/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/ruby/packrd/packed-packr.go

@@ -1,33 +0,0 @@
-// +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

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package ruby
 
-import _ "github.com/metrue/fx/bundler/ruby/packrd"
+import _ "github.com/metrue/fx/packrd"

bundler/rust/rust-packr.go

@@ -5,4 +5,4 @@
 // and any other packr generated files.
 package rust
 
-import _ "github.com/metrue/fx/bundler/rust/packrd"
+import _ "github.com/metrue/fx/packrd"

container_runtimes/docker/http/asserts/dockerfiles/base/node/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:latest
+FROM node:alpine
 
 COPY . .
 RUN npm install

docs/ubuntu.md

@@ -36,11 +36,26 @@ $ curl 127.0.0.1:2000
 
 ##  Deploy a function onto remote host
 
-* make sure your instance can be ssh login
+* make sure you can ssh login to target host with root
+
+Update `/etc/ssh/sshd_config` to allow login with root.
+
+```
+PermitRootLogin yes
+```
+
+Then restart sshd with,
+
+```shell
+$ sudo service sshd restart
+```
+
 * make sure your instance accept port 8866
 
+[FYI](https://lightsail.aws.amazon.com/ls/docs/en_us/articles/understanding-firewall-and-port-mappings-in-amazon-lightsail)
+
 then you can deploy function to remote host
 
 ```shell
-DOCKER_REMOTE_HOST_ADDR=<your host> DOCKER_REMOTE_HOST_USER=<your user> DOCKER_REMOTE_HOST_PASSWORD=<your password> fx up -p 2000 test/functions/func.js
+fx up --host root@<your host> test/functions/func.js 
 ```

fx.go

@@ -19,7 +19,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
-const version = "0.9.31"
+const version = "0.9.35"
 
 func init() {
 	go checkForUpdate()
@@ -77,6 +77,7 @@ func main() {
 			fmt.Println(aurora.Red("*****************"))
 			fmt.Println(r)
 			fmt.Println(aurora.Red("*****************"))
+			os.Exit(1)
 		}
 	}()
 	user, err := user.Current()
@@ -212,28 +213,6 @@ func main() {
 				handlers.List,
 			),
 		},
-		{
-			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),
-		},
 		{
 			Name:  "image",
 			Usage: "manage image of service",
@@ -253,14 +232,26 @@ func main() {
 							Value: defaultSSHKeyFile,
 						},
 						cli.StringFlag{
-							Name:  "tag, t",
-							Usage: "image tag",
+							Name:  "host, H",
+							Usage: "target host, <user>@<host>",
+							Value: defaultHost,
+						},
+						cli.StringFlag{
+							Name:  "kubeconf, C",
+							Usage: "kubeconf of kubernetes cluster",
+						},
+						cli.StringFlag{
+							Name:  "name, n",
+							Usage: "image name",
 							Value: uuid.New().String(),
 						},
 					},
 					Action: handle(
 						middlewares.Parse("image_build"),
 						middlewares.Language(),
+						middlewares.SSH,
+						middlewares.Driver,
+						middlewares.Build,
 						handlers.BuildImage,
 					),
 				},
@@ -281,11 +272,6 @@ func main() {
 				},
 			},
 		},
-		{
-			Name:   "doctor",
-			Usage:  "health check for fx",
-			Action: handle(handlers.Doctor),
-		},
 	}
 
 	if err := app.Run(os.Args); err != nil {

go.mod

@@ -5,18 +5,18 @@ go 1.12
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Microsoft/go-winio v0.4.14 // indirect
-	github.com/apex/log v1.1.2
-	github.com/briandowns/spinner v1.9.0
+	github.com/apex/log v1.1.4
+	github.com/briandowns/spinner v1.10.0
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/docker/docker v0.0.0-20190313072916-46036c230805
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/go-units v0.3.3 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
-	github.com/gin-gonic/gin v1.4.0
+	github.com/gin-gonic/gin v1.6.2
 	github.com/gobuffalo/envy v1.8.1 // indirect
 	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/mock v1.4.3
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/google/go-querystring v1.0.0
 	github.com/google/uuid v1.1.1
@@ -24,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-20200317035802-7c3bc0c87929
+	github.com/metrue/go-ssh-client v0.0.0-20200317072149-19d54050aefd
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/morikuni/aec v1.0.0 // indirect
@@ -37,15 +37,13 @@ require (
 	github.com/pierrec/lz4 v0.0.0-20190222153722-062282ea0dcf // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.6.2
+	github.com/spf13/viper v1.6.3
 	github.com/stretchr/testify v1.5.1
 	github.com/ugorji/go v1.1.7 // indirect
-	github.com/urfave/cli v1.22.3
+	github.com/urfave/cli v1.22.4
 	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
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.2.7 // indirect
 	gotest.tools v2.2.0+incompatible // indirect
 	k8s.io/api v0.0.0-20190925180651-d58b53da08f5
 	k8s.io/apimachinery v0.0.0-20190925235427-62598f38f24e

go.sum

@@ -23,7 +23,10 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 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/log v1.1.4 h1:3Zk+boorIQAAGBrHn0JUtAau4ihMamT4WdnfdnXM1zQ=
+github.com/apex/log v1.1.4/go.mod h1:AlpoD9aScyQfJDVHmLMEcx4oU6LqzkWp4Mg9GdAcEvQ=
 github.com/apex/logs v0.0.3/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo=
+github.com/apex/logs v0.0.4/go.mod h1:XzxuLZ5myVHDy9SAmYpamKKRNApGj54PfYLcFrXqDwo=
 github.com/aphistic/golf v0.0.0-20180712155816-02c07f170c5a/go.mod h1:3NqKYiepwy8kCu4PNA+aP7WUV72eXWJeP9/r3/K9aLE=
 github.com/aphistic/sweet v0.2.0/go.mod h1:fWDlIh/isSE9n6EPsRmC0det+whmX6dJid3stzu0Xys=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -33,10 +36,13 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/briandowns/spinner v1.9.0 h1:+OMAisemaHar1hjuJ3Z2hIvNhQl9Y7GLPWUwwz2Pxo8=
 github.com/briandowns/spinner v1.9.0/go.mod h1://Zf9tMcxfRUA36V23M6YGEAv+kECGfvpnLTnb8n4XQ=
+github.com/briandowns/spinner v1.10.0 h1:753NIJC2NHmPyVoPVWS+wh9eDx5umqe2U+JgX+KoTag=
+github.com/briandowns/spinner v1.10.0/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
+github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
@@ -78,8 +84,12 @@ github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2H
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g=
 github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.4.0 h1:3tMoCCfM7ppqsR0ptz/wi1impNpT7/9wQtMZ8lr1mCQ=
 github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
+github.com/gin-gonic/gin v1.6.2 h1:88crIK23zO6TqlQBt+f9FrPJNKm9ZEr7qjp9vl/d5TM=
+github.com/gin-gonic/gin v1.6.2/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
@@ -88,6 +98,13 @@ github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
+github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
+github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
+github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gobuffalo/envy v1.7.0 h1:GlXgaiBkmrYMHco6t4j7SacKO4XUjvh5pwXh0f4uxXU=
 github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI=
@@ -121,11 +138,15 @@ 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/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw=
+github.com/golang/mock v1.4.3/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=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.3 h1:gyjaxf+svBWX08ZjK86iN9geUJF0H6gp2IRKX6Nf6/I=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -175,6 +196,8 @@ github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBv
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
@@ -197,6 +220,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434 h1:im9kkmH0WWwxzegiv18gSUJbuXR9y028rXrWuPp6Jug=
 github.com/logrusorgru/aurora v0.0.0-20191017060258-dc85c304c434/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/magiconair/properties v1.8.0 h1:LLgXmsheXeRoUOBOjtwPQCWIYqM/LU1ayDtDePerRcY=
@@ -218,6 +243,8 @@ github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-runewidth v0.0.7 h1:Ei8KR0497xHyKJPAv59M1dkC+rOZCMBJ+t3fZ+twI54=
 github.com/mattn/go-runewidth v0.0.7/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
@@ -227,6 +254,8 @@ github.com/metrue/go-ssh-client v0.0.0-20200317034720-e3f45ef1916d h1:vLJfcEJfji
 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/metrue/go-ssh-client v0.0.0-20200317072149-19d54050aefd h1:HoDa3tI6njhpyhu7aIcIfib8QugB66ILgYRLc5IuP6s=
+github.com/metrue/go-ssh-client v0.0.0-20200317072149-19d54050aefd/go.mod h1:mgU+XR/ItF6PaQGpx0MthaaMP2dgGuck0IiXcrF3zMw=
 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=
@@ -344,6 +373,8 @@ github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DM
 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/spf13/viper v1.6.3 h1:pDDu1OyEDTKzpJwdq4TiuLyMsUgRa/BT5cn5O62NoHs=
+github.com/spf13/viper v1.6.3/go.mod h1:jUMtyi0/lB5yZH/FjyGAoH7IMNrIhlBf6pXZmbMDvzw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1 h1:2vfRuCMp5sSVIDSqO8oNnWJq7mPa6KVP3iPIwFBuy8A=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -374,6 +405,8 @@ 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/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
+github.com/urfave/cli v1.22.4/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=
@@ -449,6 +482,8 @@ golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191223224216-5a3cf8467b4e h1:z2Flw7sLy7DxaQi3zDOvI9X+Kb06+G9iZJlkEyHvujE=
 golang.org/x/sys v0.0.0-20191223224216-5a3cf8467b4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -513,6 +548,8 @@ gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

handlers/call.go

@@ -1,11 +0,0 @@
-package handlers
-
-import (
-	"github.com/metrue/fx/context"
-)
-
-// Call command handle
-func Call(ctx context.Contexter) error {
-	// TODO not supported
-	return nil
-}

handlers/doctor.go

@@ -1,26 +0,0 @@
-package handlers
-
-import (
-	"os"
-
-	"github.com/apex/log"
-	"github.com/metrue/fx/constants"
-	"github.com/metrue/fx/context"
-	"github.com/metrue/fx/doctor"
-)
-
-// Doctor command handle
-func Doctor(ctx context.Contexter) error {
-	host := os.Getenv("DOCKER_REMOTE_HOST_ADDR")
-	user := os.Getenv("DOCKER_REMOTE_HOST_USER")
-	password := os.Getenv("DOCKER_REMOTE_HOST_PASSWORD")
-	if host == "" {
-		host = "localhost"
-	}
-	if err := doctor.New(host, user, password).Start(); err != nil {
-		log.Warnf("machine %s is in dirty state: %v", host, err)
-	} else {
-		log.Infof("machine %s is in healthy state: %s", host, constants.CheckedSymbol)
-	}
-	return nil
-}

handlers/image.go

@@ -1,46 +1,17 @@
 package handlers
 
 import (
-	"fmt"
-	"os"
-	"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/pkg/spinner"
 )
 
 // BuildImage build image
 func BuildImage(ctx context.Contexter) (err error) {
-	spinner.Start("building")
-	defer func() {
-		spinner.Stop("building", err)
-	}()
-	workdir := fmt.Sprintf("/tmp/fx-%d", time.Now().Unix())
-	defer os.RemoveAll(workdir)
-
-	fn := ctx.Get("fn").(string)
-	deps := ctx.Get("deps").([]string)
-	language := ctx.Get("language").(string)
-
-	if err := bundle.Bundle(workdir, language, fn, deps...); err != nil {
-		return err
-	}
-
-	if err := hook.RunBeforeBuildHook(workdir); err != nil {
-		return err
-	}
-
-	docker := ctx.Get("docker").(containerruntimes.ContainerRuntime)
-	nameWithTag := ctx.Get("tag").(string) + ":latest"
-	if err := docker.BuildImage(ctx.GetContext(), workdir, nameWithTag); err != nil {
-		return err
-	}
-	log.Infof("image built: %s %v", nameWithTag, constants.CheckedSymbol)
+	image := ctx.Get("image").(string)
+	log.Infof("image built: %s %v", image, constants.CheckedSymbol)
 	return nil
 }
 

middlewares/driver.go

@@ -2,6 +2,7 @@ package middlewares
 
 import (
 	"fmt"
+	"runtime"
 	"time"
 
 	"github.com/apex/log"
@@ -10,7 +11,9 @@ import (
 	"github.com/metrue/fx/context"
 	dockerDriver "github.com/metrue/fx/driver/docker"
 	k8sInfra "github.com/metrue/fx/driver/k8s"
-	"github.com/metrue/fx/provisioners"
+	"github.com/metrue/fx/provisioner"
+	darwin "github.com/metrue/fx/provisioner/darwin"
+	linux "github.com/metrue/fx/provisioner/linux"
 	"github.com/metrue/go-ssh-client"
 )
 
@@ -29,7 +32,14 @@ func Driver(ctx context.Contexter) (err error) {
 		if err := driver.Ping(ctx.GetContext()); err != nil {
 			log.Infof("provisioning %s ...", host)
 
-			provisioner := provisioners.New(sshClient)
+			var provisioner provisioner.Provisioner
+			// TODO actually we should get os of target host, not the host of fx
+			// running on
+			if runtime.GOOS == "darwin" {
+				provisioner = darwin.New(sshClient)
+			} else {
+				provisioner = linux.New(sshClient)
+			}
 			isRemote := (host != "127.0.0.1" && host != "localhost")
 			if err := provisioner.Provision(ctx.GetContext(), isRemote); err != nil {
 				return err

middlewares/parse.go

@@ -132,7 +132,7 @@ func Parse(action string) func(ctx context.Contexter) (err error) {
 			}
 			ctx.Set("deps", deps)
 			if err := set(ctx, cli, []argsField{
-				argsField{Name: "tag", Type: "string"},
+				argsField{Name: "name", Type: "string"},
 				argsField{Name: "ssh_port", Type: "string", Env: "SSH_PORT"},
 				argsField{Name: "ssh_key", Type: "string", Env: "SSH_KEY_FILE"},
 				argsField{Name: "host", Type: "string", Env: "FX_HOST"},

packer/packer.go

@@ -44,7 +44,7 @@ func TreeToDir(tree map[string]string, outputDir string) error {
 		if err := utils.EnsureFile(fn); err != nil {
 			return err
 		}
-		if err := ioutil.WriteFile(fn, []byte(v), 0666); err != nil {
+		if err := ioutil.WriteFile(fn, []byte(v), 0600); err != nil {
 			return err
 		}
 	}

provisioner/darwin/darwin.go

@@ -0,0 +1,88 @@
+package darwin
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"os/exec"
+	"strings"
+	"time"
+
+	"github.com/metrue/fx/provisioner"
+	"github.com/metrue/go-ssh-client"
+)
+
+const sshConnectionTimeout = 10 * time.Second
+
+var scripts = map[string]string{
+	"docker_version": "docker version",
+	"has_docker":     "type docker",
+	"check_fx_agent": "docker inspect fx-agent",
+	"start_fx_agent": "docker run -d --name=fx-agent --rm -v /var/run/docker.sock:/var/run/docker.sock -p 0.0.0.0:8866:1234 bobrik/socat TCP-LISTEN:1234,fork UNIX-CONNECT:/var/run/docker.sock",
+}
+
+// Docker define a fx docker host
+type Docker struct {
+	sshClient ssh.Clienter
+}
+
+// New a docker provioner
+func New(sshClient ssh.Clienter) *Docker {
+	return &Docker{
+		sshClient: sshClient,
+	}
+}
+
+// Provision a host
+func (d *Docker) Provision(ctx context.Context, isRemote bool) error {
+	if err := d.runCmd(scripts["docker_version"], isRemote); err != nil {
+		if err := d.runCmd(scripts["has_docker"], isRemote); err != nil {
+			return errors.New("could not find docker on the $PATH")
+		}
+		return errors.New("cannot connect to the Docker daemon, is the docker daemon running?")
+	}
+
+	if err := d.runCmd(scripts["check_fx_agent"], isRemote); err != nil {
+		if err := d.runCmd(scripts["start_fx_agent"], isRemote); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (d *Docker) runCmd(script string, isRemote bool, options ...ssh.CommandOptions) error {
+	option := ssh.CommandOptions{
+		Timeout: sshConnectionTimeout,
+	}
+	if len(options) >= 1 {
+		option = options[0]
+	}
+	if !isRemote {
+		params := strings.Split(script, " ")
+		if len(params) == 0 {
+			return fmt.Errorf("invalid script: %s", script)
+		}
+		// nolint
+		cmd := exec.Command(params[0], params[1:]...)
+		cmd.Stdout = option.Stdout
+		cmd.Stderr = option.Stderr
+		err := cmd.Run()
+		if err != nil {
+			return err
+		}
+		return nil
+	}
+	ok, err := d.sshClient.Connectable(sshConnectionTimeout)
+	if err != nil {
+		return fmt.Errorf("could not connect via SSH: '%s'", err)
+	}
+	if !ok {
+		return fmt.Errorf("could not connect via SSH")
+	}
+
+	return d.sshClient.RunCommand(script, option)
+}
+
+var (
+	_ provisioner.Provisioner = &Docker{}
+)

provisioner/darwin/darwin_test.go

@@ -0,0 +1,117 @@
+package darwin
+
+import (
+	"context"
+	"errors"
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"github.com/metrue/go-ssh-client"
+	sshMocks "github.com/metrue/go-ssh-client/mocks"
+)
+
+func TestDriverProvision(t *testing.T) {
+	t.Run("SSHConnectError", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		sshClient := sshMocks.NewMockClienter(ctrl)
+		n := &Docker{sshClient: sshClient}
+		err := errors.New("could not connect to host")
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(false, err).AnyTimes()
+		if err := n.Provision(context.Background(), true); err == nil {
+			t.Fatalf("should get error when SSH connection not ok")
+		}
+	})
+
+	t.Run("SSHConnectionNotOK", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		sshClient := sshMocks.NewMockClienter(ctrl)
+		n := New(sshClient)
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(false, nil).AnyTimes()
+		if err := n.Provision(context.Background(), true); err == nil {
+			t.Fatalf("should get error when SSH connection not ok")
+		}
+	})
+
+	t.Run("DockerAndFxAgentOK", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		sshClient := sshMocks.NewMockClienter(ctrl)
+		n := New(sshClient)
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil).AnyTimes()
+		sshClient.EXPECT().RunCommand(scripts["docker_version"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		sshClient.EXPECT().RunCommand(scripts["check_fx_agent"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		if err := n.Provision(context.Background(), true); err != nil {
+			t.Fatal(err)
+		}
+	})
+
+	t.Run("DockerNotReady", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		sshClient := sshMocks.NewMockClienter(ctrl)
+		n := New(sshClient)
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil).AnyTimes()
+		err := errors.New("docker command not found")
+		sshClient.EXPECT().RunCommand(scripts["docker_version"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err)
+		sshClient.EXPECT().RunCommand(scripts["has_docker"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err)
+		if err := n.Provision(context.Background(), true); err == nil {
+			t.Fatal("should tell user to install docker first")
+		}
+	})
+
+	t.Run("FxAgentNotReady", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		sshClient := sshMocks.NewMockClienter(ctrl)
+		n := New(sshClient)
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil).AnyTimes()
+		err := errors.New("fx agent not found")
+		sshClient.EXPECT().RunCommand(scripts["docker_version"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		sshClient.EXPECT().RunCommand(scripts["check_fx_agent"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err)
+		sshClient.EXPECT().RunCommand(scripts["start_fx_agent"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		if err := n.Provision(context.Background(), true); err != nil {
+			t.Fatal(err)
+		}
+	})
+
+	t.Run("DockerAndFxAgentReady", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		sshClient := sshMocks.NewMockClienter(ctrl)
+		n := New(sshClient)
+
+		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil).AnyTimes()
+		sshClient.EXPECT().RunCommand(scripts["docker_version"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		sshClient.EXPECT().RunCommand(scripts["check_fx_agent"], ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
+		if err := n.Provision(context.Background(), true); err != nil {
+			t.Fatal(err)
+		}
+	})
+}
+
+func TestRunCommand(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	sshClient := sshMocks.NewMockClienter(ctrl)
+	n := &Docker{
+		sshClient: sshClient,
+	}
+	script := "script"
+	option := ssh.CommandOptions{
+		Timeout: sshConnectionTimeout,
+	}
+	sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil)
+	sshClient.EXPECT().RunCommand(script, option).Return(nil)
+	if err := n.runCmd(script, true, option); err != nil {
+		t.Fatal(err)
+	}
+}

provisioner/linux/linux.go

@@ -1,4 +1,4 @@
-package provisioners
+package linux
 
 import (
 	"context"
@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/metrue/fx/provisioner"
 	"github.com/metrue/go-ssh-client"
 )
 
@@ -14,6 +15,7 @@ const sshConnectionTimeout = 10 * time.Second
 
 var scripts = map[string]interface{}{
 	"docker_version": "docker version",
+	"has_docker":     "type docker",
 	"install_docker": "curl -fsSL https://download.docker.com/linux/static/stable/x86_64/docker-18.06.3-ce.tgz -o docker.tgz && tar zxvf docker.tgz && mv docker/* /usr/bin && rm -rf docker docker.tgz",
 	"start_dockerd":  "dockerd >/dev/null 2>&1 & sleep 2",
 	"check_fx_agent": "docker inspect fx-agent",
@@ -35,8 +37,10 @@ func New(sshClient ssh.Clienter) *Docker {
 // Provision a host
 func (d *Docker) Provision(ctx context.Context, isRemote bool) error {
 	if err := d.runCmd(scripts["docker_version"].(string), isRemote); err != nil {
-		if err := d.runCmd(scripts["install_docker"].(string), isRemote); err != nil {
-			return err
+		if err := d.runCmd(scripts["has_docker"].(string), isRemote); err != nil {
+			if err := d.runCmd(scripts["install_docker"].(string), isRemote); err != nil {
+				return err
+			}
 		}
 
 		if err := d.runCmd(scripts["start_dockerd"].(string), isRemote); err != nil {
@@ -86,5 +90,5 @@ func (d *Docker) runCmd(script string, isRemote bool, options ...ssh.CommandOpti
 }
 
 var (
-	_ Provisioner = &Docker{}
+	_ provisioner.Provisioner = &Docker{}
 )

provisioner/linux/linux_test.go

@@ -1,4 +1,4 @@
-package provisioners
+package linux
 
 import (
 	"context"
@@ -59,6 +59,7 @@ func TestDriverProvision(t *testing.T) {
 		sshClient.EXPECT().Connectable(sshConnectionTimeout).Return(true, nil).AnyTimes()
 		err := errors.New("docker command not found")
 		sshClient.EXPECT().RunCommand(scripts["docker_version"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err)
+		sshClient.EXPECT().RunCommand(scripts["has_docker"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err)
 		sshClient.EXPECT().RunCommand(scripts["install_docker"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		sshClient.EXPECT().RunCommand(scripts["start_dockerd"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		sshClient.EXPECT().RunCommand(scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
@@ -94,6 +95,7 @@ func TestDriverProvision(t *testing.T) {
 		err2 := errors.New("fx agent not found")
 		err1 := errors.New("docker command not found")
 		sshClient.EXPECT().RunCommand(scripts["docker_version"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err1)
+		sshClient.EXPECT().RunCommand(scripts["has_docker"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err1)
 		sshClient.EXPECT().RunCommand(scripts["install_docker"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		sshClient.EXPECT().RunCommand(scripts["start_dockerd"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(nil)
 		sshClient.EXPECT().RunCommand(scripts["check_fx_agent"].(string), ssh.CommandOptions{Timeout: sshConnectionTimeout}).Return(err2)

provisioner/provisioner.go

@@ -1,4 +1,4 @@
-package provisioners
+package provisioner
 
 import "context"
 

scripts/test_cli.sh

@@ -11,13 +11,13 @@ run() {
   # localhost
   $fx up --name ${service}_${lang} --port ${port} --healthcheck test/functions/func.${lang}
   $fx list
-  $fx down ${service}_${lang} || true
+  $fx down ${service}_${lang}
 }
 
 build_image() {
   local lang=$1
-  local tag=$2
-  $fx image build -t ${tag} test/functions/func.${lang}
+  local name=$2
+  $fx image build -n ${name} test/functions/func.${lang}
 }
 
 export_image() {
@@ -27,14 +27,6 @@ export_image() {
 }
 
 # main
-# clean up
-# docker stop fx-agent || true && docker rm fx-agent || true
-if [[ "$DOCKER_REMOTE_HOST_ADDR" != "" ]];then
-  cloud_name='fx-remote-docker-host'
-  $fx infra create --name ${cloud_name} --type docker --host ${DOCKER_REMOTE_HOST_USER}@${DOCKER_REMOTE_HOST_ADDR}
-  $fx infra use ${cloud_name}
-fi
-
 port=20000
 for lang in ${1}; do
   run $lang $port

test/functions/func.pl

@@ -0,0 +1,5 @@
+sub fx {
+  return 'hello fx'
+}
+
+1;

utils/dir.go

@@ -26,7 +26,7 @@ func Merge(dest string, input ...string) error {
 			if err != nil {
 				return err
 			}
-			if err := ioutil.WriteFile(targetFilePath, body, 0644); err != nil {
+			if err := ioutil.WriteFile(targetFilePath, body, 0600); err != nil {
 				return err
 			}
 		} else if stat.Mode().IsDir() {

utils/utils.go

@@ -29,6 +29,7 @@ func Download(filepath string, url string) (err error) {
 	}
 	defer resp.Body.Close()
 
+	// nolint: gosec
 	_, err = io.Copy(out, resp.Body)
 	if err != nil {
 		return err
@@ -70,6 +71,7 @@ func Unzip(source string, target string) (err error) {
 		}
 		defer targetFile.Close()
 
+		// nolint: gosec
 		if _, err := io.Copy(targetFile, fileReader); err != nil {
 			return err
 		}
@@ -96,6 +98,7 @@ func CopyFile(src, dst string) (err error) {
 		}
 	}()
 
+	// nolint: gosec
 	_, err = io.Copy(out, in)
 	if err != nil {
 		return