Working out a sandwich issue

Makefile

@@ -1,27 +1,3 @@
-GOCMD=go
-GOINSTALL=$(GOCMD) install
-GOCLEAN=$(GOCMD) clean
-GOWICHINSTALL=$(GOINSTALL) ${GOPATH}/src/github.com/suhay/sandwich-shop/gowich/gowich.go
-NODEWICH=cd ${GOPATH}/src/github.com/suhay/sandwich-shop/nodewich && yarn install --production && cd $(shell pwd)
-
-install: 
-	$(GOINSTALL) ${GOPATH}/src/github.com/suhay/sandwich-shop/shop/sandwich-shop.go
-
-sandwiches:
-	$(GOWICHINSTALL)
-	$(NODEWICH)
-
-nodewich:
-	$(NODEWICH)
-
-gowich:
-	$(GOWICHINSTALL)
-
-clean: 
-	$(GOCLEAN)
-	rm -f ${GOPATH}/bin/sandwich-shop
-	rm -f ${GOPATH}/bin/gowich
-
 gqlgen:
 	go run github.com/99designs/gqlgen
 
@@ -33,4 +9,4 @@ dev:
 
 build:
 	go build
-	cd sandwiches/gowich;	go build
+	cd sandwiches/gowich;	go build

auth/auth.go

@@ -98,7 +98,7 @@ func mongoAuth(tenantID string, mongodbURL string) (string, error) {
 }
 
 func localAuth(tenantID string) (string, error) {
-	tenants := "../tenants"
+	tenants := "tenants"
 	if envTenants, ok := os.LookupEnv("TENANTS"); ok {
 		tenants = envTenants
 	}
@@ -109,5 +109,5 @@ func localAuth(tenantID string) (string, error) {
 		return "", err
 	}
 
-	return string(dat), nil
+	return strings.TrimSpace(string(dat)), nil
 }

docker-compose.yml

@@ -0,0 +1,24 @@
+version: "3.1"
+
+services:
+  shop:
+    image: golang:1.17
+    ports:
+      - "3002:3002"
+    volumes:
+      - .:/code
+    working_dir: /code
+    command: "./sandwich-shop"
+    environment:
+      - MODE=DEV
+    links:
+      - "gowich"
+
+  gowich:
+    image: golang:1.17
+    ports:
+      - "4007:4007"
+    volumes:
+      - .:/code
+    working_dir: /code/sandwiches/gowich
+    command: "./gowich --env /code/.node1.env --port 4007"

sandwich-shop.go

@@ -56,7 +56,6 @@ func main() {
 	}
 
 	port := setPort(*flagPort)
-
 	srv := handler.NewDefaultServer(models.NewExecutableSchema(models.Config{Resolvers: &shop.Resolver{}}))
 	r := chi.NewRouter()
 

sandwiches/gowich/gowich.go

@@ -105,7 +105,6 @@ func main() {
 					if !claims.Authorized {
 						if len(claims.Auth) > 0 {
 							out, err := placeOrder(claims.Auth, claims, body, header)
-							log.Println(out)
 							if err != nil || strings.ToLower(out) != "true" {
 								http.Error(w, http.StatusText(http.StatusUnauthorized), http.StatusUnauthorized)
 								return
@@ -118,7 +117,9 @@ 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())
@@ -150,7 +151,14 @@ func placeOrder(order string, claims *order, body string, header string) (string
 	if claims.Runtime == "binary" {
 		cmd = exec.Command(order, body, header)
 	} else {
-		cmd = exec.Command(os.Getenv(strings.ToUpper(claims.Runtime)), order, body, header)
+		runtime := strings.ToUpper(claims.Runtime)
+		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)
+		} else {
+			cmd = exec.Command(name, order, body, header)
+		}
 	}
 
 	if len(claims.Env) > 0 {
@@ -166,6 +174,9 @@ 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)
@@ -185,5 +196,7 @@ 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
 }

sandwiches/nodewich/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodewich",
-  "version": "1.0.0",
+  "version": "0.3.0",
   "description": "Node based shop for https://github.com/suhay/sandwich-shop",
   "main": "index.js",
   "scripts": {
@@ -20,4 +20,4 @@
   "bin": {
     "nodewich": "bin/nodewich.js"
   }
-}
+}

shop/order.go

@@ -88,6 +88,11 @@ func PlaceOrder(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if body, _ := ioutil.ReadAll(resp.Body); len(body) > 0 {
+		if resp.StatusCode != 200 {
+			http.Error(w, http.StatusText(resp.StatusCode), resp.StatusCode)
+			return
+		}
+
 		w.Header().Add("Content-Type", "application/json")
 		w.Write(body)
 		return

tenants/sandwiches.json

@@ -2,13 +2,10 @@
   {
     "_id": "ciabatta",
     "name": "Ciabatta",
-    "host": "http://localhost",
+    "host": "http://gowich",
     "port": 4007,
     "runtimes": [
-      "go1_17",
-      "node14",
-      "node16",
-      "python3"
+      "go1_17"
     ]
   }
 ]