fix #70: SLS support for include files in serverless.yml (#71)

Author: ServerlessLife

.vscode/launch.json

@@ -200,6 +200,17 @@
       "console": "integratedTerminal",
       "type": "node",
       "cwd": "${workspaceRoot}/test/cdk-config"
+    },
+    {
+      "name": "SLS deploy",
+      "type": "node",
+      "request": "launch",
+      "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/sls",
+      "runtimeArgs": ["deploy"],
+      "console": "integratedTerminal",
+      "skipFiles": ["<node_internals>/**"],
+      "env": {},
+      "cwd": "${workspaceRoot}/test/sls-basic"
     }
   ]
 }

src/frameworks/slsFramework.ts

@@ -58,6 +58,9 @@ export class SlsFramework implements IFramework {
 
     let resolveConfigurationPath: any;
     let readConfiguration: any;
+    let resolveVariables: any;
+    let resolveVariablesMeta: any;
+    let sources: any;
     let Serverless: any;
 
     try {
@@ -74,6 +77,51 @@ export class SlsFramework implements IFramework {
           'serverless/lib/configuration/read.js'
         )
       ).default;
+      resolveVariables = (
+        await import(
+          //@ts-ignore
+          'serverless/lib/configuration/variables/resolve.js'
+        )
+      ).default;
+      resolveVariablesMeta = (
+        await import(
+          //@ts-ignore
+          'serverless/lib/configuration/variables/resolve-meta.js'
+        )
+      ).default;
+      const env = await import(
+        //@ts-ignore
+        'serverless/lib/configuration/variables/sources/env.js'
+      );
+      const file = await import(
+        //@ts-ignore
+        'serverless/lib/configuration/variables/sources/file.js'
+      );
+      const opt = await import(
+        //@ts-ignore
+        'serverless/lib/configuration/variables/sources/opt.js'
+      );
+      const self = await import(
+        //@ts-ignore
+        'serverless/lib/configuration/variables/sources/self.js'
+      );
+      const strToBool = await import(
+        //@ts-ignore
+        'serverless/lib/configuration/variables/sources/str-to-bool.js'
+      );
+      const sls = await import(
+        //@ts-ignores
+        'serverless/lib/configuration/variables/sources/instance-dependent/get-sls.js'
+      );
+
+      sources = {
+        env: env.default,
+        file: file.default,
+        opt: opt.default,
+        self: self.default,
+        strToBool: strToBool.default,
+        sls: sls.default(),
+      };
 
       Serverless = (await import('serverless')).default;
     } catch (error: any) {
@@ -118,8 +166,16 @@ export class SlsFramework implements IFramework {
       options.profile = config.profile;
     }
 
-    const variablesMeta = {};
+    const variablesMeta = resolveVariablesMeta(configuration);
 
+    await resolveVariables({
+      serviceDir,
+      configuration,
+      variablesMeta,
+      sources,
+      options,
+      fulfilledSources: new Set(),
+    });
     let serverless: Serverless;
 
     try {

test/sls-basic/functions1.yml

@@ -0,0 +1,2 @@
+testJsEsModule:
+  handler: services/testJsEsModule/lambda.lambdaHandler

test/sls-basic/functions2.yml

@@ -0,0 +1,2 @@
+testJsCommonJs:
+  handler: services/testJsCommonJs/lambda.lambdaHandler

test/sls-basic/serverless.yml

@@ -7,8 +7,5 @@ provider:
   region: eu-west-1
 
 functions:
-  testJsCommonJs:
-    handler: services/testJsCommonJs/lambda.lambdaHandler
-
-  testJsEsModule:
-    handler: services/testJsEsModule/lambda.lambdaHandler
+  - ${file(./functions1.yml)}
+  - ${file(./functions2.yml)}