Add support for container API call from http plugin

Author: akclace

internal/app/action/action.go

@@ -36,27 +36,28 @@ var embedFS = hashfs.NewFS(embedHtml)
 // and an API interface
 type Action struct {
 	*types.Logger
-	isDev          bool
-	name           string
-	description    string
-	appPath        string
-	run            starlark.Callable
-	suggest        starlark.Callable
-	params         []apptype.AppParam
-	paramValuesStr map[string]string
-	paramDict      starlark.StringDict
-	actionTemplate *template.Template
-	pagePath       string
-	AppTemplate    *template.Template
-	StyleType      types.StyleType
-	LightTheme     string
-	DarkTheme      string
+	isDev             bool
+	name              string
+	description       string
+	appPath           string
+	run               starlark.Callable
+	suggest           starlark.Callable
+	params            []apptype.AppParam
+	paramValuesStr    map[string]string
+	paramDict         starlark.StringDict
+	actionTemplate    *template.Template
+	pagePath          string
+	AppTemplate       *template.Template
+	StyleType         types.StyleType
+	LightTheme        string
+	DarkTheme         string
+	containerProxyUrl string
 }
 
 // NewAction creates a new action
 func NewAction(logger *types.Logger, sourceFS *appfs.SourceFs, isDev bool, name, description, apath string, run, suggest starlark.Callable,
 	params []apptype.AppParam, paramValuesStr map[string]string, paramDict starlark.StringDict,
-	appPath string, styleType types.StyleType) (*Action, error) {
+	appPath string, styleType types.StyleType, containerProxyUrl string) (*Action, error) {
 
 	funcMap := system.GetFuncMap()
 
@@ -96,19 +97,20 @@ func NewAction(logger *types.Logger, sourceFS *appfs.SourceFs, isDev bool, name,
 	}
 
 	return &Action{
-		Logger:         &appLogger,
-		isDev:          isDev,
-		name:           name,
-		description:    description,
-		appPath:        appPath,
-		pagePath:       pagePath,
-		run:            run,
-		suggest:        suggest,
-		params:         params,
-		paramValuesStr: paramValuesStr,
-		paramDict:      paramDict,
-		actionTemplate: tmpl,
-		StyleType:      styleType,
+		Logger:            &appLogger,
+		isDev:             isDev,
+		name:              name,
+		description:       description,
+		appPath:           appPath,
+		pagePath:          pagePath,
+		run:               run,
+		suggest:           suggest,
+		params:            params,
+		paramValuesStr:    paramValuesStr,
+		paramDict:         paramDict,
+		actionTemplate:    tmpl,
+		StyleType:         styleType,
+		containerProxyUrl: containerProxyUrl,
 		// AppTemplate and Theme names are initialized later
 	}, nil
 }
@@ -149,6 +151,9 @@ func (a *Action) runAction(w http.ResponseWriter, r *http.Request) {
 
 	// Save the request context in the starlark thread local
 	thread.SetLocal(types.TL_CONTEXT, r.Context())
+	if a.containerProxyUrl != "" {
+		thread.SetLocal(types.TL_CONTAINER_URL, a.containerProxyUrl)
+	}
 	isHtmxRequest := r.Header.Get("HX-Request") == "true"
 
 	r.ParseForm()

internal/app/apptype/builtins.go

@@ -405,16 +405,17 @@ func CreateBuiltin() starlark.StringDict {
 					ACTION:     starlark.NewBuiltin(ACTION, createActionBuiltin),
 					RESULT:     starlark.NewBuiltin(RESULT, createResultBuiltin),
 
-					GET:    starlark.String(GET),
-					POST:   starlark.String(POST),
-					PUT:    starlark.String(PUT),
-					DELETE: starlark.String(DELETE),
-					JSON:   starlark.String(JSON),
-					TEXT:   starlark.String(TEXT),
-					READ:   starlark.String(READ),
-					WRITE:  starlark.String(WRITE),
-					AUTO:   starlark.String(AUTO),
-					TABLE:  starlark.String(TABLE),
+					GET:             starlark.String(GET),
+					POST:            starlark.String(POST),
+					PUT:             starlark.String(PUT),
+					DELETE:          starlark.String(DELETE),
+					JSON:            starlark.String(JSON),
+					TEXT:            starlark.String(TEXT),
+					READ:            starlark.String(READ),
+					WRITE:           starlark.String(WRITE),
+					AUTO:            starlark.String(AUTO),
+					TABLE:           starlark.String(TABLE),
+					"CONTAINER_URL": starlark.String(CONTAINER_URL),
 				},
 			},
 		}

internal/app/handler.go

