fix document and region bug (#62)

* fix document demo code indentation * sync region choices of fun config * add code packing log
alibaba · Jul 14, 2018 · ff8fab3 · ff8fab3
1 parent 9cea02f
commit ff8fab3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/docs/specs/2018-04-03-zh-cn.md b/docs/specs/2018-04-03-zh-cn.md
@@ -49,12 +49,12 @@ Resources:
         Handler: index.handler
         Runtime: nodejs6
         CodeUri: './' 
-        Events:
-            http-test: # trigger name
-                Type: HTTP # http trigger
-                Properties:
-                    AuthType: ANONYMOUS
-                    Methods: ['GET', 'POST', 'PUT']
+      Events:
+        http-test: # trigger name
+          Type: HTTP # http trigger
+          Properties:
+              AuthType: ANONYMOUS
+              Methods: ['GET', 'POST', 'PUT']
 ```
 
 阿里云 Fun 中的所有属性名称都**区分大小写**。

diff --git a/docs/specs/2018-04-03.md b/docs/specs/2018-04-03.md
@@ -49,12 +49,12 @@ Resources:
         Handler: index.handler
         Runtime: nodejs6
         CodeUri: './' 
-        Events:
-          http-test: # trigger name
+      Events:
+        http-test: # trigger name
           Type: HTTP # http trigger
           Properties:
-          AuthType: ANONYMOUS
-          Methods: ['GET', 'POST', 'PUT']
+            AuthType: ANONYMOUS
+            Methods: ['GET', 'POST', 'PUT']
 ```
 
 All property names in Aliyun Fun are **case sensitive**.

diff --git a/lib/commands/config.js b/lib/commands/config.js
@@ -40,8 +40,8 @@ async function config() {
       type: 'list',
       name: 'defaultRegion',
       message: 'Default region name',
-      choices: ['cn-beijing', 'cn-shanghai', 'cn-shenzhen', 'cn-hangzhou', 'cn-zhangjiakou', 'cn-hongkong',
-        'ap-southeast-1', 'ap-southeast-2'],
+      choices: ['cn-beijing', 'cn-hangzhou', 'cn-shanghai', 'cn-shenzhen' , 'cn-hongkong',
+        'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'eu-central-1'],
       default: profile.defaultRegion
     }
   ];

diff --git a/lib/deploy/deploy-support.js b/lib/deploy/deploy-support.js
@@ -274,7 +274,7 @@ async function getFunCodeAsBase64(codeUri) {
   } else {
     codeUri = './';
   }
-
+  
   return await zip.file(codeUri);
 }
 
@@ -316,9 +316,9 @@ async function makeFunction({
   if (codeUri && codeUri.startsWith('oss://')) {
     code = extractOssCodeUri(codeUri);
   } else {
-    debug(`package function ${functionName}.`);
+    console.log(`\t\tWaiting for packaging function ${functionName} code...`);
     const base64 = await getFunCodeAsBase64(codeUri);
-    debug(`package function ${functionName}. done.`);
+    console.log(green(`\t\tpackage function ${functionName} code done`));
 
     code = {
       zipFile: base64