@cloudbase/cli 2.3.12-alpha.1 → 2.3.12-alpha.2

package/lib/commands/addon/index.js

@@ -46,6 +46,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AddonPush = exports.AddonPull = void 0;
 const cloud_api_1 = require("@cloudbase/cloud-api");
+const toolbox_1 = require("@cloudbase/toolbox");
 const decorators_1 = require("../../decorators");
 const utils_1 = require("../../utils");
 const common_1 = require("../common");
@@ -59,17 +60,18 @@ let AddonPull = class AddonPull extends common_1.Command {
                     desc: '环境 ID'
                 }
             ],
-            desc: '拉取插件代码',
+            desc: '拉取插件/资源代码',
             requiredEnvId: true,
             hasNameArg: true
         });
     }
     execute(ctx, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const tcbService = yield getTcbServiceInstance(ctx);
-            const { name, resource } = getParams(ctx.params, true);
+            const cloudService = yield getCloudServiceInstance(ctx);
+            const { resource } = options;
+            const { name } = getParams(ctx.params);
             Promise.resolve().then(() => __importStar(require('@cloudbase/addon-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
-                yield res.pull({ name, resource, envId: ctx.envId, tcbService });
+                yield res.pull({ name, resource, envId: ctx.envId, cloudService });
             }));
         });
     }
@@ -100,10 +102,10 @@ let AddonPush = class AddonPush extends common_1.Command {
     }
     execute(ctx, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const tcbService = yield getTcbServiceInstance(ctx);
-            const { resource } = getParams(ctx.params, false);
+            const cloudService = yield getCloudServiceInstance(ctx);
+            const { resource } = options;
             Promise.resolve().then(() => __importStar(require('@cloudbase/addon-cli'))).then((res) => __awaiter(this, void 0, void 0, function* () {
-                yield res.push({ tcbService, envId: ctx.envId, resource });
+                yield res.push({ cloudService, envId: ctx.envId, resource });
             }));
         });
     }
@@ -122,7 +124,7 @@ AddonPush = __decorate([
     })
 ], AddonPush);
 exports.AddonPush = AddonPush;
-function getTcbServiceInstance(ctx) {
+function getCloudServiceInstance(ctx) {
     return __awaiter(this, void 0, void 0, function* () {
         let credential;
         if (ctx.hasPrivateSettings) {
@@ -133,41 +135,36 @@ function getTcbServiceInstance(ctx) {
         else {
             credential = yield utils_1.authSupevisor.getLoginState();
         }
-        const tcbService = cloud_api_1.CloudApiService.getInstance({ service: 'tcb', credential });
-        return tcbService;
+        return {
+            lowcode: cloud_api_1.CloudApiService.getInstance({
+                service: 'lowcode',
+                proxy: (0, toolbox_1.getProxy)(),
+                credential,
+                version: '2021-01-08'
+            }),
+            tcb: cloud_api_1.CloudApiService.getInstance({ service: 'tcb', proxy: (0, toolbox_1.getProxy)(), credential })
+        };
     });
 }
 function getOptions({ childCmd, options, desc, requiredEnvId, hasNameArg }) {
     return {
         cmd: 'addon',
         childCmd,
-        options,
-        args: hasNameArg
-            ? [{ flags: '[resource]' }, { flags: '[name]' }]
-            : [{ flags: '[resource]' }],
+        options: [
+            {
+                flags: '--resource <resource>',
+                desc: '资源名称。当想操作指定资源而非插件时使用。当前支持 block / app / automation'
+            },
+            ...options
+        ],
+        args: hasNameArg ? [{ flags: '[name]' }] : [],
         desc,
         requiredEnvId
     };
 }
-function getParams(ctxParams, hasNameArg) {
+function getParams(ctxParams) {
     const params = ctxParams.filter((param) => typeof param === 'string');
-    let name, resource;
-    if (hasNameArg) {
-        if (params.length === 1) {
-            name = params[0];
-        }
-        else if (params.length === 2) {
-            resource = params[0];
-            name = params[1];
-        }
-    }
-    else {
-        if (params.length === 1) {
-            resource = params[0];
-        }
-    }
     return {
-        name,
-        resource
+        name: params[0]
     };
 }

package/package.json

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