fix test

Bumps [github.com/pkg/errors](https://github.com/pkg/errors) from 0.9.0 to 0.9.1.
- [Release notes](https://github.com/pkg/errors/releases)
- [Commits](https://github.com/pkg/errors/compare/v0.9.0...v0.9.1)

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

.github/workflows/docker.yml

@@ -57,11 +57,11 @@ jobs:
         run: |
           docker push metrue/fx-python-base:latest
 
-      # - name: build and publish fx rust image
-      #   if: always()
-      #   run: |
-      #     docker build -t metrue/fx-rust-base:latest -f ./assets/dockerfiles/base/rust/Dockerfile ./assets/dockerfiles/base/python
-      #     docker push metrue/fx-rust-base:latest
+      - name: build and publish fx perl image
+        if: always()
+        run: |
+          docker build -t metrue/fx-perl-base:latest -f ./assets/dockerfiles/base/perl/Dockerfile ./assets/dockerfiles/base/perl
+          docker push metrue/fx-perl-base:latest
 
       - name: build and publish fx julia image
         if: always()

.golangci.yml

@@ -1,6 +1,6 @@
 run:
-  deadline: 10m
-  timeout: 10m
+  deadline: 20m
+  timeout: 20m
   issues-exit-code: 1
   tests: true
   skip-dirs:

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

@@ -1,13 +1,26 @@
 {
-  "name": "aok",
+  "name": "fx-node-base",
   "version": "1.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@koa/cors": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-2.2.3.tgz",
+      "integrity": "sha512-tCVVXa39ETsit5kGBtEWWimjLn1sDaeu8+0phgb8kT3GmBDZOykkI3ZO8nMjV2p3MGkJI4K5P+bxR8Ztq0bwsA==",
+      "requires": {
+        "vary": "^1.1.2"
+      }
+    },
     "node-fetch": {
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
       "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw="
     }
   }
 }

assets/dockerfiles/base/node/package.json

@@ -10,6 +10,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@koa/cors": "^2.2.3",
     "get-port": "^3.2.0",
     "is-generator-function": "^1.0.6",
     "koa": "^2.3.0",

assets/dockerfiles/base/perl/cpanfile

@@ -1,2 +1,3 @@
 requires "EV";
+requires "JSON";
 requires "Mojolicious::Lite";

fx.go

@@ -17,7 +17,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )
 
