path params

Author: lbernardo

bin/darwin/lambda-local

@@ -21,30 +21,51 @@ type Server struct {
 	JSON    model.Serverless
 }
 
-func checkPath(event model.HttpEvent, reqPath string, method string) bool {
+var strReg = "{[a-z0-9A-Z-]+}"
+
+const varsKey int = iota
+
+func checkPath(event model.HttpEvent, reqPath string, method string) (bool, map[string]string) {
+	parameters := map[string]string{}
 	emethod := strings.ToUpper(event.Method)
 
 	event.Path = strings.ReplaceAll("/"+event.Path, "//", "/")
 
 	if emethod != method {
-		return false
+		return false, parameters
 	}
 
 	if event.Path == reqPath {
-		return true
+		return true, parameters
 	}
 
-	match, _ := regexp.MatchString("{[a-z0-9A-Z-]+}", event.Path)
+	match, _ := regexp.MatchString(strReg, event.Path)
 	if match == true {
-		reg, _ := regexp.Compile("{[a-z0-9A-Z-]+}")
+		reg, _ := regexp.Compile(strReg)
+
 		ep := reg.ReplaceAllString(event.Path, "[a-z0-9A-Z-]+")
+		p := strings.ReplaceAll(ep, "[a-z0-9A-Z-]+", "")
+
 		match, _ = regexp.MatchString(ep, reqPath)
 		if match == true {
-			return true
+			reg2, _ := regexp.Compile("[a-z0-9A-Z-]+")
+			params := reg.FindStringSubmatch(event.Path)
+			m := strings.ReplaceAll(reqPath, p, "")
+			values := reg2.FindStringSubmatch(m)
+			var value string
+
+			for i, param := range params {
+				value = values[i]
+				param = strings.ReplaceAll(param, "{", "")
+				param = strings.ReplaceAll(param, "}", "")
+				parameters[param] = value
+			}
+
+			return true, parameters
 		}
 	}
 
-	return false
+	return false, parameters
 }
 
 func (se *Server) ContentYaml() {
@@ -62,8 +83,9 @@ func (se *Server) StartConfig() {
 	http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		se.ContentYaml()
 		for _, functions := range se.JSON.Functions {
-			if checkPath(functions.Events[0].HttpEvent, r.URL.RequestURI(), r.Method) {
-				result, off := lambda.ExecuteDockerLambda(se.Volume, se.Network, functions.Handler, se.JSON.Provider["runtime"], r.Body)
+			check, parameters := checkPath(functions.Events[0].HttpEvent, r.URL.RequestURI(), r.Method)
+			if check {
+				result, off := lambda.ExecuteDockerLambda(se.Volume, se.Network, functions.Handler, se.JSON.Provider["runtime"], r.Body, parameters)
 				if result.StatusCode == 0 {
 					w.WriteHeader(400)
 					fmt.Println(off)

bin/linux/lambda-local

@@ -18,7 +18,8 @@ import (
 )
 
 type ContentRequest struct {
-	Body string `json:"body"`
+	Body           string            `json:"body"`
+	PathParameters map[string]string `json:"pathparameters"`
 }
 
 func PullImageDocker(runtime string) {
@@ -36,7 +37,7 @@ func PullImageDocker(runtime string) {
 	io.Copy(os.Stdout, reader)
 }
 
-func ExecuteDockerLambda(volume string, net string, handler string, runtime string, body io.ReadCloser) (model.Result, string) {
+func ExecuteDockerLambda(volume string, net string, handler string, runtime string, body io.ReadCloser, parameters map[string]string) (model.Result, string) {
 	var result model.Result
 	var output bytes.Buffer
 	var contentRequest ContentRequest
@@ -55,6 +56,7 @@ func ExecuteDockerLambda(volume string, net string, handler string, runtime stri
 	bodyStr = strings.ReplaceAll(bodyStr, "\t", "")
 	bodyStr = strings.ReplaceAll(bodyStr, "\n", "")
 	contentRequest.Body = bodyStr
+	contentRequest.PathParameters = parameters
 
 	jsonRequest, _ := json.Marshal(contentRequest)
 

controller/server.go

@@ -1,6 +1,8 @@
 package main
 
-import "github.com/lbernardo/lambda-local/cmd"
+import (
+	"github.com/lbernardo/lambda-local/cmd"
+)
 
 func main() {
 	cmd.Execute()