Move stuff into packages

Author: clareliguori

Makefile

@@ -2,7 +2,8 @@ ROOT := $(shell pwd)
 
 all: build
 
-SOURCEDIR := ./
+SOURCEDIR := ./img2lambda
+BINARY_NAME=img2lambda
 SOURCES := $(shell find $(SOURCEDIR) -name '*.go')
 LOCAL_BINARY := bin/local/img2lambda
 LINUX_BINARY := bin/linux-amd64/img2lambda
@@ -82,4 +83,5 @@ GITCOMMIT_SHA: $(GITFILES)
 .PHONY: clean
 clean:
 	- rm -rf ./bin
+	- rm -rf ./output
 	- rm -f GITCOMMIT_SHA

Gopkg.lock renamed to img2lambda/Gopkg.lock

@@ -6,6 +6,9 @@ import (
 	"log"
 	"os"
 
+	"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/version"
 	"github.com/urfave/cli"
 )
 
@@ -23,7 +26,7 @@ func createApp() (*cli.App, *cmdOptions) {
 	app := cli.NewApp()
 	app.EnableBashCompletion = true
 	app.Name = "img2lambda"
-	app.Version = VersionString()
+	app.Version = version.VersionString()
 	app.Usage = "Repackages a container image into AWS Lambda layers and publishes them to Lambda"
 	app.Action = func(c *cli.Context) error {
 		validateCliOptions(&opts, c)
@@ -74,7 +77,7 @@ func validateCliOptions(opts *cmdOptions, context *cli.Context) {
 }
 
 func repackImageAction(opts *cmdOptions) error {
-	layers, err := RepackImage("docker-daemon:"+opts.image, opts.outputDir)
+	layers, err := extract.RepackImage("docker-daemon:"+opts.image, opts.outputDir)
 	if err != nil {
 		return err
 	}
@@ -84,7 +87,7 @@ func repackImageAction(opts *cmdOptions) error {
 	}
 
 	if !opts.dryRun {
-		err := PublishLambdaLayers(opts.image, layers, opts.region, opts.layerNamespace, opts.outputDir)
+		err := publish.PublishLambdaLayers(opts.image, layers, opts.region, opts.layerNamespace, opts.outputDir)
 		if err != nil {
 			return err
 		}

Gopkg.toml renamed to img2lambda/Gopkg.toml

@@ -1,4 +1,4 @@
-package main
+package extract
 
 import (
 	"context"
@@ -7,20 +7,16 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/types"
 	"github.com/containers/image/image"
 	"github.com/containers/image/pkg/blobinfocache"
 	"github.com/containers/image/transports/alltransports"
-	"github.com/containers/image/types"
+	imgtypes "github.com/containers/image/types"
 	"github.com/pkg/errors"
 )
 
-type LambdaLayer struct {
-	Digest string
-	File   string
-}
-
 // Converts container image to Lambda layer archive files
-func RepackImage(imageName string, layerOutputDir string) (layers []LambdaLayer, retErr error) {
+func RepackImage(imageName string, layerOutputDir string) (layers []types.LambdaLayer, retErr error) {
 	log.Printf("Parsing the docker image %s", imageName)
 
 	// Get image's layer data from image name
@@ -29,7 +25,7 @@ func RepackImage(imageName string, layerOutputDir string) (layers []LambdaLayer,
 		return nil, err
 	}
 
-	sys := &types.SystemContext{}
+	sys := &imgtypes.SystemContext{}
 
 	ctx := context.Background()
 
@@ -74,15 +70,15 @@ func RepackImage(imageName string, layerOutputDir string) (layers []LambdaLayer,
 		}
 		defer layerStream.Close()
 
-		fileCreated, err := RepackLayer(lambdaLayerFilename, layerStream)
+		fileCreated, err := repackLayer(lambdaLayerFilename, layerStream)
 		if err != nil {
 			return nil, err
 		}
 
 		if fileCreated {
 			log.Printf("Created Lambda layer file %s from image layer %s", lambdaLayerFilename, string(layerInfo.Digest))
 			lambdaLayerNum++
-			layers = append(layers, LambdaLayer{Digest: string(layerInfo.Digest), File: lambdaLayerFilename})
+			layers = append(layers, types.LambdaLayer{Digest: string(layerInfo.Digest), File: lambdaLayerFilename})
 		} else {
 			log.Printf("Did not create a Lambda layer file from image layer %s (no relevant files found)", string(layerInfo.Digest))
 		}

main.go renamed to img2lambda/cli/main.go

@@ -1,4 +1,4 @@
-package main
+package extract
 
 import (
 	"archive/tar"
@@ -16,7 +16,7 @@ import (
 // Converts container image layer archive (tar) to Lambda layer archive (zip).
 // Filters files from the source and only writes a new archive if at least
 // one file in the source matches the filter (i.e. does not create empty archives).
-func RepackLayer(outputFilename string, layerContents io.Reader) (created bool, retError error) {
+func repackLayer(outputFilename string, layerContents io.Reader) (created bool, retError error) {
 	t := archiver.NewTar()
 
 	err := t.Open(layerContents, 0)

repack_image.go renamed to img2lambda/extract/repack_image.go

@@ -1,4 +1,4 @@
-package main
+package publish
 
 import (
 	"encoding/json"
@@ -11,9 +11,10 @@ import (
 	"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/awslabs/aws-lambda-container-image-converter/img2lambda/types"
 )
 
-func PublishLambdaLayers(sourceImageName string, layers []LambdaLayer, region string, layerPrefix string, resultsDir string) error {
+func PublishLambdaLayers(sourceImageName string, layers []types.LambdaLayer, region string, layerPrefix string, resultsDir string) error {
 	layerArns := []string{}
 
 	sess := session.Must(session.NewSessionWithOptions(session.Options{

repack_layer.go renamed to img2lambda/extract/repack_layer.go

@@ -0,0 +1,6 @@
+package types
+
+type LambdaLayer struct {
+	Digest string
+	File   string
+}