Merge pull request #426 from netlify/feat-415/pass-generator-with-functionconfig

feat: pass along generator to functionconfig

Author: khendrikse

go/models/function_config.go

@@ -755,9 +755,10 @@ func bundleFromManifest(ctx context.Context, manifestFile *os.File, observer Dep
 			})
 		}
 
-		if function.DisplayName != "" {
+		if function.DisplayName != "" || function.Generator != "" {
 			functionsConfig[file.Name] = models.FunctionConfig{
 				DisplayName: function.DisplayName,
+				Generator:   function.Generator,
 			}
 		}
 

go/porcelain/deploy.go

@@ -346,6 +346,7 @@ func TestBundleWithManifest(t *testing.T) {
 				"runtime": "a-runtime",
 				"mainFile": "/some/path/hello-js-function-test.js",
 				"displayName": "Hello Javascript Function",
+				"generator": "@netlify/[email protected]",
 				"name": "hello-js-function-test",
 				"schedule": "* * * * *"
 			},
@@ -376,6 +377,7 @@ func TestBundleWithManifest(t *testing.T) {
 
 	assert.Equal(t, 1, len(functionsConfig))
 	assert.Equal(t, "Hello Javascript Function", functionsConfig["hello-js-function-test"].DisplayName)
+	assert.Equal(t, "@netlify/[email protected]", functionsConfig["hello-js-function-test"].Generator)
 }
 
 func TestReadZipRuntime(t *testing.T) {

go/porcelain/deploy_test.go

@@ -7,10 +7,11 @@ type functionsManifest struct {
 }
 
 type functionsManifestEntry struct {
-	MainFile string `json:"mainFile"`
-	Name     string `json:"name"`
-	Path     string `json:"path"`
-	Runtime  string `json:"runtime"`
-	Schedule string `json:"schedule"`
+	MainFile    string `json:"mainFile"`
+	Name        string `json:"name"`
+	Path        string `json:"path"`
+	Runtime     string `json:"runtime"`
+	Schedule    string `json:"schedule"`
 	DisplayName string `json:"displayName"`
+	Generator   string `json:"generator"`
 }

go/porcelain/functions_manifest.go

@@ -3576,6 +3576,8 @@ definitions:
     properties:
       display_name:
         type: string
+      generator:
+        type: string
 parameters:
   page:
     type: integer