-const version = "0.8.87"
+const version = "0.8.88"
 
 func init() {
 	go checkForUpdate()

go.mod

@@ -34,7 +34,7 @@ require (
 	github.com/otiai10/copy v1.0.2
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/pierrec/lz4 v0.0.0-20190222153722-062282ea0dcf // indirect
-	github.com/pkg/errors v0.8.1
+	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.1

go.sum

@@ -253,6 +253,10 @@ 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=
 github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

handlers/image.go

@@ -9,6 +9,7 @@ import (
 	"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"
@@ -39,6 +40,9 @@ func BuildImage(ctx context.Contexter) (err error) {
 		if err := packer.Pack(workdir, sources...); err != nil {
 			return err
 		}
+		if err := hook.RunBeforeBuildHook(workdir); err != nil {
+			return err
+		}
 	}
 
 	docker := ctx.Get("docker").(containerruntimes.ContainerRuntime)
@@ -68,6 +72,9 @@ func ExportImage(ctx context.Contexter) (err error) {
 		if err := packer.Pack(outputDir, sources...); err != nil {
 			return err
 		}
+		if err := hook.RunBeforeBuildHook(outputDir); err != nil {
+			return err
+		}
 	}
 
 	log.Infof("exported to %v: %v", outputDir, constants.CheckedSymbol)

hook/.hooks/before_build

@@ -0,0 +1 @@
+npm install

hook/fixture/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "fixture",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "leftpad": "0.0.1"
+  }
+}

hook/hook.go

@@ -0,0 +1,73 @@
+package hook
+
+import (
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+
+	"github.com/metrue/fx/utils"
+)
+
+// Hooker defines hook interface
+type Hooker interface {
+	Run() error
+}
+
+// Hook to run
+type Hook struct {
+	name   string
+	script string
+}
+
+// New a hook
+func New(name string, script string, workdir string) *Hook {
+	return &Hook{
+		name:   name,
+		script: script,
+	}
+}
+
+// Run execute a hook
+func (h *Hook) Run(workdir string) error {
+	var script string
+	if !utils.IsRegularFile(h.script) {
+		hookScript, err := ioutil.TempFile(os.TempDir(), "fx-hook-script-")
+		if err != nil {
+			return err
+		}
+		defer os.Remove(hookScript.Name())
+
+		content := []byte(h.script)
+		if _, err = hookScript.Write(content); err != nil {
+			return err
+		}
+		if err := hookScript.Close(); err != nil {
+			return err
+		}
+		script = hookScript.Name()
+	} else {
+		absScript, err := filepath.Abs(h.script)
+		if err != nil {
+			return err
+		}
+		script = absScript
+	}
+
+	cmd := exec.Command("/bin/sh", script)
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	if workdir != "" {
+		cmd.Dir = workdir
+	}
+
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+	return nil
+}
+
+// Name hook name
+func (h *Hook) Name() string {
+	return h.name
+}

hook/hook_manager.go

@@ -0,0 +1,54 @@
+package hook
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/metrue/fx/utils"
+)
+
+// HookNameBeforeBuild before build hook
+const HookNameBeforeBuild = "before_build"
+
+// RunBeforeBuildHook trigger before_build hook
+func RunBeforeBuildHook(workdir string) error {
+	hooks, err := descovery("")
+	if err != nil {
+		return err
+	}
+	for _, h := range hooks {
+		if h.Name() == HookNameBeforeBuild {
+			if err := h.Run(workdir); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}
+
+func descovery(hookdir string) ([]*Hook, error) {
+	if hookdir == "" {
+		dir, err := os.Getwd()
+		if err != nil {
+			return nil, err
+		}
+		hookdir = filepath.Join(dir, ".hooks")
+	}
+
+	hooks := []*Hook{}
+	if !utils.IsDir(hookdir) {
+		return hooks, nil
+	}
+	if err := filepath.Walk(hookdir, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.Name() == HookNameBeforeBuild {
+			hooks = append(hooks, New("before_build", path, ""))
+		}
+		return nil
+	}); err != nil {
+		return nil, err
+	}
+	return hooks, nil
+}

hook/hook_manager_test.go

@@ -0,0 +1,40 @@
+package hook
+
+import (
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestHookManager(t *testing.T) {
+	t.Run("descovery in default hookdir .hooks", func(t *testing.T) {
+		hooks, err := descovery("")
+		if err != nil {
+			t.Fatal(err)
+		}
+
+		if len(hooks) != 1 {
+			t.Fatalf("should have one hook, but got %d", len(hooks))
+		}
+
+		if hooks[0].Name() != HookNameBeforeBuild {
+			t.Fatalf("should be before_build hook, but got %s", hooks[0].Name())
+		}
+	})
+
+	t.Run("descovery in empty hookdir", func(t *testing.T) {
+		hooks, err := descovery(filepath.Join(os.TempDir(), ".hooks"))
+		if err != nil {
+			t.Fatal(err)
+		}
+		if len(hooks) != 0 {
+			t.Fatalf("should get 0 hooks, but got %d", len(hooks))
+		}
+	})
+
+	t.Run("run before_build hook", func(t *testing.T) {
+		if err := RunBeforeBuildHook("fixture"); err != nil {
+			t.Fatal(err)
+		}
+	})
+}

hook/hook_test.go

@@ -0,0 +1,21 @@
+package hook
+
+import (
+	"testing"
+)
+
+func TestHook(t *testing.T) {
+	t.Run("text", func(t *testing.T) {
+		h := New("before_build", "npm install leftpad", "fixture")
+		if err := h.Run("fixture"); err != nil {
+			t.Fatal(err)
+		}
+	})
+
+	t.Run("script", func(t *testing.T) {
+		h := New("before_build", ".hooks/before_build", "fixture")
+		if err := h.Run("fixture"); err != nil {
+			t.Fatal(err)
+		}
+	})
+}

middlewares/build.go

@@ -7,6 +7,7 @@ import (
 
 	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/types"
@@ -54,6 +55,9 @@ func Build(ctx context.Contexter) (err error) {
 		if err := packer.Pack(workdir, sources...); err != nil {
 			return err
 		}
+		if err := hook.RunBeforeBuildHook(workdir); err != nil {
+			return err
+		}
 	}
 
 	cloudType := ctx.Get("cloud_type").(string)

middlewares/parse.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/metrue/fx/context"
+	"github.com/metrue/fx/utils"
 )
 
 // Parse parse input
@@ -15,7 +16,11 @@ func Parse(action string) func(ctx context.Contexter) (err error) {
 		case "up":
 			sources := []string{}
 			for _, s := range cli.Args() {
-				sources = append(sources, s)
+				if utils.IsDir(s) || utils.IsRegularFile(s) {
+					sources = append(sources, s)
+				} else {
+					return fmt.Errorf("no such file or directory: %s", s)
+				}
 			}
 			ctx.Set("sources", sources)
 			name := cli.String("name")

middlewares/parse_test.go

@@ -0,0 +1,49 @@
+package middlewares
+
+import (
+	"os"
+	"testing"
+
+	"flag"
+
+	"github.com/golang/mock/gomock"
+	mockCtx "github.com/metrue/fx/context/mocks"
+	"github.com/urfave/cli"
+)
+
+func TestParse(t *testing.T) {
+	t.Run("source code not existed", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		ctx := mockCtx.NewMockContexter(ctrl)
+		argset := flag.NewFlagSet("test", 0)
+		cli := cli.NewContext(nil, argset, nil)
+		argset.Parse([]string{"this_file_should_not_existed"})
+		ctx.EXPECT().GetCliContext().Return(cli)
+		if err := Parse("up")(ctx); err == nil {
+			t.Fatal("should got file or directory not existed error")
+		}
+	})
+	t.Run("source code ready", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+
+		ctx := mockCtx.NewMockContexter(ctrl)
+		argset := flag.NewFlagSet("test", 0)
+		cli := cli.NewContext(nil, argset, nil)
+		pwd, err := os.Getwd()
+		if err != nil {
+			t.Fatal(err)
+		}
+		argset.Parse([]string{pwd})
+		ctx.EXPECT().GetCliContext().Return(cli)
+		ctx.EXPECT().Set("sources", []string{pwd})
+		ctx.EXPECT().Set("name", "")
+		ctx.EXPECT().Set("port", 0)
+		ctx.EXPECT().Set("force", false)
+		if err := Parse("up")(ctx); err != nil {
+			t.Fatal("should got file or directory not existed error")
+		}
+	})
+}

packer/a_packer-packr.go

@@ -24,7 +24,7 @@ func init() {
 	packr.PackJSONBytes("./images", "julia/deps.jl", "\"b3BlbigiL2FwcC9SRVFVSVJFIikgZG8gZgoJZGVwcyA9IHJlYWRsaW5lcyhmKQoJZm9yIGQgaW4gZGVwcwoJCVBrZy5hZGQoZCkKCWVuZAplbmQKUGtnLmJ1aWxkKCJIdHRwUGFyc2VyIikK\"")
 	packr.PackJSONBytes("./images", "julia/fx.jl", "\"CnN0cnVjdCBJbnB1dAogICAgYTo6TnVtYmVyCiAgICBiOjpOdW1iZXIKZW5kCgpmeCA9IGZ1bmN0aW9uKGlucHV0OjpJbnB1dCkKICAgIHJldHVybiBpbnB1dC5hICsgaW5wdXQuYgplbmQK\"")
 	packr.PackJSONBytes("./images", "node/Dockerfile", "\"RlJPTSBtZXRydWUvZngtbm9kZS1iYXNlCgpDT1BZIC4gLgpFWFBPU0UgMzAwMApDTUQgWyJub2RlIiwgImFwcC5qcyJdCg==\"")
-	packr.PackJSONBytes("./images", "node/app.js", "\"Y29uc3QgS29hID0gcmVxdWlyZSgna29hJyk7CmNvbnN0IGJvZHlQYXJzZXIgPSByZXF1aXJlKCdrb2EtYm9keXBhcnNlcicpOwpjb25zdCBmeCA9IHJlcXVpcmUoJy4vZngnKTsKCmNvbnN0IGFwcCA9IG5ldyBLb2EoKTsKYXBwLnVzZShib2R5UGFyc2VyKCkpOwphcHAudXNlKGZ4KTsKCmFwcC5saXN0ZW4oMzAwMCk7Cg==\"")
+	packr.PackJSONBytes("./images", "node/app.js", "\"Y29uc3QgS29hID0gcmVxdWlyZSgna29hJyk7CmNvbnN0IGJvZHlQYXJzZXIgPSByZXF1aXJlKCdrb2EtYm9keXBhcnNlcicpOwpjb25zdCBjb3JzID0gcmVxdWlyZSgnQGtvYS9jb3JzJyk7CmNvbnN0IGZ4ID0gcmVxdWlyZSgnLi9meCcpOwoKY29uc3QgYXBwID0gbmV3IEtvYSgpOwphcHAudXNlKGNvcnMoewogIG9yaWdpbjogJyonLAp9KSk7CmFwcC51c2UoYm9keVBhcnNlcigpKTsKYXBwLnVzZShmeCk7CgphcHAubGlzdGVuKDMwMDApOwo=\"")
 	packr.PackJSONBytes("./images", "node/fx.js", "\"bW9kdWxlLmV4cG9ydHMgPSAoY3R4KSA9PiB7CiAgY3R4LmJvZHkgPSAnaGVsbG8gd29ybGQnCn0K\"")
 	packr.PackJSONBytes("./images", "perl/Dockerfile", "\"RlJPTSBtZXRydWUvZngtcGVybC1iYXNlCgpBREQgLiAuCgpFWFBPU0UgMzAwMApDTUQgWyJwZXJsIiwgImFwcC5wbCIsICJkYWVtb24iXQo=\"")
 	packr.PackJSONBytes("./images", "perl/app.pl", "\"dXNlIE1vam9saWNpb3VzOjpMaXRlOwoKcmVxdWlyZSAiLi9meC5wbCI7CgpnZXQgJy8nID0+IHN1YiB7CiAgbXkgJGN0eCA9IHNoaWZ0OwogIG15ICRyZXMgPSBmeCgkY3R4KTsKICAkY3R4LT5yZW5kZXIoanNvbiA9PiAkcmVzKTsKfTsKCnBvc3QgJy8nID0+IHN1YiB7CiAgbXkgJGN0eCA9IHNoaWZ0OwogIG15ICRyZXMgPSBmeCgkY3R4KTsKICAkY3R4LT5yZW5kZXIoanNvbiA9PiAkcmVzKTsKfTsKCmFwcC0+c3RhcnQ7Cg==\"")

packer/images/node/app.js

@@ -1,8 +1,12 @@
 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);