@cloudbase/cli 2.6.0-alpha.5 → 2.6.0-alpha.7

package/lib/commands/fun/base.js

@@ -54,6 +54,7 @@ let FunListCommand = class FunListCommand extends common_1.Command {
         };
     }
     execute(envId, log) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const loading = (0, utils_1.loadingFactory)();
             if (!envId) {
@@ -68,13 +69,10 @@ let FunListCommand = class FunListCommand extends common_1.Command {
                     .request('DescribeCloudBaseRunServers', {
                     EnvId: envId,
                     Limit: 100,
-                    Offset: 0,
-                    Filter: {
-                        Tag: 'function'
-                    }
+                    Offset: 0
                 })
                     .finally(() => loading.stop());
-                const serverList = serverListRes.CloudBaseRunServerSet;
+                const serverList = (_a = serverListRes.CloudBaseRunServerSet) === null || _a === void 0 ? void 0 : _a.filter((item) => item.Tag === 'function');
                 const head = ['服务名称', '状态', '创建时间', '更新时间'];
                 const tableData = serverList.map((serverItem) => [
                     serverItem.ServerName,
@@ -177,7 +175,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                 Limit: 1,
                 Offset: 0
             });
-            if (fetchSvrRes.ServerName && !_hasTag(fetchSvrRes.Tags, 'function')) {
+            if (fetchSvrRes.ServerName && !_isFunRunService(fetchSvrRes.Tag)) {
                 log.error(`${serviceName} 服务已存在，但不是一个函数式托管服务，请使用另外的服务名称`);
                 return;
             }
@@ -231,7 +229,7 @@ let FunDeployCommand = class FunDeployCommand extends common_1.Command {
                     envId,
                     serviceName,
                     filePath: source,
-                    fileToIgnore: includeNodeModules ? [] : ['node_modules/**/*']
+                    fileToIgnore: ['logs', 'logs/**/*'].concat(includeNodeModules ? [] : ['node_modules', 'node_modules/**/*'])
                 });
                 packageName = PackageName;
                 packageVersion = PackageVersion;
@@ -412,8 +410,10 @@ function _inputAppId(defaultVal = '') {
         return answers['appId'];
     });
 }
-function _hasTag(tagsStr, target) {
-    const tags = tagsStr.split(',');
-    const tag_list = tags.map((item) => item.split(':')[0]);
-    return tag_list.includes(target);
+function _isFunRunService(tagStr) {
+    if (!tagStr)
+        return false;
+    const tags = tagStr.split(',');
+    const tagList = tags.map((item) => item.split(':')[0]);
+    return tagList.includes('function');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/cli",
-    "version": "2.6.0-alpha.5",
+    "version": "2.6.0-alpha.7",
     "description": "cli tool for cloudbase",
     "main": "lib/index.js",
     "scripts": {