@cloudbase/manager-node 5.5.2 → 5.5.3

package/lib/database/index.js

@@ -46,6 +46,14 @@ class DatabaseService {
             Tag: Databases[0].InstanceId
         };
     }
+    getMongoConnector() {
+        const currEnv = this.environment;
+        const { Databases } = currEnv.lazyEnvironmentConfig;
+        return {
+            DatabaseName: Databases[0].InstanceId,
+            InstanceId: 'flexdb'
+        };
+    }
     async checkCollectionExists(collectionName) {
         try {
             const result = await this.describeCollection(collectionName);
@@ -63,10 +71,10 @@ class DatabaseService {
         }
     }
     async createCollection(collectionName) {
-        let { Tag } = this.getDatabaseConfig();
+        const MongoConnector = this.getMongoConnector();
         const res = await this.dbOpService.request('CreateTable', {
             EnvId: this.envId,
-            Tag,
+            MongoConnector,
             TableName: collectionName
         });
         return res;
@@ -75,10 +83,10 @@ class DatabaseService {
         // 先检查当前集合是否存在
         const existRes = await this.checkCollectionExists(collectionName);
         if (existRes.Exists) {
-            let { Tag } = this.getDatabaseConfig();
+            const MongoConnector = this.getMongoConnector();
             const res = await this.dbOpService.request('DeleteTable', {
                 EnvId: this.envId,
-                Tag,
+                MongoConnector,
                 TableName: collectionName
             });
             return res;
@@ -88,15 +96,15 @@ class DatabaseService {
         }
     }
     async updateCollection(collectionName, indexiesInfo) {
-        let { Tag } = this.getDatabaseConfig();
-        const res = await this.dbOpService.request('UpdateTable', Object.assign({ EnvId: this.envId, Tag, TableName: collectionName }, indexiesInfo));
+        const MongoConnector = this.getMongoConnector();
+        const res = await this.dbOpService.request('UpdateTable', Object.assign({ EnvId: this.envId, MongoConnector, TableName: collectionName }, indexiesInfo));
         return res;
     }
     async describeCollection(collectionName) {
-        let { Tag } = this.getDatabaseConfig();
+        const MongoConnector = this.getMongoConnector();
         return this.dbOpService.request('DescribeTable', {
             EnvId: this.envId,
-            Tag,
+            MongoConnector,
             TableName: collectionName
         });
     }
@@ -105,14 +113,14 @@ class DatabaseService {
         MgoLimit: this.DEFAULT_MGO_LIMIT,
         MgoOffset: this.DEFAULT_MGO_OFFSET
     }) {
-        let { Tag } = this.getDatabaseConfig();
+        const MongoConnector = this.getMongoConnector();
         if (options.MgoLimit === undefined) {
             options.MgoLimit = this.DEFAULT_MGO_LIMIT;
         }
         if (options.MgoOffset === undefined) {
             options.MgoOffset = this.DEFAULT_MGO_OFFSET;
         }
-        const res = await this.dbOpService.request('ListTables', Object.assign({ EnvId: this.envId, Tag }, options));
+        const res = await this.dbOpService.request('ListTables', Object.assign({ EnvId: this.envId, MongoConnector }, options));
         if (res.Tables === null) {
             // 无集合
             res.Collections = [];
@@ -277,12 +285,16 @@ class DatabaseService {
     }
     /**
      * 执行文档型数据库命令
-     * @param options 命令参数（命令列表、可选的 Tag/EnvId/MongoConnector）
+     * @param options 命令参数（命令列表、可选的 EnvId/MongoConnector）
      * @returns 执行结果，Data 为 JSON 字符串数组
      */
     async runCommands(options) {
-        let { Tag } = this.getDatabaseConfig();
-        return this.dbOpService.request('RunCommands', Object.assign({ MgoCommands: options.MgoCommands, Tag: options.Tag || Tag, EnvId: options.EnvId || this.envId }, (options.MongoConnector ? { MongoConnector: options.MongoConnector } : {})));
+        const MongoConnector = options.MongoConnector || this.getMongoConnector();
+        return this.dbOpService.request('RunCommands', {
+            MgoCommands: options.MgoCommands,
+            MongoConnector,
+            EnvId: options.EnvId || this.envId,
+        });
     }
     /**
      * 在 PostgreSQL 数据库上执行 SQL 语句

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "5.5.2",
+    "version": "5.5.3",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {

package/types/database/index.d.ts

@@ -155,6 +155,7 @@ export declare class DatabaseService {
     constructor(environment: Environment);
     getCurrEnvironment(): Environment;
     getDatabaseConfig(): IDatabaseConfig;
+    getMongoConnector(): IMongoConnector;
     checkCollectionExists(collectionName: string): Promise<IExistsRes>;
     createCollection(collectionName: string): Promise<any>;
     deleteCollection(collectionName: string): Promise<any>;
@@ -197,7 +198,7 @@ export declare class DatabaseService {
     restoreTables(time: string, modifyTableNamesInfo: IModifyTableNamesInfo[], instanceId?: string): Promise<IRestoreTCBTablesResult>;
     /**
      * 执行文档型数据库命令
-     * @param options 命令参数（命令列表、可选的 Tag/EnvId/MongoConnector）
+     * @param options 命令参数（命令列表、可选的 EnvId/MongoConnector）
      * @returns 执行结果，Data 为 JSON 字符串数组
      */
     runCommands(options: IRunCommandsOptions): Promise<IRunCommandsResult>;