Introduce unified infrastructure interface

We introduce a common interface to Docker and AWS infrastructures used
to run goad and lambda function.

The creation of the result channel is still handled outside the
infrastucture interface but should be included aswell.

Author: cwaltken-edrans

.gitignore

@@ -2,7 +2,7 @@ site/node_modules
 site/dist
 data/lambda.zip
 data/lambda/goad-lambda
-infrastructure/bindata.go
+infrastructure/aws/bindata.go
 site/Upstatic
 build/
 

Makefile

@@ -45,7 +45,7 @@ lambda:
 
 bindata: lambda
 	@go get github.com/jteeuwen/go-bindata/...
-	@go-bindata -modtime $(TIMESTAMP) -nocompress -pkg infrastructure -o infrastructure/bindata.go data/lambda.zip
+	@go-bindata -modtime $(TIMESTAMP) -nocompress -pkg awsinfra -o infrastructure/aws/bindata.go data/lambda.zip
 
 linux64: bindata
 	@GOOS=linux GOARCH=amd64 $(GO-BUILD) -o build/linux/x86-64/$(TARGET)

cli/cli.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
-	"log"
 	"math"
 	"os"
 	"os/signal"
@@ -271,24 +270,21 @@ func createGoadTest(config *goad.TestConfig) *goad.Test {
 }
 
 func start(test *goad.Test, finalResult *queue.RegionsAggData, sigChan chan os.Signal) {
-	if test.Config.RunDocker {
-		goad.DockerPullLambdaImage()
-		goad.DockerPullRabbitMQImage()
-	}
+	resultChan, teardown := test.Start()
+	defer teardown()
 
-	err := termbox.Init()
-	if err != nil {
-		log.Println(err)
-	} else {
-		defer termbox.Close()
-		termbox.Sync()
-		renderString(0, 0, "Launching on AWS... (be patient)", coldef, coldef)
-		renderLogo()
-		termbox.Flush()
+	platform := "AWS"
+	if test.Config.RunDocker {
+		platform = "Docker"
 	}
+	launchingOn := fmt.Sprintf("Launching on %s... (be patient)", platform)
 
-	resultChan, teardown := test.Start()
-	defer teardown()
+	termbox.Init()
+	defer termbox.Close()
+	termbox.Sync()
+	renderString(0, 0, launchingOn, coldef, coldef)
+	renderLogo()
+	termbox.Flush()
 
 	_, h := termbox.Size()
 	renderString(0, h-1, "Press ctrl-c to interrupt", coldef, coldef)
@@ -367,8 +363,10 @@ func renderLogo() {
 
 // Also clears loading message
 func clearLogo() {
-	for i := 0; i < 8; i++ {
-		renderString(0, i, "                                ", coldef, coldef)
+	w, h := termbox.Size()
+	clearStr := strings.Repeat(" ", w)
+	for i := 0; i < h-1; i++ {
+		renderString(0, i, clearStr, coldef, coldef)
 	}
 }
 

goad/goad.go

@@ -1,28 +1,18 @@
 package goad
 
 import (
-	"bytes"
-	"context"
-	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
 	"math"
-	"os"
 	"strconv"
 	"strings"
 	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/lambda"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/client"
 	"github.com/goadapp/goad/infrastructure"
+	"github.com/goadapp/goad/infrastructure/aws"
+	"github.com/goadapp/goad/infrastructure/docker"
 	"github.com/goadapp/goad/queue"
-	"github.com/goadapp/goad/version"
 )
 
 // TestConfig type
@@ -41,11 +31,6 @@ type TestConfig struct {
 	RunDocker   bool
 }
 
-type invokeArgs struct {
-	File string   `json:"file"`
-	Args []string `json:"args"`
-}
-
 const nano = 1000000000
 
 var supportedRegions = []string{
@@ -80,9 +65,9 @@ func (t *Test) Start() (<-chan queue.RegionsAggData, func()) {
 	awsConfig := aws.NewConfig().WithRegion(t.Config.Regions[0])
 
 	if t.Config.RunDocker {
-		t.infra = infrastructure.NewDockerInfrastructure()
+		t.infra = dockerinfra.NewDockerInfrastructure()
 	} else {
-		t.infra = infrastructure.New(t.Config.Regions, awsConfig)
+		t.infra = awsinfra.New(t.Config.Regions, awsConfig)
 	}
 	teardown, err := t.infra.Setup()
 	handleErr(err)
@@ -130,18 +115,12 @@ func (t *Test) invokeLambdas(awsConfig *aws.Config, queueURL string) {
 		}
 		args = append(args, fmt.Sprintf("%s", c.URL))
 
-		invokeargs := invokeArgs{
+		invokeargs := infrastructure.InvokeArgs{
 			File: "./goad-lambda",
 			Args: args,
 		}
 
-		config := aws.NewConfig().WithRegion(region)
-
-		if t.Config.RunDocker {
-			go runAsDockerContainer(queueURL, invokeargs)
-		} else {
-			go invokeLambda(config, invokeargs)
-		}
+		go t.infra.Run(invokeargs)
 	}
 }
 
@@ -151,75 +130,6 @@ func handleErr(err error) {
 	}
 }
 
-func DockerPullLambdaImage() {
-	DockerPullImage("lambci/lambda")
-}
-
-func DockerPullRabbitMQImage() {
-	DockerPullImage("rabbitmq:3")
-}
-
-func DockerPullImage(imageName string) {
-	ctx := context.Background()
-	cli, err := client.NewEnvClient()
-	handleErr(err)
-
-	// Pull the image from dockerhub.
-	out, err := cli.ImagePull(ctx, imageName, types.ImagePullOptions{})
-	handleErr(err)
-	defer out.Close()
-	io.Copy(os.Stdout, out)
-}
-
-func runAsDockerContainer(queueURL string, args invokeArgs) {
-	ctx := context.Background()
-	cli, err := client.NewEnvClient()
-	handleErr(err)
-	rabbitmqURL := fmt.Sprintf("RABBITMQ=%s", queueURL)
-
-	// Create container to execute lambda
-	resp, err := cli.ContainerCreate(ctx, &container.Config{
-		Image: "lambci/lambda",
-		Cmd:   append([]string{"index.handler"}, ToJSONString(args)),
-		Volumes: map[string]struct{}{
-			"/var/task": struct{}{},
-		},
-		Env: []string{rabbitmqURL},
-	}, &container.HostConfig{
-		AutoRemove: true,
-		Binds:      []string{os.ExpandEnv("${PWD}/data/lambda:/var/task:ro")},
-	}, &network.NetworkingConfig{
-		EndpointsConfig: map[string]*network.EndpointSettings{
-			"goad-bridge": &network.EndpointSettings{},
-		},
-	}, "")
-	handleErr(err)
-
-	// run container
-	err = cli.ContainerStart(ctx, resp.ID, types.ContainerStartOptions{})
-	handleErr(err)
-}
-
-func ToJSONString(args interface{}) string {
-	b, err := json.Marshal(args)
-	handleErr(err)
-	return string(b[:])
-}
-func toJSONReadSeeker(args interface{}) io.ReadSeeker {
-	j, err := json.Marshal(args)
-	handleErr(err)
-	return bytes.NewReader(j)
-}
-
-func invokeLambda(awsConfig *aws.Config, args invokeArgs) {
-	svc := lambda.New(session.New(), awsConfig)
-
-	svc.InvokeAsync(&lambda.InvokeAsyncInput{
-		FunctionName: aws.String("goad:" + version.LambdaVersion()),
-		InvokeArgs:   toJSONReadSeeker(args),
-	})
-}
-
 func numberOfLambdas(concurrency int, numRegions int) int {
 	if numRegions > int(concurrency) {
 		return int(concurrency)