Squashed commit of the following:

commit 5a9c2b5942d16b3ff7b4ed7a02dafbf2c5462eae
Author: Minghe Huang <h.minghe@gmail.com>
Date:   Thu Jan 2 17:40:23 2020 +0800

    bump version

README.md

@@ -206,8 +206,26 @@ But we would suggest you run `kubectl config current-context` to check if the cu
 * Amazon Elastic Kubernetes Service (EKS)
   TODO
 
-* Google Kubernetes Engine (GKET)
-  TODO
+* Google Kubernetes Engine (GKE)
+
+First you should create a Kubernetes cluster in your GKE, then make sure your KUBECONFIG is ready in `~/.kube/config`, if not, you can run following commands,
+
+``` shell
+$ gcloud auth login
+$ gcloud container clusters get-credentials <your cluster> --zone <zone> --project <project>
+```
+
+Then make sure you current context is GKE cluster, you can check it with command,
+
+``` shell
+$ 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
+```
 
 * Setup your own Kubernetes cluster
 

assets/dockerfiles/base/node/package-lock.json

@@ -0,0 +1,13 @@
+{
+  "name": "aok",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "node-fetch": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
+      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    }
+  }
+}

assets/dockerfiles/base/node/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "aok",
+  "name": "fx-node-base",
   "version": "1.0.0",
   "description": "",
   "main": "index.js",
@@ -13,9 +13,7 @@
     "get-port": "^3.2.0",
     "is-generator-function": "^1.0.6",
     "koa": "^2.3.0",
-    "koa-bodyparser": "^4.2.0"
-  },
-  "devDependencies": {
-    "get-port-cli": "^1.1.0"
+    "koa-bodyparser": "^4.2.0",
+    "node-fetch": "^2.6.0"
   }
 }

config/env.go

@@ -0,0 +1,14 @@
+package config
+
+import (
+	"os"
+)
+
+// DisableContainerAutoremove to tell if to run container with --rm
+var DisableContainerAutoremove = false
+
+func init() {
+	if os.Getenv("DISABLE_CONTAINER_AUTOREMOVE") == "true" {
+		DisableContainerAutoremove = true
+	}
+}

config/env_test.go

@@ -0,0 +1,17 @@
+package config
+
+import (
+	"os"
+	"testing"
+)
+
+var _ = func() (_ struct{}) {
+	os.Setenv("DISABLE_CONTAINER_AUTOREMOVE", "true")
+	return
+}()
+
+func TestEnvLoad(t *testing.T) {
+	if !DisableContainerAutoremove {
+		t.Fatalf("should be true after set")
+	}
+}

container_runtimes/docker/http/api.go

@@ -23,6 +23,7 @@ import (
 	"github.com/docker/go-connections/nat"
 	"github.com/google/go-querystring/query"
 	"github.com/google/uuid"
+	fxConfig "github.com/metrue/fx/config"
 	containerruntimes "github.com/metrue/fx/container_runtimes"
 	"github.com/metrue/fx/types"
 	"github.com/metrue/fx/utils"
@@ -402,7 +403,7 @@ func (api *API) StartContainer(ctx context.Context, name string, image string, b
 	}
 
 	hostConfig := &dockerTypesContainer.HostConfig{
-		AutoRemove:   true,
+		AutoRemove:   !fxConfig.DisableContainerAutoremove,
 		PortBindings: portMap,
 	}
 

container_runtimes/docker/sdk/docker.go

@@ -18,6 +18,7 @@ import (
 	"github.com/docker/docker/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/google/uuid"
+	fxConfig "github.com/metrue/fx/config"
 	containerruntimes "github.com/metrue/fx/container_runtimes"
 	"github.com/metrue/fx/types"
 	"github.com/metrue/fx/utils"
@@ -161,7 +162,7 @@ func (d *Docker) StartContainer(ctx context.Context, name string, image string,
 	}
 
 	hostConfig := &dockerTypesContainer.HostConfig{
-		AutoRemove:   true,
+		AutoRemove:   !fxConfig.DisableContainerAutoremove,
 		PortBindings: portMap,
 	}
 	resp, err := d.ContainerCreate(ctx, config, hostConfig, nil, name)

fx.go

@@ -14,9 +14,10 @@ import (
 	"github.com/metrue/fx/handlers"
 	"github.com/metrue/fx/middlewares"
 	"github.com/urfave/cli"
+	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
-const version = "0.8.82"
+const version = "0.8.87"
 
 func init() {
 	go checkForUpdate()

go.mod

@@ -39,7 +39,7 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/spf13/viper v1.6.1
 	github.com/stretchr/testify v1.4.0
-	github.com/ugorji/go/codec v1.1.7 // indirect
+	github.com/ugorji/go v1.1.7 // indirect
 	github.com/urfave/cli v1.22.2
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
 	golang.org/x/crypto v0.0.0-20191219195013-becbf705a915 // indirect

go.sum

@@ -1,5 +1,6 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=

handlers/up.go

@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"github.com/apex/log"
 	"github.com/metrue/fx/context"
 	"github.com/metrue/fx/infra"
 	"github.com/metrue/fx/pkg/render"
@@ -20,6 +21,12 @@ func Up(ctx context.Contexter) (err error) {
 	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)
+		}
+	}
 
 	if err := deployer.Deploy(
 		ctx.GetContext(),

handlers/up_test.go

@@ -11,30 +11,64 @@ import (
 )
 
 func TestUp(t *testing.T) {
-	ctrl := gomock.NewController(t)
-	defer ctrl.Finish()
+	t.Run("normally up", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
 
-	ctx := mockCtx.NewMockContexter(ctrl)
-	deployer := mockDeployer.NewMockDeployer(ctrl)
+		ctx := mockCtx.NewMockContexter(ctrl)
+		deployer := mockDeployer.NewMockDeployer(ctrl)
 
-	bindings := []types.PortBinding{}
-	name := "sample-name"
-	image := "sample-image"
-	data := "sample-data"
-	ctx.EXPECT().Get("name").Return(name)
-	ctx.EXPECT().Get("image").Return(image)
-	ctx.EXPECT().Get("deployer").Return(deployer)
-	ctx.EXPECT().Get("bindings").Return(bindings)
-	ctx.EXPECT().Get("data").Return(data)
-	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{
-		ID:   "id-1",
-		Name: name,
-		Host: "127.0.0.1",
-		Port: 2100,
-	}, nil)
-	if err := Up(ctx); err != nil {
-		t.Fatal(err)
-	}
+		bindings := []types.PortBinding{}
+		name := "sample-name"
+		image := "sample-image"
+		data := "sample-data"
+		ctx.EXPECT().Get("name").Return(name)
+		ctx.EXPECT().Get("image").Return(image)
+		ctx.EXPECT().Get("deployer").Return(deployer)
+		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{
+			ID:   "id-1",
+			Name: name,
+			Host: "127.0.0.1",
+			Port: 2100,
+		}, nil)
+		if err := Up(ctx); err != nil {
+			t.Fatal(err)
+		}
+	})
+
+	t.Run("normally up forcely", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		ctx := mockCtx.NewMockContexter(ctrl)
+		deployer := mockDeployer.NewMockDeployer(ctrl)
+
+		bindings := []types.PortBinding{}
+		name := "sample-name"
+		image := "sample-image"
+		data := "sample-data"
+		ctx.EXPECT().Get("name").Return(name)
+		ctx.EXPECT().Get("image").Return(image)
+		ctx.EXPECT().Get("deployer").Return(deployer)
+		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{
+			ID:   "id-1",
+			Name: name,
+			Host: "127.0.0.1",
+			Port: 2100,
+		}, nil)
+		if err := Up(ctx); err != nil {
+			t.Fatal(err)
+		}
+	})
 }

