Test publish package

Author: clareliguori

img2lambda/cli/main.go

@@ -80,7 +80,7 @@ func repackImageAction(opts *types.CmdOptions) error {
 	}
 
 	if !opts.DryRun {
-		err := publish.PublishLambdaLayers(types.ConvertToPublishOptions(opts), layers)
+		_, err := publish.PublishLambdaLayers(types.ConvertToPublishOptions(opts), layers)
 		if err != nil {
 			return err
 		}

img2lambda/internal/testing/mocks/image_mocks.go

@@ -13,15 +13,15 @@ import (
 	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/types"
 )
 
-func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer) error {
+func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer) (string, error) {
 	layerArns := []string{}
 
 	for _, layer := range layers {
 		layerName := opts.LayerPrefix + "-" + strings.Replace(layer.Digest, ":", "-", -1)
 
 		layerContents, err := ioutil.ReadFile(layer.File)
 		if err != nil {
-			return err
+			return "", err
 		}
 
 		publishArgs := &lambda.PublishLayerVersionInput{
@@ -33,37 +33,37 @@ func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer)
 
 		resp, err := opts.LambdaClient.PublishLayerVersion(publishArgs)
 		if err != nil {
-			return err
+			return "", err
 		}
 
 		layerArns = append(layerArns, *resp.LayerVersionArn)
 
 		err = os.Remove(layer.File)
 		if err != nil {
-			return err
+			return "", err
 		}
 
 		log.Printf("Published Lambda layer file %s (image layer %s) to Lambda: %s", layer.File, layer.Digest, *resp.LayerVersionArn)
 	}
 
 	jsonArns, err := json.MarshalIndent(layerArns, "", "  ")
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	resultsPath := filepath.Join(opts.ResultsDir, "layers.json")
 	jsonFile, err := os.Create(resultsPath)
 	if err != nil {
-		return err
+		return "", err
 	}
 	defer jsonFile.Close()
 
 	_, err = jsonFile.Write(jsonArns)
 	if err != nil {
-		return err
+		return "", err
 	}
 
 	log.Printf("Lambda layer ARNs (%d total) are written to %s", len(layerArns), resultsPath)
 
-	return nil
+	return resultsPath, nil
 }

img2lambda/internal/testing/mocks/lambda_mocks.go

