Finished testing

.gitignore

@@ -15,5 +15,4 @@ sandwich-shop
 .env
 .node1.env
 .key
-shop/shop
-gowich
+sandwiches/gowich/gowich

Makefile

@@ -1,3 +1,5 @@
+.PHONY: shop
+
 gqlgen:
 	go run github.com/99designs/gqlgen
 
@@ -7,6 +9,12 @@ generate:
 dev:
 	MODE=DEV CompileDaemon -directory=./ -color=true -command="./sandwich-shop"
 
-build:
+all:
 	go build
 	cd sandwiches/gowich;	go build
+
+shop:
+	go build
+
+gowich:
+	cd sandwiches/gowich;	go build

docker-compose.yml

@@ -8,11 +8,9 @@ services:
     volumes:
       - .:/code
     working_dir: /code
-    command: "./sandwich-shop"
+    command: ["sh", "-c", "make shop && ./sandwich-shop"]
     environment:
       - MODE=DEV
-    links:
-      - "gowich"
 
   gowich:
     image: golang:1.17
@@ -21,4 +19,6 @@ services:
     volumes:
       - .:/code
     working_dir: /code/sandwiches/gowich
-    command: "./gowich --env /code/.node1.env --port 4007"
+    command: ["sh", "-c", "make gowich && ./gowich --env /code/.node1.env --port 4007"]
+    depends_on:
+      - shop

orders.yml

@@ -0,0 +1,4 @@
+---
+hello:
+  runtime: go1_17
+  path: hello.go

sandwiches/gowich/Makefile

@@ -0,0 +1,4 @@
+.PHONY: gowich
+
+gowich:
+	go build

sandwiches/gowich/gowich.go

@@ -118,9 +118,6 @@ func main() {
 					order := chi.URLParam(r, "order")
 					out, err := placeOrder(order, claims, body, header)
 
-					log.Println(out)
-					log.Println(err)
-
 					if err != nil {
 						log.Println(err.Error())
 						http.Error(w, http.StatusText(500), 500)
@@ -155,13 +152,13 @@ func placeOrder(order string, claims *order, body string, header string) (string
 		name := os.Getenv(runtime)
 
 		if strings.HasPrefix(runtime, "GO") {
-			cmd = exec.Command(name, "run", "/code/tenants/b78682b3-36c8-4759-b8d1-5e62f029a1bc/make_sandwich.go", body, header)
+			cmd = exec.Command(name, "run", order, body, header)
 		} else {
 			cmd = exec.Command(name, order, body, header)
 		}
 	}
 
-	if len(claims.Env) > 0 {
+	if claims.Env != "[]" && len(claims.Env) > 0 {
 		env := []string{}
 		json.Unmarshal([]byte(claims.Env), &env)
 		cmd.Env = env
@@ -174,9 +171,6 @@ func placeOrder(order string, claims *order, body string, header string) (string
 
 	cmd.Dir = tenants + "/" + claims.Tenant
 
-	log.Println(os.Getwd())
-	log.Println(cmd)
-
 	// cmd.SysProcAttr = &syscall.SysProcAttr{}
 
 	// uid, uerr := strconv.ParseUint(os.Getenv("UID"), 10, 32)
@@ -196,7 +190,5 @@ func placeOrder(order string, claims *order, body string, header string) (string
 	// hold := &syscall.Credential{Uid: uint32(uid), Gid: uint32(gid)}
 
 	out, err := cmd.Output()
-	log.Println(out)
-	log.Println(err)
 	return strings.TrimSpace(string(out)), err
 }

tenants/b78682b3-36c8-4759-b8d1-5e62f029a1bc/orders.yml

@@ -6,4 +6,3 @@ getSandwich: # order name
 makeSandwich: # order name
   runtime: go1_17 # sandwich type to make
   path: make_sandwich.go # path where function lives
-  env: [] # any variables to include

tenants/myFunctions/hello.go

@@ -0,0 +1,5 @@
+package main
+import "fmt"
+func main() {
+fmt.Printf("%s", "Hello!")
+}

tenants/myFunctions/orders.yml

@@ -0,0 +1,4 @@
+---
+hello:
+  runtime: go1_17
+  path: hello.go