Make Lambda client mock-able

Author: clareliguori

Makefile

@@ -22,15 +22,18 @@ $(LOCAL_BINARY): $(SOURCES) GITCOMMIT_SHA
 
 .PHONY: test
 test:
-	env -i PATH=$$PATH GOPATH=$$GOPATH GOROOT=$$GOROOT go test -timeout=120s -v -cover ./...
+	go test -v -timeout 30s -short -cover $(shell go list ./img2lambda/... | grep -v /vendor/)
 
 .PHONY: generate
 generate: $(SOURCES)
-	PATH=$(LOCAL_PATH) go generate ./...
+	PATH=$(LOCAL_PATH) go generate -x $(shell go list ./img2lambda/... | grep -v '/vendor/')
 
 .PHONY: install-deps
 install-deps:
 	curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+	go get golang.org/x/tools/cmd/cover
+	go get github.com/golang/mock/mockgen
+	go get golang.org/x/tools/cmd/goimports
 
 .PHONY: windows-build
 windows-build: $(WINDOWS_BINARY)

img2lambda/cli/main.go

@@ -8,20 +8,13 @@ import (
 
 	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/extract"
 	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/publish"
+	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/types"
 	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/version"
 	"github.com/urfave/cli"
 )
 
-type cmdOptions struct {
-	image          string // Name of the container image
-	region         string // AWS region
-	outputDir      string // Output directory for the Lambda layers
-	dryRun         bool   // Dry-run (will not register with Lambda)
-	layerNamespace string // Prefix for published Lambda layers
-}
-
-func createApp() (*cli.App, *cmdOptions) {
-	opts := cmdOptions{}
+func createApp() (*cli.App, *types.CmdOptions) {
+	opts := types.CmdOptions{}
 
 	app := cli.NewApp()
 	app.EnableBashCompletion = true
@@ -36,30 +29,30 @@ func createApp() (*cli.App, *cmdOptions) {
 		cli.StringFlag{
 			Name:        "image, i",
 			Usage:       "Name of the source container image. For example, 'my-docker-image:latest'. The Docker daemon must be pulled locally already.",
-			Destination: &opts.image,
+			Destination: &opts.Image,
 		},
 		cli.StringFlag{
 			Name:        "region, r",
 			Usage:       "AWS region",
 			Value:       "us-east-1",
-			Destination: &opts.region,
+			Destination: &opts.Region,
 		},
 		cli.StringFlag{
 			Name:        "output-directory, o",
 			Usage:       "Destination directory for command output",
 			Value:       "./output",
-			Destination: &opts.outputDir,
+			Destination: &opts.OutputDir,
 		},
 		cli.StringFlag{
 			Name:        "layer-namespace, n",
 			Usage:       "Prefix for the layers published to Lambda",
 			Value:       "img2lambda",
-			Destination: &opts.layerNamespace,
+			Destination: &opts.LayerNamespace,
 		},
 		cli.BoolFlag{
 			Name:        "dry-run, d",
 			Usage:       "Conduct a dry-run: Repackage the image, but only write the Lambda layers to local disk (do not publish to Lambda)",
-			Destination: &opts.dryRun,
+			Destination: &opts.DryRun,
 		},
 	}
 
@@ -69,15 +62,15 @@ func createApp() (*cli.App, *cmdOptions) {
 	return app, &opts
 }
 
-func validateCliOptions(opts *cmdOptions, context *cli.Context) {
-	if opts.image == "" {
-		fmt.Println("ERROR: Image name is required\n")
+func validateCliOptions(opts *types.CmdOptions, context *cli.Context) {
+	if opts.Image == "" {
+		fmt.Print("ERROR: Image name is required\n\n")
 		cli.ShowAppHelpAndExit(context, 1)
 	}
 }
 
-func repackImageAction(opts *cmdOptions) error {
-	layers, err := extract.RepackImage("docker-daemon:"+opts.image, opts.outputDir)
+func repackImageAction(opts *types.CmdOptions) error {
+	layers, err := extract.RepackImage("docker-daemon:"+opts.Image, opts.OutputDir)
 	if err != nil {
 		return err
 	}
@@ -86,8 +79,8 @@ func repackImageAction(opts *cmdOptions) error {
 		return errors.New("No compatible layers found in the image (likely nothing found in /opt)")
 	}
 
-	if !opts.dryRun {
-		err := publish.PublishLambdaLayers(opts.image, layers, opts.region, opts.layerNamespace, opts.outputDir)
+	if !opts.DryRun {
+		err := publish.PublishLambdaLayers(types.ConvertToPublishOptions(opts), layers)
 		if err != nil {
 			return err
 		}

img2lambda/clients/clients.go

@@ -0,0 +1,24 @@
+package clients
+
+import (
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/aws/request"
+	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go/service/lambda"
+	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/version"
+)
+
+var userAgentHandler = request.NamedHandler{
+	Name: "img2lambda.UserAgentHandler",
+	Fn:   request.MakeAddToUserAgentHandler("aws-lambda-container-image-converter", version.Version),
+}
+
+func NewLambdaClient(region string) *lambda.Lambda {
+	sess := session.Must(session.NewSession())
+
+	sess.Handlers.Build.PushBackNamed(userAgentHandler)
+
+	client := lambda.New(sess, &aws.Config{Region: aws.String(region)})
+
+	return client
+}

img2lambda/internal/testing/generate_mocks.go

@@ -0,0 +1,4 @@
+package testing
+
+//go:generate mockgen.sh github.com/aws/aws-sdk-go/service/lambda/lambdaiface LambdaAPI mocks/lambda_mocks.go
+//go:generate mockgen.sh github.com/containers/image/types ImageReference,ImageSource mocks/image_mocks.go