diff --git a/dist/lib/fc/service.js b/dist/lib/fc/service.js index f41c33d..9c5e139 100644 --- a/dist/lib/fc/service.js +++ b/dist/lib/fc/service.js @@ -148,9 +148,9 @@ var FcService = /** @class */ (function (_super) { definition_1.isAutoConfig(this.localConfig.nasConfig) || definition_1.isAutoConfig(this.localConfig.vpcConfig) || (_.isEmpty(this.localConfig.role) && !_.isEmpty(resolvedConfigInState.role))) { - this.localConfig.logConfig = definition_1.isAutoConfig(this.localConfig.logConfig) ? resolvedConfigInState.logConfig : this.localConfig.logConfig; - this.localConfig.nasConfig = definition_1.isAutoConfig(this.localConfig.nasConfig) ? resolvedConfigInState.nasConfig : this.localConfig.nasConfig; - this.localConfig.vpcConfig = definition_1.isAutoConfig(this.localConfig.vpcConfig) ? resolvedConfigInState.vpcConfig : this.localConfig.vpcConfig; + this.localConfig.logConfig = (definition_1.isAutoConfig(this.localConfig.logConfig) && !_.isEmpty(resolvedConfigInState.logConfig)) ? resolvedConfigInState.logConfig : this.localConfig.logConfig; + this.localConfig.nasConfig = (definition_1.isAutoConfig(this.localConfig.nasConfig) && !_.isEmpty(resolvedConfigInState.nasConfig)) ? resolvedConfigInState.nasConfig : this.localConfig.nasConfig; + this.localConfig.vpcConfig = (definition_1.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; } if (this.existOnline) { @@ -423,4 +423,4 @@ var FcService = /** @class */ (function (_super) { return FcService; }(fc_deploy_1.default)); exports.FcService = FcService; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/lib/fc/service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uCAAyD;AACzD,uCAAwJ;AACxJ,uCAAyD;AACzD,uCAAyD;AACzD,wDAA4C;AAC5C,wCAA4B;AAC5B,oCAAkD;AAElD,0DAAmC;AACnC,4CAA6C;AAC7C,0DAA8C;AAa9C;IAA+B,6BAAuB;IAMpD,mBAAY,WAA0B,EAAE,YAA4B,EAAE,iBAAoC,EAAE,MAAc,EAAE,WAAyB,EAAE,OAAgB,EAAE,IAAa;QAAtL,YACE,kBAAM,WAAW,EAAE,iBAAiB,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,SAK1E;QAJC,KAAI,CAAC,wBAAwB,GAAG,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,uBAAuB,CAAC,CAAC;QAC7E,KAAI,CAAC,sBAAsB,GAAG,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;QACxE,KAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,KAAI,CAAC,IAAI,GAAG,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAC;;IAChC,CAAC;IAEK,wBAAI,GAAV;;;;;wBACE,IAAI,CAAC,cAAc,EAAE,CAAC;wBACtB,qBAAM,IAAI,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAA;;wBAAjD,SAAiD,CAAC;wBAClD,qBAAM,IAAI,CAAC,eAAe,EAAE,EAAA;;wBAA5B,SAA4B,CAAC;wBAC7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,8BAA4B,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,EAAE,IAAI,CAAC,iBAAc,CAAC,CAAC;;;;;KAC3G;IAED,8BAAU,GAAV;QACE,OAAU,IAAI,CAAC,WAAW,CAAC,SAAS,SAAI,IAAI,CAAC,MAAM,SAAI,IAAI,CAAC,IAAM,CAAC;IACrE,CAAC;IAGD,kCAAc,GAAd;QACE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;IACH,CAAC;IAEK,mCAAe,GAArB;;;;;;wBACQ,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;;;;wBAGxB,qBAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAA;;wBAApC,KAAK,GAAG,SAA4B,CAAC;;;;wBAErC,IAAI,GAAC,CAAC,OAAO,KAAK,iCAAiC,EAAE;4BACnD,MAAM,GAAC,CAAC;yBACT;;;wBAGH,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAiB,OAAO,cAAS,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAG,CAAC,CAAC;wBACxF,IAAI,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;4BAAE,sBAAO;yBAAE;wBAC3B,qBAAqB,GAAQ,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,KAAI,EAAE,CAAC;wBAC/D,IAAI,yBAAY,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;4BAC1C,yBAAY,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;4BACxC,yBAAY,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;4BACxC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,EAAE;4BAC9E,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,yBAAY,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;4BACrI,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,yBAAY,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;4BACrI,IAAI,CAAC,WAAW,CAAC,SAAS,GAAG,yBAAY,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;4BACrI,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;yBAC3J;wBAED,IAAI,IAAI,CAAC,WAAW,EAAE;4BACpB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE;gCAC9B,MAAM,EAAE,IAAI;gCACZ,OAAO,EAAE,KAAK;6BACf,CAAC,CAAC;yBACJ;;;;;KACF;IAEM,uBAAa,GAApB,UAAqB,IAAI;QACjB,IAAA,KAAiB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAvB,IAAI,QAAmB,CAAC;QACjC,IAAA,KAAe,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAA3B,QAAQ,QAAmB,CAAC;QACrC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEK,uCAAmB,GAAzB;;;;;;;wBACQ,gBAAgB,GAAG,EAAE,CAAC;wBAEtB,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;wBACpC,gBAAgB,GAAG;4BACvB;gCACE,MAAM,EAAE,gBAAgB;gCACxB,MAAM,EAAE,OAAO;gCACf,SAAS,EAAE;oCACT,OAAO,EAAE,CAAC,iBAAiB,CAAC;iCAC7B;6BACF;yBACF,CAAC;wBAEF,IAAI,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;4BACxB,QAAQ,GAAG,gCAAuB,IAAI,CAAC,WAAW,0CAAE,IAAI,CAAE,CAAC;4BAC3D,QAAQ,GAAG,+BAAyB,CAAC,QAAQ,CAAC,CAAC;yBAChD;6BAAM;4BACL,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,4BAAsB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;yBAC7F;wBACD,IAAI,WAAW,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;4BAC3C,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE;gCAAE,gBAAgB,CAAC,IAAI,OAArB,gBAAgB,EAAS,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,EAAE;6BAAE;yBAChF;wBAED,IAAI,IAAI,CAAC,sBAAsB,EAAE;4BAC/B,gBAAgB,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;4BAE5C,aAAa,GAAG,+BAAyB,CAAC,gCAA8B,IAAI,CAAC,MAAM,SAAI,IAAI,CAAC,IAAM,CAAC,CAAC;4BACpG,kBAAkB,GAA0B;gCAChD,MAAM,EAAE;oCACN,iBAAiB;oCACjB,oBAAoB;iCACrB;gCACD,QAAQ,EAAE,GAAG;gCACb,MAAM,EAAE,OAAO;6BAChB,CAAC;4BACI,SAAS,GAAuB;gCACpC,IAAI,EAAE,aAAa;gCACnB,SAAS,EAAE,CAAC,kBAAkB,CAAC;6BAChC,CAAC;4BACF,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;yBAClC;wBAED,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,EAAE;4BACtF,gBAAgB,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;yBACpE;wBAED,IAAI,IAAI,CAAC,wBAAwB,EAAE;4BACjC,gBAAgB,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;yBAChE;wBAEK,SAAS,SAAG,IAAI,CAAC,WAAW,0CAAE,SAAS,CAAC;wBAC9C,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;4BACzB,IAAI,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;gCACtC,gBAAgB,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;6BAC9C;iCAAM;gCACL,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;6BACzE;yBACF;6BAAM,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,MAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAA,EAAE;4BAC9C,aAAa,GAAG,+BAAyB,CAAC,gCAA8B,IAAI,CAAC,MAAM,SAAI,IAAI,CAAC,IAAM,CAAC,CAAC;4BACpG,kBAAkB,GAA0B;gCAChD,MAAM,EAAE;oCACN,sBAAsB;iCACvB;gCACD,QAAQ,EAAE,0BAAuB,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,mBAAa,SAAS,CAAC,QAAU;gCACpF,MAAM,EAAE,OAAO;6BAChB,CAAC;4BACI,SAAS,GAAuB;gCACpC,IAAI,EAAE,aAAa;gCACnB,SAAS,EAAE,CAAC,kBAAkB,CAAC;6BAChC,CAAC;4BACF,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;yBAClC;6BAAM,IAAI,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,MAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAA,EAAE;4BACpD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;yBACzD;wBAED,IAAI,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE;4BAAE,sBAAO,SAAS,EAAC;yBAAE;wBAChF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAoB,QAAQ,oBAAiB,CAAC,CAAC;wBAChE,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;wBACpB,WAAW,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC3E,qBAAM,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,EAAA;;wBAAnH,OAAO,GAAG,SAAyG;wBACzH,sBAAO,OAAO,EAAC;;;;KAChB;IAED,4CAAwB,GAAxB;QACE,OAAO;YACL,OAAO,EAAE,kDAAgD,IAAI,CAAC,MAAQ;YACtE,QAAQ,EAAE,cAAc;SACzB,CAAC;IACJ,CAAC;IAEK,sCAAkB,GAAxB;;;;;;wBACU,SAAS,GAAK,IAAI,CAAC,WAAW,UAArB,CAAsB;wBACvC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE;4BACxB,sBAAO,SAAS,EAAC;yBAClB;6BAEG,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAArB,wBAAqB;6BACnB,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,EAAlC,wBAAkC;wBACpC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;wBACpB,SAAS,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBACzF,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gFAAgF,CAAC,CAAC;wBAC/E,qBAAM,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAA;;wBAA/D,iBAAiB,GAAG,SAA2C,CAAC;wBAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAoC,IAAI,CAAC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,IAAI,CAAG,CAAC,CAAC;;4BAEtG,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;;;wBAG1E,iBAAiB,GAAG;4BAClB,OAAO,EAAE,SAAS,CAAC,OAAO;4BAC1B,QAAQ,EAAE,SAAS,CAAC,QAAQ;yBAC7B,CAAC;;4BAEJ,sBAAO,iBAAiB,EAAC;;;;KAC1B;IAEK,sCAAkB,GAAxB,UAAyB,SAAkB;;;;;;wBACjC,SAAS,GAAK,IAAI,CAAC,WAAW,UAArB,CAAsB;6BACnC,CAAA,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA,EAA1D,wBAA0D;wBAC5D,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;4BACzB,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE;gCACvC,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;6BACzE;yBACF;wBACD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;wBAC1B,WAAW;wBACX,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,+FAA+F,CAAC,CAAC;wBAC5G,WAAW,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBACtE,qBAAM,WAAW,CAAC,gBAAgB,EAAE,EAAA;;wBAAnD,YAAY,GAAG,SAAoC;wBACzD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAoC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,IAAI,EAAE,IAAI,CAAG,CAAC,CAAC;wBACjG,sBAAO;gCACL,KAAK,EAAE,YAAY,CAAC,KAAK;gCACzB,eAAe,EAAE,YAAY,CAAC,eAAe;gCAC7C,UAAU,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC;6BACrC,EAAC;4BAEJ,sBAAO,SAAS,EAAC;;;;KAClB;IAEK,sCAAkB,GAAxB,UAAyB,SAAoB,EAAE,OAAe,EAAE,SAAmB;;;;;;wBACzE,SAAS,GAAK,IAAI,CAAC,WAAW,UAArB,CAAsB;6BACnC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,EAArB,wBAAqB;6BACnB,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,EAAlC,wBAAkC;wBACpC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;wBACpB,WAAW,GAAG,IAAI,iBAAW,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;wBAC3F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iGAAiG,CAAC,CAAC;wBAC3F,qBAAM,WAAW,CAAC,gBAAgB,CAAC,KAAG,8BAAqB,GAAG,IAAI,CAAC,IAAM,EAAE,SAAS,EAAE,MAAI,IAAI,CAAC,IAAM,EAAE,OAAO,EAAE,SAAS,CAAC,EAAA;;wBAA7I,gBAAgB,GAAG,SAA0H;wBACnJ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAoC,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAG,CAAC,CAAC;wBACrG,sBAAO,gBAAgB,EAAC;4BAExB,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;4BAI5E,sBAAO,SAAS,EAAC;;;;KAClB;IAEK,+BAAW,GAAjB,UAAkB,SAAmB;;;;;;wBACnC,IAAI,IAAI,CAAC,SAAS,EAAE;4BAAE,sBAAO,IAAI,CAAC,YAAY,EAAC;yBAAE;wBACjD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE;4BAAE,sBAAO,SAAS,EAAC;yBAAE;wBAChD,mBAAmB,GAAkB;4BACzC,IAAI,EAAE,IAAI,CAAC,IAAI;yBAChB,CAAC;wBAEF,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE;4BAC1C,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;yBACnF;wBAED,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,cAAc,CAAC,EAAE;4BAC7C,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;yBACzF;wBAEY,qBAAM,IAAI,CAAC,mBAAmB,EAAE,EAAA;;wBAAvC,IAAI,GAAG,SAAgC;wBAC7C,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;4BAAE,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,IAAI,MAAA,EAAE,CAAC,CAAC;yBAAE;6BACnE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAtC,wBAAsC;wBACd,qBAAM,IAAI,CAAC,kBAAkB,EAAE,EAAA;;wBAAnD,iBAAiB,GAAG,SAA+B;wBACzD,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;;;wBAE/D,SAAS,GAAK,IAAI,CAAC,WAAW,UAArB,CAAsB;wBACjC,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;6BAEjD,CAAA,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,SAAS,CAAA,EAAnD,wBAAmD;wBAE3B,qBAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAA;;wBAA5D,iBAAiB,GAAG,SAAwC;wBAClE,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;;;6BAEnE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAtC,wBAAsC;wBAGd,qBAAM,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,SAAS,EAAE,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,IAAI,EAAE,SAAS,CAAC,EAAA;;wBAAvH,iBAAiB,GAAG,SAAmG;wBAC7H,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,SAAS,EAAE,iBAAiB,EAAE,CAAC,CAAC;;;wBAEvE,IAAI,IAAI,CAAC,WAAW,EAAE;4BACpB,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;gCACjC,MAAM,EAAE,IAAI;gCACZ,OAAO,EAAE,KAAK;6BACf,CAAC,CAAC;yBACJ;wBACD,qBAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,mBAAmB,EAAE,IAAI,CAAC,aAAa,CAAC,EAAA;;wBAAhF,SAAgF,CAAC;wBACjF,sBAAO,mBAAmB,EAAC;;;;KAC5B;IACH,gBAAC;AAAD,CAAC,AA/QD,CAA+B,mBAAQ,GA+QtC;AA/QY,8BAAS"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/lib/fc/service.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index a7f37b1..ed694f3 100644 --- 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 index b191ce9..d6d794b 100644 --- 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 index 8a09140..3979044 100644 --- a/src/lib/fc/service.ts +++ b/src/lib/fc/service.ts @@ -72,9 +72,9 @@ export class FcService extends FcDeploy { 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; }