@@ -0,0 +1,168 @@
+package publish
+
+import (
+	"encoding/json"
+	"errors"
+	"io/ioutil"
+	"os"
+	"strconv"
+	"testing"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/lambda"
+	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/internal/testing/mocks"
+	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/types"
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+)
+
+func parseResult(t *testing.T, resultsFilename string) []string {
+	resultContents, err := ioutil.ReadFile(resultsFilename)
+	assert.Nil(t, err)
+	var resultArns []string
+	err = json.Unmarshal(resultContents, &resultArns)
+	assert.Nil(t, err)
+	os.Remove(resultsFilename)
+	return resultArns
+}
+
+func mockLayer(t *testing.T, n int) types.LambdaLayer {
+	tmpFile, err := ioutil.TempFile("", "")
+	assert.Nil(t, err)
+	defer tmpFile.Close()
+
+	_, err = tmpFile.WriteString("hello world " + strconv.Itoa(n))
+	assert.Nil(t, err)
+	return types.LambdaLayer{
+		Digest: "sha256:" + strconv.Itoa(n),
+		File:   tmpFile.Name(),
+	}
+}
+
+func mockLayers(t *testing.T) []types.LambdaLayer {
+	var layers []types.LambdaLayer
+
+	layers = append(layers, mockLayer(t, 1))
+	layers = append(layers, mockLayer(t, 2))
+
+	return layers
+}
+
+func TestNoLayers(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	lambdaClient := mocks.NewMockLambdaAPI(ctrl)
+
+	dir, err := ioutil.TempDir("", "")
+	assert.Nil(t, err)
+
+	opts := &types.PublishOptions{
+		LambdaClient:    lambdaClient,
+		LayerPrefix:     "test-prefix",
+		SourceImageName: "test-image",
+		ResultsDir:      dir,
+	}
+
+	layers := []types.LambdaLayer{}
+
+	resultsFilename, err := PublishLambdaLayers(opts, layers)
+	assert.Nil(t, err)
+
+	resultArns := parseResult(t, resultsFilename)
+	assert.Len(t, resultArns, 0)
+}
+
+func TestPublishSuccess(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	lambdaClient := mocks.NewMockLambdaAPI(ctrl)
+
+	dir, err := ioutil.TempDir("", "")
+	assert.Nil(t, err)
+
+	opts := &types.PublishOptions{
+		LambdaClient:    lambdaClient,
+		LayerPrefix:     "test-prefix",
+		SourceImageName: "test-image",
+		ResultsDir:      dir,
+	}
+
+	layers := mockLayers(t)
+
+	expectedInput1 := &lambda.PublishLayerVersionInput{
+		CompatibleRuntimes: []*string{aws.String("provided")},
+		Content:            &lambda.LayerVersionContentInput{ZipFile: []byte("hello world 1")},
+		Description:        aws.String("created by img2lambda from image test-image"),
+		LayerName:          aws.String("test-prefix-sha256-1"),
+	}
+
+	expectedOutput1 := &lambda.PublishLayerVersionOutput{
+		LayerVersionArn: aws.String("arn:aws:lambda:us-east-2:123456789012:layer:example-layer-1:1"),
+	}
+
+	expectedInput2 := &lambda.PublishLayerVersionInput{
+		CompatibleRuntimes: []*string{aws.String("provided")},
+		Content:            &lambda.LayerVersionContentInput{ZipFile: []byte("hello world 2")},
+		Description:        aws.String("created by img2lambda from image test-image"),
+		LayerName:          aws.String("test-prefix-sha256-2"),
+	}
+
+	expectedOutput2 := &lambda.PublishLayerVersionOutput{
+		LayerVersionArn: aws.String("arn:aws:lambda:us-east-2:123456789012:layer:example-layer-2:1"),
+	}
+
+	lambdaClient.EXPECT().
+		PublishLayerVersion(gomock.Eq(expectedInput1)).
+		Return(expectedOutput1, nil)
+
+	lambdaClient.EXPECT().
+		PublishLayerVersion(gomock.Eq(expectedInput2)).
+		Return(expectedOutput2, nil)
+
+	resultsFilename, err := PublishLambdaLayers(opts, layers)
+	assert.Nil(t, err)
+
+	resultArns := parseResult(t, resultsFilename)
+	assert.Len(t, resultArns, 2)
+	assert.Equal(t, "arn:aws:lambda:us-east-2:123456789012:layer:example-layer-1:1", resultArns[0])
+	assert.Equal(t, "arn:aws:lambda:us-east-2:123456789012:layer:example-layer-2:1", resultArns[1])
+}
+
+func TestPublishError(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	lambdaClient := mocks.NewMockLambdaAPI(ctrl)
+
+	dir, err := ioutil.TempDir("", "")
+	assert.Nil(t, err)
+
+	opts := &types.PublishOptions{
+		LambdaClient:    lambdaClient,
+		LayerPrefix:     "test-prefix",
+		SourceImageName: "test-image",
+		ResultsDir:      dir,
+	}
+
+	layers := mockLayers(t)
+
+	expectedInput1 := &lambda.PublishLayerVersionInput{
+		CompatibleRuntimes: []*string{aws.String("provided")},
+		Content:            &lambda.LayerVersionContentInput{ZipFile: []byte("hello world 1")},
+		Description:        aws.String("created by img2lambda from image test-image"),
+		LayerName:          aws.String("test-prefix-sha256-1"),
+	}
+
+	lambdaClient.EXPECT().
+		PublishLayerVersion(gomock.Eq(expectedInput1)).
+		Return(nil, errors.New("Access denied"))
+
+	resultsFilename, err := PublishLambdaLayers(opts, layers)
+	assert.Error(t, err)
+	assert.Equal(t, "", resultsFilename)
+
+	os.Remove(layers[0].File)
+	os.Remove(layers[1].File)
+}

img2lambda/publish/publish_layers.go

@@ -41,7 +41,7 @@ cat << EOF
 // HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 // SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-$(mockgen "${package}" "${interfaces}")
+$(mockgen -package mocks "${package}" "${interfaces}")
 EOF
 )