Merge pull request #73 from devsapp/develop

Develop
devsapp · Sep 6, 2022 · 759d6e0 · 759d6e0
2 parents 0aefadb + c1120b0
commit 759d6e0
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 127 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/index.ts b/src/index.ts
@@ -71,6 +71,11 @@ export default class SaeComponent {
       logger.error(`${error.result.Message}`);
       return;
     }
+    if(lodash.isEmpty(orderId)){
+      vm.stop();
+      logger.success('replicas无变动');
+      return;
+    }
     // 检查状态
     vm.text = `应用扩缩容${appName}...` + getLink(orderId);
     await utils.getStatusByOrderId(orderId);

diff --git a/src/lib/help/deploy.ts b/src/lib/help/deploy.ts
@@ -20,7 +20,7 @@ export const DEPLOY = [
     },
     {
         header: 'Document',
-        content: 'https://github.com/devsapp/sae/blob/main/docs/command/deploy.md',
+        content: 'https://github.com/devsapp/sae/blob/master/docs/deploy.md',
     },
     {
         header: 'Usage',

diff --git a/src/lib/help/info.ts b/src/lib/help/info.ts
@@ -14,7 +14,7 @@ export const INFO = [
     },
     {
         header: 'Document',
-        content: 'https://github.com/devsapp/sae/blob/main/docs/command/info.md',
+        content: 'https://github.com/devsapp/sae/blob/master/docs/info.md',
     },
     {
         header: 'Usage',

diff --git a/src/lib/help/remove.ts b/src/lib/help/remove.ts
@@ -7,7 +7,7 @@ export const REMOVE = [
     },
     {
         header: 'Document',
-        content: 'https://github.com/devsapp/sae/blob/main/docs/command/remove.md',
+        content: 'https://github.com/devsapp/sae/blob/master/docs/remove.md',
     },
     {
         header: 'Usage',

diff --git a/src/lib/help/rescale.ts b/src/lib/help/rescale.ts
@@ -11,7 +11,7 @@ export const RESCALE = [
     },
     {
         header: 'Document',
-        content: 'https://github.com/devsapp/sae/blob/main/docs/command/rescale.md',
+        content: 'https://github.com/devsapp/sae/blob/master/docs/rescale.md',
     },
     {
         header: 'Usage',

diff --git a/src/lib/help/start.ts b/src/lib/help/start.ts
@@ -7,7 +7,7 @@ export const START = [
     },
     {
         header: 'Document',
-        content: 'https://github.com/devsapp/sae/blob/main/docs/command/start.md',
+        content: 'https://github.com/devsapp/sae/blob/master/docs/start.md',
     },
     {
         header: 'Usage',

diff --git a/src/lib/help/stop.ts b/src/lib/help/stop.ts
@@ -7,7 +7,7 @@ export const STOP = [
     },
     {
         header: 'Document',
-        content: 'https://github.com/devsapp/sae/blob/main/docs/command/stop.md',
+        content: 'https://github.com/devsapp/sae/blob/master/docs/stop.md',
     },
     {
         header: 'Usage',

diff --git a/src/lib/help/sync.ts b/src/lib/help/sync.ts
@@ -7,7 +7,7 @@ export const SYNC = [
     },
     {
         header: 'Document',
-        content: 'https://github.com/devsapp/sae/blob/main/docs/command/sync.md',
+        content: 'https://github.com/devsapp/sae/blob/master/docs/sync.md',
     },
     {
         header: 'Usage',

diff --git a/src/lib/input-handler.ts b/src/lib/input-handler.ts
@@ -109,9 +109,6 @@ export async function handlerReScaleInputs(args: string, application: any) {
         namespaceId = data['namespace-id'];
         region = data['region'];
     }
-    if (lodash.isEmpty(replicas)) {
-        throw new core.CatchableError('未指定replicas参数')
-    }
 
     if (lodash.isEmpty(appName)) {
         appName = application?.appName;
@@ -122,14 +119,20 @@ export async function handlerReScaleInputs(args: string, application: any) {
     if (lodash.isEmpty(region)) {
         region = application?.region;
     }
+    if (!replicas) {
+        replicas = application?.replicas;
+    }
     if (!isHelp) {
+        if (!replicas) {
+            throw new core.CatchableError('未指定replicas参数')
+        }
         if (lodash.isEmpty(appName)) {
             throw new core.CatchableError('参数 application-name 不能为空');
         }
         if (lodash.isEmpty(region)) {
             throw new core.CatchableError('参数 region 不能为空');
         }
-        if (!isHelp && !(Number.isInteger(replicas) && replicas > 0)) {
+        if ( !(Number.isInteger(replicas) && replicas > 0)) {
             throw new core.CatchableError('需要指定正确的replicas参数')
         }
     }