Merge pull request #490 from netlify/golang-al2

feat: upload go binaries as al2-compatible zip

Author: Skn0tt

go/internal/data/hello-go-binary-function

@@ -15,6 +15,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"sync"
@@ -31,8 +32,9 @@ import (
 )
 
 const (
-	jsRuntime = "js"
-	goRuntime = "go"
+	jsRuntime    = "js"
+	goRuntime    = "go"
+	amazonLinux2 = "provided.al2"
 
 	preProcessingTimeout = time.Minute * 5
 
@@ -933,7 +935,7 @@ func jsFile(i os.FileInfo) bool {
 func goFile(filePath string, i os.FileInfo, observer DeployObserver) bool {
 	warner, hasWarner := observer.(DeployWarner)
 
-	if m := i.Mode(); m&0111 == 0 { // check if it's an executable file
+	if m := i.Mode(); m&0111 == 0 && runtime.GOOS != "windows" { // check if it's an executable file. skip on windows, since it doesn't have that mode
 		if hasWarner {
 			warner.OnWalkWarning(filePath, "Go binary does not have executable permissions")
 		}
@@ -980,6 +982,13 @@ func createHeader(archive *zip.Writer, i os.FileInfo, runtime string) (io.Writer
 			Name:           i.Name(),
 			Method:         zip.Deflate,
 		})
+	} else if runtime == amazonLinux2 {
+		return archive.CreateHeader(&zip.FileHeader{
+			CreatorVersion: 3 << 8,     // indicates Unix
+			ExternalAttrs:  0777 << 16, // -rwxrwxrwx file permissions
+			Name:           "bootstrap",
+			Method:         zip.Deflate,
+		})
 	}
 	return archive.Create(i.Name())
 }

go/porcelain/deploy.go

@@ -612,24 +612,27 @@ func TestBundle(t *testing.T) {
 	functions, schedules, functionsConfig, err := bundle(gocontext.Background(), "../internal/data", mockObserver{})
 
 	assert.Nil(t, err)
-	assert.Equal(t, 3, len(functions.Files))
+	assert.Equal(t, 4, len(functions.Files))
 	assert.Empty(t, schedules)
 	assert.Nil(t, functionsConfig)
 
 	jsFunction := functions.Files["hello-js-function-test"]
 	pyFunction := functions.Files["hello-py-function-test"]
 	rsFunction := functions.Files["hello-rs-function-test"]
+	goFunction := functions.Files["hello-go-binary-function"]
 
 	assert.Equal(t, "js", jsFunction.Runtime)
 	assert.Equal(t, "py", pyFunction.Runtime)
 	assert.Equal(t, "rs", rsFunction.Runtime)
+	assert.Equal(t, "go", goFunction.Runtime)
 }
 
 func TestBundleWithManifest(t *testing.T) {
 	cwd, _ := os.Getwd()
 	basePath := path.Join(filepath.Dir(cwd), "internal", "data")
 	jsFunctionPath := strings.Replace(filepath.Join(basePath, "hello-js-function-test.zip"), "\\", "/", -1)
 	pyFunctionPath := strings.Replace(filepath.Join(basePath, "hello-py-function-test.zip"), "\\", "/", -1)
+	goFunctionPath := strings.Replace(filepath.Join(basePath, "hello-go-binary-function"), "\\", "/", -1)
 	manifestPath := path.Join(basePath, "manifest.json")
 	manifestFile := fmt.Sprintf(`{
 		"functions": [
@@ -660,10 +663,16 @@ func TestBundleWithManifest(t *testing.T) {
 				"mainFile": "/some/path/hello-py-function-test",
 				"name": "hello-py-function-test",
 				"invocationMode": "stream"
+			},	
+			{
+				"path": "%s",
+				"runtime": "go",
+				"runtimeVersion": "provided.al2",
+				"name": "hello-go-binary-function"
 			}
 		],
 		"version": 1
-	}`, jsFunctionPath, pyFunctionPath)
+	}`, jsFunctionPath, pyFunctionPath, goFunctionPath)
 
 	err := ioutil.WriteFile(manifestPath, []byte(manifestFile), 0644)
 	defer os.Remove(manifestPath)
@@ -676,11 +685,13 @@ func TestBundleWithManifest(t *testing.T) {
 	assert.Equal(t, "hello-js-function-test", schedules[0].Name)
 	assert.Equal(t, "* * * * *", schedules[0].Cron)
 
-	assert.Equal(t, 2, len(functions.Files))
+	assert.Equal(t, 3, len(functions.Files))
 	assert.Equal(t, "a-runtime", functions.Files["hello-js-function-test"].Runtime)
 	assert.Empty(t, functions.Files["hello-js-function-test"].FunctionMetadata.InvocationMode)
 	assert.Equal(t, "some-other-runtime", functions.Files["hello-py-function-test"].Runtime)
 	assert.Equal(t, "stream", functions.Files["hello-py-function-test"].FunctionMetadata.InvocationMode)
+	assert.Equal(t, "provided.al2", functions.Files["hello-go-binary-function"].Runtime)
+	assert.Empty(t, functions.Files["hello-go-binary-function"].FunctionMetadata.InvocationMode)
 
 	helloJSConfig := functionsConfig["hello-js-function-test"]