Merge pull request #23 from devsapp/dev

fix: fix auto vpc config missing problem
devsapp · May 28, 2021 · 9383d10 · 9383d10
2 parents 7b3f760 + de9f05f
commit 9383d10
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/dist/lib/fc/service.js b/dist/lib/fc/service.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fc-delpoy",
   "main": "./dist/index.js",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "dependencies": {
     "@serverless-devs/core": "^0.0.x",
     "@types/lodash": "^4.14.168",

diff --git a/publish.yaml b/publish.yaml
@@ -2,7 +2,7 @@ Type: Component
 Name: fc-deploy
 Provider:
   - 阿里云
-Version: 0.0.15
+Version: 0.0.16
 Description: 阿里云函数计算基础组件
 HomePage: https://github.com/devsapp/fc-base
 Tags:

diff --git a/src/lib/fc/service.ts b/src/lib/fc/service.ts
@@ -72,9 +72,9 @@ export class FcService extends FcDeploy<ServiceConfig> {
       isAutoConfig(this.localConfig.nasConfig) ||
       isAutoConfig(this.localConfig.vpcConfig) ||
       (_.isEmpty(this.localConfig.role) && !_.isEmpty(resolvedConfigInState.role))) {
-      this.localConfig.logConfig = isAutoConfig(this.localConfig.logConfig) ? resolvedConfigInState.logConfig : this.localConfig.logConfig;
-      this.localConfig.nasConfig = isAutoConfig(this.localConfig.nasConfig) ? resolvedConfigInState.nasConfig : this.localConfig.nasConfig;
-      this.localConfig.vpcConfig = isAutoConfig(this.localConfig.vpcConfig) ? resolvedConfigInState.vpcConfig : this.localConfig.vpcConfig;
+      this.localConfig.logConfig = (isAutoConfig(this.localConfig.logConfig) && !_.isEmpty(resolvedConfigInState.logConfig)) ? resolvedConfigInState.logConfig : this.localConfig.logConfig;
+      this.localConfig.nasConfig = (isAutoConfig(this.localConfig.nasConfig) && !_.isEmpty(resolvedConfigInState.nasConfig)) ? resolvedConfigInState.nasConfig : this.localConfig.nasConfig;
+      this.localConfig.vpcConfig = (isAutoConfig(this.localConfig.vpcConfig) && !_.isEmpty(resolvedConfigInState.vpcConfig)) ? resolvedConfigInState.vpcConfig : this.localConfig.vpcConfig;
       this.localConfig.role = (_.isEmpty(this.localConfig.role) && !_.isEmpty(resolvedConfigInState.role)) ? resolvedConfigInState.role : this.localConfig.role;
     }