Merge branch 'develop'

Author: lbernardo

README.md

@@ -64,6 +64,7 @@ Flags:
       --volume string   Docker volume mount execution [required] [ [ex: --volume $PWD]
       --network string  Set network name usage
       --yaml string     File yaml serverless [default serverless.yml]
+      --env  string     File for using environment variables other than serverless. Can replace serverless variables
 ```
 
 ** Usage --volume for define source path of project **

bin/darwin/lambda-local

@@ -20,11 +20,13 @@ var Host string
 var Yaml string
 var Volume string
 var Network string
+var Environment string
 
 func init() {
 	startCmd.PersistentFlags().StringVar(&Port, "port", "3000", "port usage [default 3000]")
 	startCmd.PersistentFlags().StringVar(&Host, "host", "0.0.0.0", "host usage [default 0.0.0.0]")
 	startCmd.PersistentFlags().StringVar(&Yaml, "yaml", "serverless.yml", "File yaml serverless.yml [default serverless.yml]")
+	startCmd.PersistentFlags().StringVar(&Environment, "env", "", "File for using environment variables other than serverless. Can replace serverless variables")
 	startCmd.Flags().StringVar(&Volume, "volume", "", "Docker volume mount execution [ex: --volume $PWD]")
 	startCmd.Flags().StringVar(&Network, "network", "", "Set network name usage")
 	startCmd.MarkFlagRequired("volume")
@@ -33,11 +35,12 @@ func init() {
 func ExecuteCmdStart(cmd *cobra.Command, args []string) {
 
 	se := controller.Server{
-		Host:    Host,
-		Port:    Port,
-		Yaml:    Yaml,
-		Volume:  Volume,
-		Network: Network,
+		Host:            Host,
+		Port:            Port,
+		Yaml:            Yaml,
+		Volume:          Volume,
+		Network:         Network,
+		EnvironmentFile: Environment,
 	}
 	ep := controller.EndpointsController{
 		Host: Host,

bin/linux/lambda-local

@@ -1,10 +1,12 @@
 package controller
 
 import (
+	"bufio"
 	"encoding/json"
 	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"regexp"
 	"strings"
 
@@ -13,12 +15,13 @@ import (
 )
 
 type Server struct {
-	Host    string
-	Port    string
-	Yaml    string
-	Volume  string
-	Network string
-	JSON    model.Serverless
+	Host            string
+	Port            string
+	Yaml            string
+	Volume          string
+	Network         string
+	EnvironmentFile string
+	JSON            model.Serverless
 }
 
 var strReg = "{[a-z0-9A-Z-]+}"
@@ -76,12 +79,30 @@ func (se *Server) ContentYaml() {
 	json.Unmarshal(content, &se.JSON)
 }
 
+func (se *Server) ReadEnv() {
+	if se.EnvironmentFile != "" {
+		file, err := os.Open(se.EnvironmentFile)
+		if err != nil {
+			log.Fatal(err)
+		}
+		defer file.Close()
+
+		scanner := bufio.NewScanner(file)
+		for scanner.Scan() {
+			textLine := scanner.Text()
+			envArgs := strings.Split(textLine, "=")
+			se.JSON.Provider.Environment[envArgs[0]] = envArgs[1]
+		}
+	}
+}
+
 func (se *Server) StartConfig() {
 	se.ContentYaml()
 	lambda.PullImageDocker(se.JSON.Provider.Runtime)
 
 	http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		se.ContentYaml()
+		se.ReadEnv()
 		for _, functions := range se.JSON.Functions {
 			check, parameters := checkPath(functions.Events[0].HttpEvent, r.URL.RequestURI(), r.Method)
 			if check {

cmd/start.go

@@ -0,0 +1 @@
+TEST_ENV=1234

controller/server.go

@@ -9,7 +9,7 @@ import (
 
 func HandleRequest(request events.APIGatewayProxyRequest) (events.APIGatewayProxyResponse, error) {
 	return events.APIGatewayProxyResponse{
-		Body:       "Hello:" + os.Getenv("DATABASE") + os.Getenv("TABLE_NAME"),
+		Body:       "Hello:" + os.Getenv("DATABASE") + " - " + os.Getenv("TABLE_NAME") + " - " + os.Getenv("TEST_ENV"),
 		StatusCode: 200,
 	}, nil
 }