fix: function name regex

serverless-components · Aug 14, 2020 · 53a4078 · 53a4078
1 parent 45e62fc
commit 53a4078
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/serverless.component.yml b/serverless.component.yml
@@ -1,5 +1,5 @@
 name: scf
-version: 0.1.0
+version: 0.1.2
 author: Tencent Cloud, Inc.
 org: Tencent Cloud, Inc.
 description: Deploy a serverless cloud function on Tencent Cloud.
@@ -21,7 +21,7 @@ actions:
       name:
         type: string
         description: The name of Tencent SCF function.
-        regex: '^[a-z][a-z0-9\-]{0,61}[A-Za-z0-9]$'
+        regex: '^[A-Za-z][\w-_]{0,58}[A-Za-z0-9]$'
       handler:
         type: string
         default: 'index.main_handler'

diff --git a/src/serverless.js b/src/serverless.js
@@ -90,11 +90,21 @@ class ServerlessComponent extends Component {
         if (apigwTrigger.serviceId) {
           stateApigw[apigwTrigger.serviceName] = apigwTrigger.serviceId
           apigwTrigger.apiList.forEach((endpoint) => {
-            triggers['apigw'].push(
-              `${this.getDefaultProtocol(apigwTrigger.protocols)}://${apigwTrigger.subDomain}/${
-                apigwTrigger.environment
-              }${endpoint.path}`
-            )
+            if (typeof apigwTrigger.subDomain !== 'string') {
+              apigwTrigger.subDomain.forEach((item) => {
+                triggers['apigw'].push(
+                  `${this.getDefaultProtocol(apigwTrigger.protocols)}://${item}/${
+                    apigwTrigger.environment
+                  }${endpoint.path}`
+                )
+              })
+            } else {
+              triggers['apigw'].push(
+                `${this.getDefaultProtocol(apigwTrigger.protocols)}://${apigwTrigger.subDomain}/${
+                  apigwTrigger.environment
+                }${endpoint.path}`
+              )
+            }
           })
         }
       })