fix: select platform

midwayjs · Dec 13, 2019 · a2bee29 · a2bee29
1 parent c2e2a60
commit a2bee29
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/packages/serverless-midway-plugin/src/core/main.ts b/packages/serverless-midway-plugin/src/core/main.ts
@@ -24,7 +24,13 @@ export class MidwayServerless {
 
     if (!this.serverless.service.provider.name || this.options.platform) {
       let platform = this.options.platform;
-      if (this.options.platform === true) {
+      let needSelectPlatform = false;
+      if (!this.serverless.service.provider.name) { // 未标明哪个平台
+        needSelectPlatform = true;
+      } else if (this.options.platform === true) { // 使用 --platform
+        needSelectPlatform = true;
+      }
+      if (needSelectPlatform) {
         const prompt = new Select({
           name: 'provider',
           message: 'Which platform do you want to use?',
@@ -33,10 +39,12 @@ export class MidwayServerless {
         const answers = await prompt.run();
         platform = answers.split(' ')[1];
       }
-      serviceyml.provider.name = platform;
-      this.serverless.service.provider.name = platform;
-      this.serverless.pluginManager.serverlessConfigFile.provider.name = platform;
-      saveYaml(yamlFile, serviceyml);
+      if (typeof platform === 'string') {
+        serviceyml.provider.name = platform;
+        this.serverless.service.provider.name = platform;
+        this.serverless.pluginManager.serverlessConfigFile.provider.name = platform;
+        saveYaml(yamlFile, serviceyml);
+      }
     }
 
     coverAttributes.forEach((attr: string) => {

diff --git a/packages/serverless-midway-plugin/test/invokeAliyun/serverless.yml b/packages/serverless-midway-plugin/test/invokeAliyun/serverless.yml
@@ -1,8 +1,3 @@
-service: serverless-midway-test
-
-provider:
-  name: aliyun
-  runtime: nodejs8
 
 functions:
   index:
@@ -17,16 +12,18 @@ functions:
     events:
       - http:
           method: get
-
-plugins:
-  - test
-
 package:
-  include:
+  include: null
   exclude:
     - src/**
     - tsconfig.json
     - test/**
     - ./*.zip
   excludeDevDependencies: false
-  artifact: path/to/my-artifact.zip # Own package that should be used. You must provide this file.
+  artifact: path/to/my-artifact.zip
+plugins:
+  - test
+provider:
+  name: aliyun
+service:
+  name: serverless-midway-test