Merge pull request #6 from lbernardo/develop

Fix enviroment

Author: lbernardo

bin/darwin/lambda-local

@@ -78,14 +78,14 @@ func (se *Server) ContentYaml() {
 
 func (se *Server) StartConfig() {
 	se.ContentYaml()
-	lambda.PullImageDocker(se.JSON.Provider["runtime"])
+	lambda.PullImageDocker(se.JSON.Provider.Runtime)
 
 	http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		se.ContentYaml()
 		for _, functions := range se.JSON.Functions {
 			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"], se.JSON.Environment, r.Body, parameters)
+				result, off := lambda.ExecuteDockerLambda(se.Volume, se.Network, functions.Handler, se.JSON.Provider.Runtime, se.JSON.Provider.Environment, r.Body, parameters)
 				if result.StatusCode == 0 {
 					w.WriteHeader(400)
 					fmt.Println(off)

bin/linux/lambda-local

@@ -3,10 +3,9 @@ service: myservice
 provider:
   name: aws
   runtime: go1.x
-
-environment:
-  DATABASE: "mydatabase"
-  TABLE_NAME: table-${opt:stage, self:provider.stage}
+  environment:
+    DATABASE: "mydatabase"
+    TABLE_NAME: table-${opt:stage, self:provider.stage}
 
 functions:
   hello:
@@ -20,4 +19,4 @@ functions:
     events:
       - http:
           path: world
-          method: get
+          method: get

controller/server.go

@@ -1,9 +1,8 @@
 package model
 
 type Serverless struct {
-	Functions   map[string]Functions `json:"functions"`
-	Provider    map[string]string    `json:"provider"`
-	Environment map[string]string    `json:"environment"`
+	Functions map[string]Functions `json:"functions"`
+	Provider  Provider             `json:"provider"`
 }
 
 type Functions struct {
@@ -19,3 +18,9 @@ type HttpEvent struct {
 	Method string `json:"method"`
 	Path   string `json:"path"`
 }
+
+type Provider struct {
+	Environment map[string]string `json:"environment"`
+	Name        string            `json:"name"`
+	Runtime     string            `json:"runtime"`
+}