Output registered layers as yaml file too

Author: clareliguori

img2lambda/Gopkg.lock

@@ -29,3 +29,7 @@
 [[override]]
   name = "github.com/docker/distribution"
   revision = "83389a148052d74ac602f5f1d62f86ff2f3c4aa5"
+
+[[constraint]]
+  name = "gopkg.in/yaml.v2"
+  version = "2.2.2"

img2lambda/Gopkg.toml

@@ -112,7 +112,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/cli/main.go

@@ -12,13 +12,15 @@ import (
 	"path/filepath"
 	"strings"
 
+	yaml "gopkg.in/yaml.v2"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/lambda"
 	"github.com/aws/aws-sdk-go/service/lambda/lambdaiface"
 	"github.com/awslabs/aws-lambda-container-image-converter/img2lambda/types"
 )
 
-func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer) (string, error) {
+func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer) (string, string, error) {
 	layerArns := []string{}
 
 	for _, layer := range layers {
@@ -43,12 +45,12 @@ func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer)
 
 		layerContents, err := ioutil.ReadFile(layer.File)
 		if err != nil {
-			return "", err
+			return "", "", err
 		}
 
 		found, existingArn, err := matchExistingLambdaLayer(layerName, layerContents, &opts.LambdaClient)
 		if err != nil {
-			return "", err
+			return "", "", err
 		}
 
 		if found {
@@ -65,7 +67,7 @@ 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)
@@ -74,30 +76,47 @@ func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer)
 
 		err = os.Remove(layer.File)
 		if err != nil {
-			return "", err
+			return "", "", err
 		}
 	}
 
 	jsonArns, err := json.MarshalIndent(layerArns, "", "  ")
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 
-	resultsPath := filepath.Join(opts.ResultsDir, "layers.json")
-	jsonFile, err := os.Create(resultsPath)
+	jsonResultsPath := filepath.Join(opts.ResultsDir, "layers.json")
+	jsonFile, err := os.Create(jsonResultsPath)
 	if err != nil {
-		return "", err
+		return "", "", err
 	}
 	defer jsonFile.Close()
 
 	_, err = jsonFile.Write(jsonArns)
 	if err != nil {
-		return "", err
+		return "", "", err
+	}
+
+	yamlArns, err := yaml.Marshal(layerArns)
+	if err != nil {
+		return "", "", err
+	}
+
+	yamlResultsPath := filepath.Join(opts.ResultsDir, "layers.yaml")
+	yamlFile, err := os.Create(yamlResultsPath)
+	if err != nil {
+		return "", "", err
+	}
+	defer yamlFile.Close()
+
+	_, err = yamlFile.Write(yamlArns)
+	if err != nil {
+		return "", "", err
 	}
 
-	log.Printf("Lambda layer ARNs (%d total) are written to %s", len(layerArns), resultsPath)
+	log.Printf("Lambda layer ARNs (%d total) are written to %s and %s", len(layerArns), jsonResultsPath, yamlResultsPath)
 
-	return resultsPath, nil
+	return jsonResultsPath, yamlResultsPath, nil
 }
 
 func matchExistingLambdaLayer(layerName string, layerContents []byte, lambdaClient *lambdaiface.LambdaAPI) (bool, string, error) {

img2lambda/publish/publish_layers.go

@@ -11,6 +11,8 @@ import (
 	"strconv"
 	"testing"
 
+	yaml "gopkg.in/yaml.v2"
+
 	"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"
@@ -19,7 +21,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func parseResult(t *testing.T, resultsFilename string) []string {
+func parseJSONResult(t *testing.T, resultsFilename string) []string {
 	resultContents, err := ioutil.ReadFile(resultsFilename)
 	assert.Nil(t, err)
 	var resultArns []string
@@ -29,6 +31,16 @@ func parseResult(t *testing.T, resultsFilename string) []string {
 	return resultArns
 }
 
+func parseYAMLResult(t *testing.T, resultsFilename string) []string {
+	resultContents, err := ioutil.ReadFile(resultsFilename)
+	assert.Nil(t, err)
+	var resultArns []string
+	err = yaml.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)
@@ -205,10 +217,13 @@ func TestNoLayers(t *testing.T) {
 
 	layers := []types.LambdaLayer{}
 
-	resultsFilename, err := PublishLambdaLayers(opts, layers)
+	jsonResultsFilename, yamlResultsFilename, err := PublishLambdaLayers(opts, layers)
 	assert.Nil(t, err)
 
-	resultArns := parseResult(t, resultsFilename)
+	resultArns := parseJSONResult(t, jsonResultsFilename)
+	assert.Len(t, resultArns, 0)
+
+	resultArns = parseYAMLResult(t, yamlResultsFilename)
 	assert.Len(t, resultArns, 0)
 
 	os.Remove(dir)
@@ -236,10 +251,16 @@ func TestPublishSuccess(t *testing.T) {
 	mockPublishNoMatchingLayers(t, lambdaClient, 2)
 	mockMatchingLayer(t, lambdaClient, 3)
 
-	resultsFilename, err := PublishLambdaLayers(opts, layers)
+	jsonResultsFilename, yamlResultsFilename, err := PublishLambdaLayers(opts, layers)
 	assert.Nil(t, err)
 
-	resultArns := parseResult(t, resultsFilename)
+	resultArns := parseJSONResult(t, jsonResultsFilename)
+	assert.Len(t, resultArns, 3)
+	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])
+	assert.Equal(t, "arn:aws:lambda:us-east-2:123456789012:layer:example-layer-3:1", resultArns[2])
+
+	resultArns = parseYAMLResult(t, yamlResultsFilename)
 	assert.Len(t, resultArns, 3)
 	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])
@@ -287,9 +308,10 @@ func TestPublishError(t *testing.T) {
 		PublishLayerVersion(gomock.Eq(expectedInput1)).
 		Return(nil, errors.New("Access denied"))
 
-	resultsFilename, err := PublishLambdaLayers(opts, layers)
+	jsonResultsFilename, yamlResultsFilename, err := PublishLambdaLayers(opts, layers)
 	assert.Error(t, err)
-	assert.Equal(t, "", resultsFilename)
+	assert.Equal(t, "", jsonResultsFilename)
+	assert.Equal(t, "", yamlResultsFilename)
 
 	os.Remove(layers[0].File)
 	os.Remove(layers[1].File)