fix: config apigw id bug

serverless-components · Apr 28, 2021 · 754c5fc · 754c5fc
1 parent f296b08
commit 754c5fc
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/serverless.component.yml b/serverless.component.yml
@@ -1,5 +1,5 @@
 name: wordpress
-version: 0.2.0
+version: 0.2.1
 author: Tencent Cloud, Inc.
 org: Tencent Cloud, Inc.
 description: Deploy a serverless wordpress.js application on Tencent SCF and API Gateway.

diff --git a/src/fixtures/faas/wp-init.zip b/src/fixtures/faas/wp-init.zip
diff --git a/src/fixtures/faas/wp-init/sl_handler.js b/src/fixtures/faas/wp-init/sl_handler.js
@@ -51,6 +51,7 @@ async function handler(event, context) {
 
   const syncDBStatus = await syncDatabase()
   if (!syncDBStatus) {
+    response.reason = '[Serverless DB Error]: Intialize failed.'
     return response
   }
 

diff --git a/src/serverless.js b/src/serverless.js
@@ -334,7 +334,7 @@ class ServerlessComponent extends Component {
 
     // 8. 创建 API 网关
     if (inputs.apigw) {
-      inputs.apigw.name = `${CONFIGS.apigw.name}-${uuid}`
+      inputs.apigw.name = `${CONFIGS.apigw.name}_${uuid}`
       inputs.apigw.faas = {
         name: wpServerOutput.name,
         namespace: wpServerOutput.namespace

diff --git a/src/utils/sdk.js b/src/utils/sdk.js
@@ -137,7 +137,10 @@ async function invokeFaas({ instance, inputs, name, namespace, parameters }) {
   try {
     return JSON.parse(Result.RetMsg)
   } catch (e) {
-    return {}
+    return {
+      status: false,
+      reason: e.message
+    }
   }
 }
 
@@ -171,12 +174,13 @@ async function deployApigw({ instance, inputs, state = {} }) {
   }
 
   const apigw = new Apigw(__TmpCredentials, region)
-
+  const serviceId = inputApigw.id || (state && state.id)
   const sdkInput = Object.assign(inputApigw, {
     isDisabled: inputApigw.isDisabled === true,
     protocols: inputApigw.protocols || DEFAULT_CONFIGS.protocols,
     environment: inputApigw.environment || DEFAULT_CONFIGS.environment,
-    serviceId: inputApigw.id || (state && state.id),
+    serviceId: serviceId,
+    isInputServiceId: !!serviceId,
     serviceName: inputApigw.name || DEFAULT_CONFIGS.name,
     serviceDesc: inputApigw.description || CONFIGS.description,
     endpoints: [