middlewares/parse.go

@@ -22,6 +22,8 @@ func Parse(action string) func(ctx context.Contexter) (err error) {
 			ctx.Set("name", name)
 			port := cli.Int("port")
 			ctx.Set("port", port)
+			force := cli.Bool("force")
+			ctx.Set("force", force)
 		case "down":
 			services := cli.Args()
 			if len(services) == 0 {

packer/packer.go

@@ -70,7 +70,7 @@ func Pack(output string, input ...string) error {
 					return err
 				}
 
-				if isHandler(path) {
+				if isHandler(path, language) {
 					if err := copy.Copy(input[0], path); err != nil {
 						return err
 					}
@@ -84,7 +84,7 @@ func Pack(output string, input ...string) error {
 		return nil
 	}
 
-	if !hasFxHandleFile(input...) {
+	if !hasFxHandleFile(language, input...) {
 		msg := `it requires a fx handle file when input is not a single file function, e.g.
 fx.go for Golang
 Fx.java for Java

packer/rules.go

@@ -23,12 +23,18 @@ var ExtLangMapping = map[string]string{
 	".pl":   "perl",
 }
 
-func isHandler(name string) bool {
+func isHandler(name string, lang string) bool {
 	basename := filepath.Base(name)
 	nameWithoutExt := strings.TrimSuffix(basename, filepath.Ext(basename))
-	return nameWithoutExt == "fx" ||
-		nameWithoutExt == "Fx" || // Fx is for Java
-		nameWithoutExt == "mod" // mod.rs is for Rust
+	if ExtLangMapping[filepath.Ext(basename)] != lang {
+		return false
+	}
+
+	return (nameWithoutExt == "fx" ||
+		// Fx is for Java
+		nameWithoutExt == "Fx" ||
+		// mod.rs is for Rust)
+		nameWithoutExt == "mod")
 }
 
 func langFromFileName(fileName string) (string, error) {
@@ -44,10 +50,10 @@ func langFromFileName(fileName string) (string, error) {
 	return lang, nil
 }
 
-func hasFxHandleFile(input ...string) bool {
+func hasFxHandleFile(lang string, input ...string) bool {
 	var handleFile string
 	for _, file := range input {
-		if utils.IsRegularFile(file) && isHandler(file) {
+		if utils.IsRegularFile(file) && isHandler(file, lang) {
 			handleFile = file
 			break
 		} else if utils.IsDir(file) {
@@ -56,7 +62,7 @@ func hasFxHandleFile(input ...string) bool {
 					return err
 				}
 
-				if utils.IsRegularFile(path) && isHandler(info.Name()) {
+				if utils.IsRegularFile(path) && isHandler(info.Name(), lang) {
 					handleFile = path
 				}
 				return nil