@@ -58,6 +58,9 @@ func (a *App) createHandlerFunc(fullHtml, fragment string, handler starlark.Call
 
 		// Save the request context in the starlark thread local
 		thread.SetLocal(types.TL_CONTEXT, r.Context())
+		if a.containerManager != nil {
+			thread.SetLocal(types.TL_CONTAINER_URL, a.containerManager.GetProxyUrl())
+		}
 
 		isHtmxRequest := r.Header.Get("HX-Request") == "true" && !(r.Header.Get("HX-Boosted") == "true")
 

internal/app/setup.go

@@ -487,8 +487,13 @@ func (a *App) addAction(count int, val starlark.Value, router *chi.Mux) error {
 	if !strings.HasPrefix(path, "/") {
 		path = "/" + path
 	}
+	containerProxyUrl := ""
+	if a.containerManager != nil {
+		containerProxyUrl = a.containerManager.GetProxyUrl()
+	}
 	action, err := action.NewAction(a.Logger, a.sourceFS, a.IsDev, name, description, path, run, suggest,
-		slices.Collect(maps.Values(a.paramInfo)), a.paramValuesStr, a.paramDict, a.Path, a.appStyle.GetStyleType())
+		slices.Collect(maps.Values(a.paramInfo)), a.paramValuesStr, a.paramDict, a.Path, a.appStyle.GetStyleType(),
+		containerProxyUrl)
 	if err != nil {
 		return fmt.Errorf("error creating action %s: %w", name, err)
 	}

internal/types/types.go

@@ -32,6 +32,7 @@ const (
 	TL_DEFER_MAP                = "TL_defer_map"
 	TL_CURRENT_MODULE_FULL_PATH = "TL_current_module_full_path"
 	TL_PLUGIN_API_FAILED_ERROR  = "TL_plugin_api_failed_error"
+	TL_CONTAINER_URL            = "TL_container_url"
 )
 
 const (

plugins/http.go

@@ -17,6 +17,7 @@ import (
 	"strings"
 
 	"github.com/claceio/clace/internal/app"
+	"github.com/claceio/clace/internal/app/apptype"
 	"github.com/claceio/clace/internal/app/starlark_type"
 	"github.com/claceio/clace/internal/plugin"
 	"github.com/claceio/clace/internal/types"
@@ -117,6 +118,17 @@ func (h *httpPlugin) reqMethod(method string) func(thread *starlark.Thread, _ *s
 			return nil, err
 		}
 
+		if strings.HasPrefix(rawurl, apptype.CONTAINER_URL) {
+			// If the url starts with the container url, we need to replace it with the container proxy url
+			rawurl = strings.TrimPrefix(rawurl, apptype.CONTAINER_URL)
+			containerProxyUrl := thread.Local(types.TL_CONTAINER_URL)
+			containerProxyUrlStr, ok := containerProxyUrl.(string)
+			if !ok || containerProxyUrlStr == "" {
+				return nil, fmt.Errorf("container proxy url not set")
+			}
+			rawurl = containerProxyUrlStr + rawurl
+		}
+
 		if err = setQueryParams(&rawurl, params); err != nil {
 			return nil, err
 		}

tests/flaskhttp/app.py

@@ -0,0 +1,11 @@
+from flask import Flask
+
+app = Flask(__name__)
+
+@app.route("/")
+def root():
+    return "hello"
+
+@app.route("/test")
+def hello_world():
+    return "testworld"

tests/flaskhttp/app.star

@@ -0,0 +1,18 @@
+load("container.in", "container")
+load("http.in", "http")
+
+def handler(req):
+    v1 = http.get(ace.CONTAINER_URL).value.body()
+    v2 = http.get(ace.CONTAINER_URL + "/test").value.body()
+    return {"v1": v1, "v2": v2}
+
+app = ace.app("Flask Http Test",
+              routes=[
+                  ace.api("/")
+              ],
+              container=container.config(container.AUTO, port=param.port),
+              permissions=[
+                  ace.permission("container.in", "config", [container.AUTO]),
+                  ace.permission("http.in", "get")
+              ]
+       ) 

tests/test_containers.yaml

@@ -75,3 +75,13 @@ tests:
     command: ../clace app create --spec image --approve --param image=nginx - /cont_image_error
     stderr: param port is a required param, a value has to be provided
     exit-code: 1
+
+  # Test http plugin call without proxy
+  container0500: # setup app
+    command: ../clace app create --spec python-flask --approve ./flaskhttp /cont_fh
+  container0510: # check curl
+    command: curl -sS localhost:${HTTP_PORT}/cont_fh
+    stdout: '"v1":"hello"'
+  container0520: # check curl
+    command: curl -sS localhost:${HTTP_PORT}/cont_fh
+    stdout: '"v2":"testworld"'