feat: support custom entry file

Author: yugasun

serverless.component.yml

@@ -1,5 +1,5 @@
 name: koa
-version: 0.1.0
+version: 0.2.0
 author: 'Tencent Cloud, Inc.'
 org: 'Tencent Cloud, Inc.'
 description: Deploy a serverless Koa.js application onto Tencent SCF and API Gateway.

src/_shims/handler.js

@@ -3,15 +3,15 @@ const path = require('path')
 const { createServer, proxy } = require('tencent-serverless-http')
 
 let server
+let app
 
 exports.handler = async (event, context) => {
-  const userSls = path.join(__dirname, '..', 'sls.js')
-  let app
+  const userSls = path.join(__dirname, '..', process.env.SLS_ENTRY_FILE)
   if (fs.existsSync(userSls)) {
-    // load the user provided app
+    // eslint-disable-next-line
+    console.log(`Using user custom entry file ${process.env.SLS_ENTRY_FILE}`)
     app = require(userSls)
   } else {
-    // load the built-in default app
     app = require('./sls.js')
   }
 

src/config.js

@@ -2,6 +2,7 @@ const CONFIGS = {
   templateUrl: 'https://serverless-templates-1300862921.cos.ap-beijing.myqcloud.com/koa-demo.zip',
   compName: 'koa',
   compFullname: 'Koa.js',
+  defaultEntryFile: 'sls.js',
   handler: 'sl_handler.handler',
   runtime: 'Nodejs10.15',
   timeout: 3,

src/utils.js

@@ -239,10 +239,21 @@ const prepareInputs = async (instance, credentials, inputs = {}) => {
   functionConf.needSetTraffic = inputs.traffic !== undefined && functionConf.lastVersion
 
   if (tempFunctionConf.environment) {
-    functionConf.environment = inputs.functionConf.environment
+    functionConf.environment = tempFunctionConf.environment
+    functionConf.environment.variables = functionConf.environment.variables || {}
+    functionConf.environment.variables.SERVERLESS = '1'
+    functionConf.environment.variables.SLS_ENTRY_FILE = inputs.entryFile || CONFIGS.defaultEntryFile
+  } else {
+    functionConf.environment = {
+      variables: {
+        SERVERLESS: '1',
+        SLS_ENTRY_FILE: inputs.entryFile || CONFIGS.defaultEntryFile
+      }
+    }
   }
+
   if (tempFunctionConf.vpcConfig) {
-    functionConf.vpcConfig = inputs.functionConf.vpcConfig
+    functionConf.vpcConfig = tempFunctionConf.vpcConfig
   }
 
   // 对apigw inputs进行标准化
@@ -257,19 +268,22 @@ const prepareInputs = async (instance, credentials, inputs = {}) => {
     isDisabled: tempApigwConf.isDisabled === true,
     fromClientRemark: fromClientRemark,
     serviceName: inputs.serviceName || getDefaultServiceName(instance),
-    description: getDefaultServiceDescription(instance),
+    description: tempApigwConf.description || getDefaultServiceDescription(instance),
     protocols: tempApigwConf.protocols || ['http'],
     environment: tempApigwConf.environment ? tempApigwConf.environment : 'release',
     endpoints: [
       {
-        path: '/',
+        path: tempApigwConf.path || '/',
         enableCORS: tempApigwConf.enableCORS,
         serviceTimeout: tempApigwConf.serviceTimeout,
         method: 'ANY',
+        apiName: tempApigwConf.apiName || 'index',
         function: {
           isIntegratedResponse: true,
           functionName: functionConf.name,
-          functionNamespace: functionConf.namespace
+          functionNamespace: functionConf.namespace,
+          functionQualifier:
+            (tempApigwConf.function && tempApigwConf.function.functionQualifier) || '$LATEST'
         }
       }
     ],