Support compatible runtimes (#11)

support other compatible runtimes other than 'provided'

Author: asahasrabuddhe

README.md

@@ -38,6 +38,8 @@ GLOBAL OPTIONS:
    --dry-run, -d                       Conduct a dry-run: Repackage the image, but only write the Lambda layers to local disk (do not publish to Lambda)
    --description value, --desc value   The description of this layer version (default: "created by img2lambda from image <name of the image>")
    --license-info value, -l value      The layer's software license. It can be an SPDX license identifier, the URL of the license hosted on the internet, or the full text of the license (default: no license)
+   --compatible-runtime value --compatible-runtime value,
+                --cr value --cr value  An AWS Lambda function runtime compatible with the image layers. To specify multiple runtimes, repeat the option: --cr provided --cr python2.7 (default: "provided" )
 
    --help, -h                          show help
 ```

img2lambda/cli/main.go

@@ -24,6 +24,9 @@ func createApp() (*cli.App, *types.CmdOptions) {
 	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 {
+		// parse and store the passed runtime list into the options object
+		opts.CompatibleRuntimes = c.StringSlice("cr")
+
 		validateCliOptions(&opts, c)
 		return repackImageAction(&opts)
 	}
@@ -66,6 +69,11 @@ func createApp() (*cli.App, *types.CmdOptions) {
 			Usage:       "The layer's software license. It can be an SPDX license identifier, the URL of the license hosted on the internet, or the full text of the license (default: \"no license\"",
 			Destination: &opts.LicenseInfo,
 		},
+		cli.StringSliceFlag{
+			Name:  "compatible-runtime, cr",
+			Usage: "An AWS Lambda function runtime compatible with the image layers. To specify multiple runtimes, repeat the option: --cr provided --cr python2.7 (default: \"provided\" )",
+			Value: &cli.StringSlice{},
+		},
 	}
 
 	app.Setup()
@@ -79,6 +87,13 @@ func validateCliOptions(opts *types.CmdOptions, context *cli.Context) {
 		fmt.Print("ERROR: Image name is required\n\n")
 		cli.ShowAppHelpAndExit(context, 1)
 	}
+
+	for _, runtime := range opts.CompatibleRuntimes {
+		if !types.ValidRuntimes.Contains(runtime) {
+			fmt.Println("ERROR: Compatible runtimes must be one of the supported runtimes\n\n", types.ValidRuntimes)
+			cli.ShowAppHelpAndExit(context, 1)
+		}
+	}
 }
 
 func repackImageAction(opts *types.CmdOptions) error {

img2lambda/publish/publish_layers.go

@@ -37,6 +37,10 @@ func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer)
 			licenseInfo = aws.String(opts.LicenseInfo)
 		}
 
+		if len(opts.CompatibleRuntimes) == 0 {
+			opts.CompatibleRuntimes = append(opts.CompatibleRuntimes, "provided")
+		}
+
 		layerContents, err := ioutil.ReadFile(layer.File)
 		if err != nil {
 			return "", err
@@ -52,7 +56,7 @@ func PublishLambdaLayers(opts *types.PublishOptions, layers []types.LambdaLayer)
 			log.Printf("Matched Lambda layer file %s (image layer %s) to existing Lambda layer: %s", layer.File, layer.Digest, existingArn)
 		} else {
 			publishArgs := &lambda.PublishLayerVersionInput{
-				CompatibleRuntimes: []*string{aws.String("provided")},
+				CompatibleRuntimes: aws.StringSlice(opts.CompatibleRuntimes),
 				Content:            &lambda.LayerVersionContentInput{ZipFile: layerContents},
 				Description:        layerDescription,
 				LayerName:          aws.String(layerName),

img2lambda/types/types.go

@@ -13,31 +13,66 @@ type LambdaLayer struct {
 }
 
 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
-	Description    string // Description of the current layer version
-	LicenseInfo    string // Layer's software license
+	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
+	Description        string   // Description of the current layer version
+	LicenseInfo        string   // Layer's software license
+	CompatibleRuntimes []string // A list of function runtimes compatible with the current layer
 }
 
 type PublishOptions struct {
-	LambdaClient    lambdaiface.LambdaAPI
-	LayerPrefix     string
-	ResultsDir      string
-	SourceImageName string
-	Description     string
-	LicenseInfo     string
+	LambdaClient       lambdaiface.LambdaAPI
+	LayerPrefix        string
+	ResultsDir         string
+	SourceImageName    string
+	Description        string
+	LicenseInfo        string
+	CompatibleRuntimes []string
 }
 
 func ConvertToPublishOptions(opts *CmdOptions) *PublishOptions {
 	return &PublishOptions{
-		SourceImageName: opts.Image,
-		LambdaClient:    clients.NewLambdaClient(opts.Region),
-		LayerPrefix:     opts.LayerNamespace,
-		ResultsDir:      opts.OutputDir,
-		Description:     opts.Description,
-		LicenseInfo:     opts.LicenseInfo,
+		SourceImageName:    opts.Image,
+		LambdaClient:       clients.NewLambdaClient(opts.Region),
+		LayerPrefix:        opts.LayerNamespace,
+		ResultsDir:         opts.OutputDir,
+		Description:        opts.Description,
+		LicenseInfo:        opts.LicenseInfo,
+		CompatibleRuntimes: opts.CompatibleRuntimes,
 	}
 }
+
+// valid aws lambda function runtimes
+type Runtimes []string
+
+// utility function to validate if a runtime is valid (supported by aws) or not
+func (r Runtimes) Contains(runtime string) bool {
+	for _, value := range r {
+		if value == runtime {
+			return true
+		}
+	}
+	return false
+}
+
+// a list of aws supported runtimes as of 26/01/2019
+var ValidRuntimes = Runtimes{
+	"nodejs",    // eol = 31/10/2016 but included to support existing versions
+	"nodejs4.3", // eol = 30/04/2018 but included to support existing versions
+	"nodejs6.10",
+	"nodejs8.10",
+	"java8",
+	"python2.7",
+	"python3.6",
+	"python3.7",
+	"dotnetcore1.0",
+	"dotnetcore2.0",
+	"dotnetcore2.1",
+	"nodejs4.3-edge", // eol = 30/04/2018 but included to support existing versions
+	"go1.x",
+	"ruby2.5",
+	"provided",
+}