Remove 'fx call' and 'fx doctor'

README.md

@@ -15,7 +15,6 @@ Poor man's function as a service.
 - [Introduction](#introduction)
 - [Installation](#installation)
 - [Usage](#usage)
-- [Manage Infrastructure](#manage-infrastructure)
 - [Contribute](#contribute)
 
 
@@ -71,8 +70,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
@@ -81,16 +78,13 @@ USAGE:
    fx [global options] command [command options] [arguments...]
 
 VERSION:
-   0.8.7
+   0.9.33
 
 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 +92,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,
+
+```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 +134,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 +161,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 +185,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 +211,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

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.33"
 
 func init() {
 	go checkForUpdate()
@@ -212,28 +212,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",
@@ -281,11 +259,6 @@ func main() {
 				},
 			},
 		},
-		{
-			Name:   "doctor",
-			Usage:  "health check for fx",
-			Action: handle(handlers.Doctor),
-		},
 	}
 
 	if err := app.Run(os.Args); err != nil {

go.mod

@@ -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

go.sum

@@ -227,6 +227,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=

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
-}