feat: Pass internalSrcFolder and name to zisi (#4821)

* feat: pass internalSrcFolder to zisi and add test

* feat: pass functionconfig name and test it

* fix: kick CI

* test: also check internalSrcFolder path

* test: add .serial to fix tests

Author: khendrikse

packages/build/src/plugins_core/functions/zisi.js

@@ -23,8 +23,15 @@ export const getZisiParameters = ({
   const zisiFeatureFlags = getZisiFeatureFlags(featureFlags)
   // Only internal functions are allowed to have a json config file
   const configFileDirectories = [resolve(internalFunctionsSrc)]
-
-  return { basePath: buildDir, config, manifest, featureFlags: zisiFeatureFlags, repositoryRoot, configFileDirectories }
+  return {
+    basePath: buildDir,
+    config,
+    manifest,
+    featureFlags: zisiFeatureFlags,
+    repositoryRoot,
+    configFileDirectories,
+    internalSrcFolder: internalFunctionsSrc,
+  }
 }
 
 // The function configuration keys returned by @netlify/config are not an exact
@@ -33,6 +40,7 @@ export const getZisiParameters = ({
 export const normalizeFunctionConfig = ({ buildDir, functionConfig = {}, isRunningLocally, nodeVersion }) => ({
   externalNodeModules: functionConfig.external_node_modules,
   includedFiles: functionConfig.included_files,
+  name: functionConfig.name,
   includedFilesBasePath: buildDir,
   ignoredNodeModules: functionConfig.ignored_node_modules,
   nodeVersion,

packages/build/tests/core/fixtures/functions_display_name/.netlify/functions-internal/function_one.js

@@ -0,0 +1 @@
+export default true

packages/build/tests/core/fixtures/functions_display_name/.netlify/functions-internal/function_one.json

@@ -0,0 +1,4 @@
+{
+  "config": { "nodeBundler": "none", "name": "Function One" },
+  "version": 1
+}

packages/build/tests/core/fixtures/functions_display_name/.netlify/functions-internal/function_two.js

@@ -0,0 +1 @@
+export default true

packages/build/tests/core/fixtures/functions_internal_src_folder/.netlify/functions-internal/function_two.js

@@ -0,0 +1 @@
+export default true

packages/build/tests/core/fixtures/functions_internal_src_folder/.netlify/functions-internal/function_two.json

@@ -0,0 +1,4 @@
+{
+  "config": { "nodeBundler": "none" },
+  "version": 1
+}

packages/build/tests/core/fixtures/functions_internal_src_folder/netlify/functions/function_one.js

@@ -0,0 +1 @@
+export default true

packages/build/tests/core/fixtures/functions_internal_src_folder/netlify/functions/function_one.json

@@ -0,0 +1,4 @@
+{
+  "config": { "nodeBundler": "none" },
+  "version": 1
+}

packages/build/tests/core/tests.js

@@ -533,6 +533,39 @@ test.serial('configFileDirectories is passed to zip-it-and-ship-it', async (t) =
   ])
 })
 
+test.serial('internalSrcFolder is passed to zip-it-and-ship-it', async (t) => {
+  const zipItAndShipItSpy = sinon.spy(zipItAndShipIt, 'zipFunctions')
+
+  await new Fixture('./fixtures/functions_internal_src_folder').withFlags({ mode: 'buildbot' }).runWithBuild()
+  zipItAndShipItSpy.restore()
+  const { args: call1Args } = zipItAndShipItSpy.getCall(0)
+
+  const { internalSrcFolder, manifest } = call1Args[2]
+  const { functions } = await importJsonFile(manifest)
+
+  t.is(internalSrcFolder, join(FIXTURES_DIR, 'functions_internal_src_folder/.netlify/functions-internal'))
+  t.is(functions[0].isInternal, true)
+  t.is(functions[1].isInternal, false)
+})
+
+test.serial('functions can have a config with name passed to zip-it-and-ship-it', async (t) => {
+  const zipItAndShipItSpy = sinon.spy(zipItAndShipIt, 'zipFunctions')
+  await new Fixture('./fixtures/functions_display_name')
+    .withFlags({
+      mode: 'buildbot',
+      featureFlags: { project_deploy_configuration_api_use_per_function_configuration_files: true },
+    })
+    .runWithBuild()
+
+  zipItAndShipItSpy.restore()
+
+  const { args: call1Args } = zipItAndShipItSpy.getCall(0)
+  const { functions: functions } = await importJsonFile(call1Args[2].manifest)
+
+  t.is(functions[0].displayName, 'Function One')
+  t.is(functions[1].displayName, undefined)
+})
+
 test.serial('zip-it-and-ship-it runs without error when loading json config files', async (t) => {
   const output = await new Fixture('./fixtures/functions_config_json')
     .withFlags({