Merge pull request #71 from aliyun/tanhehe/improve_some_user_experience

fix generated role contains invalid char bug
fix error message for invalid role
add php7.2 support
fix generating role bug with `_`
fix apigateway "RepeatedPathError: The specified path conflict with the API" bug

Author: tanhe123

lib/deploy/deploy-by-tpl.js

@@ -31,6 +31,9 @@ function extractFcRole(role) {
   return roleName;
 }
 
+function nomalizeRoleOrPoliceName(roleName) {
+  return roleName.replace(/_/g, '-');
+}
 
 async function deployFunction(serviceName, functionName, functionDefinition) {
   const properties = functionDefinition.Properties || {};
@@ -99,7 +102,7 @@ async function deployPolicy(serviceName, roleName, policy, curCount) {
 
   const profile = await getProfile();
 
-  const policyName = `AliyunFcGeneratedServicePolicy-${profile.defaultRegion}-${serviceName}${curCount}`;
+  const policyName = nomalizeRoleOrPoliceName(`AliyunFcGeneratedServicePolicy-${profile.defaultRegion}-${serviceName}${curCount}`);
 
   await makeAndAttachPolicy(policyName, policy, roleName);
 
@@ -133,10 +136,15 @@ async function deployFcService(serviceName, serviceDefinition) {
   const profile = await getProfile();
 
   if ( roleArn ) {
-    roleName = extractFcRole(roleArn);
+    try {
+      roleName = extractFcRole(roleArn);
+    } catch(ex) {
+      throw new Error('The role you provided is not correct. You must provide the correct role arn.');
+    }
     createRoleIfNotExist = false;
   } else {
     roleName = `aliyunfcgeneratedrole-${profile.defaultRegion}-${serviceName}`;
+    roleName = nomalizeRoleOrPoliceName(roleName);
     createRoleIfNotExist = true;
   }
 
@@ -152,7 +160,7 @@ async function deployFcService(serviceName, serviceDefinition) {
 
   if (logConfig.Logstore && logConfig.Project) {
     if (!roleArn) {
-      const logPolicyName = `AliyunFcGeneratedLogPolicy-${profile.defaultRegion}-${serviceName}`;
+      const logPolicyName = nomalizeRoleOrPoliceName(`AliyunFcGeneratedLogPolicy-${profile.defaultRegion}-${serviceName}`);
       await makeAndAttachPolicy(logPolicyName, {
         'Version': '1',
         'Statement': [

lib/deploy/deploy-support.js

@@ -235,7 +235,9 @@ async function makeService({serviceName,
     try {
       service = await fc.getService(serviceName);
     } catch (ex) {
-      if (ex.code !== 'ServiceNotFound') {
+      if (ex.code === 'AccessDenied') {
+        throw ex;
+      } else if (ex.code !== 'ServiceNotFound') {
         console.log(red(`\tretry ${times} times`));
         retry(ex);
       }
@@ -596,8 +598,13 @@ async function makeApi(group, {
         ApiName: apiName,
         GroupId: group.GroupId
       });
-    
-      var api = result.ApiSummarys && result.ApiSummarys.ApiSummary[0];
+      
+      var apiSummarys = result.ApiSummarys && result.ApiSummarys.ApiSummary;
+      var api;
+
+      if (apiSummarys) {
+        api = apiSummarys.find(summary => summary.ApiName === apiName);
+      }
 
       const requestParameters = parameters.map((item) => {
         return Object.assign(getDefaultRequestParameter(), item);

lib/ram.js

@@ -161,8 +161,12 @@ async function makeRole(roleName, createRoleIfNotExist, description='FunctionCom
         process.exit(-1);
       }
     } catch (ex) {
-      console.log(red(`retry ${times} times`));
-      retry(ex);
+      if (ex.code && ex.code.startsWith('InvalidParameter')) {
+        throw ex;
+      } else {
+        console.log(red(`retry ${times} times`));
+        retry(ex);
+      }
     }
   }, retryOptions);
 

lib/validate/schema/function.js

@@ -17,7 +17,7 @@ const functionSchema = {
         },
         'Runtime': {
           'type': 'string',
-          'enum': ['nodejs6', 'nodejs8', 'python2.7', 'python3', 'java8'],
+          'enum': ['nodejs6', 'nodejs8', 'python2.7', 'python3', 'java8', 'php7.2'],
         },
         'CodeUri': {
           'type': 'string'
@@ -56,4 +56,4 @@ const functionSchema = {
   },
   'required': ['Type'],
 };
-module.exports = functionSchema;
+module.exports = functionSchema;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/fun",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "description": "(have)Fun with Serverless",
   "engines": {
     "node": ">=8.0.0"