Merge pull request #509 from netlify/al2-uploads-need-different-shas

fix: al2 uploads need to have function name in SHA

Author: Skn0tt

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

@@ -981,8 +981,13 @@ func createHeader(archive *zip.Writer, i os.FileInfo, runtime string) (io.Writer
 		return archive.CreateHeader(&zip.FileHeader{
 			CreatorVersion: 3 << 8,     // indicates Unix
 			ExternalAttrs:  0777 << 16, // -rwxrwxrwx file permissions
-			Name:           "bootstrap",
-			Method:         zip.Deflate,
+
+			// we need to make sure we don't have two ZIP files with the exact same contents - otherwise, our upload deduplication mechanism will do weird things.
+			// adding in the function name as a comment ensures that every function ZIP is unique
+			Comment: i.Name(),
+
+			Name:   "bootstrap",
+			Method: zip.Deflate,
 		})
 	}
 	return archive.Create(i.Name())

go/porcelain/deploy.go

@@ -612,19 +612,23 @@ func TestBundle(t *testing.T) {
 	functions, schedules, functionsConfig, err := bundle(gocontext.Background(), "../internal/data", mockObserver{})
 
 	assert.Nil(t, err)
-	assert.Equal(t, 4, len(functions.Files))
+	assert.Equal(t, 5, 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"]
+	goBackgroundFunction := functions.Files["hello-go-binary-function-background"]
 
 	assert.Equal(t, "js", jsFunction.Runtime)
 	assert.Equal(t, "py", pyFunction.Runtime)
 	assert.Equal(t, "rs", rsFunction.Runtime)
 	assert.Equal(t, "provided.al2", goFunction.Runtime)
+	assert.Equal(t, "provided.al2", goBackgroundFunction.Runtime)
+
+	assert.NotEqual(t, goFunction.Sum, goBackgroundFunction.Sum)
 }
 
 func TestBundleWithManifest(t *testing.T) {