@cloudbase/manager-node 4.11.0-alpha.10 → 4.11.0-alpha.11

package/jest.config.js

@@ -10,6 +10,7 @@ module.exports = {
     },
     transformIgnorePatterns: ['node_modules'],
     testEnvironment: 'node',
+    forceExit: true,
     // https://github.com/facebook/jest/issues/5164
     globalSetup: './test/global-setup-hook.ts',
     // globalTeardown: './test/global-teardown-hook.js',

package/lib/agent/index.js

@@ -28,14 +28,14 @@ class AgentService {
     }
     // ==================== SCF 云函数部署 ====================
     /**
-     * 创建 SCF Agent
+     * 创建 Agent
      * 支持两种方式：
      * 1. 传入 cwd 代码目录，自动打包上传
      * 2. 传入 ZipFile / CosBucketRegion + TempCosObjectName，直接上传
      * @param params 创建参数
      * @returns Agent 创建结果
      */
-    async createScfAgent(params) {
+    async createAgent(params) {
         const envConfig = this.environment.lazyEnvironmentConfig;
         // 默认会话配置
         const defaultSessionConfig = {
@@ -622,7 +622,7 @@ class AgentService {
 exports.AgentService = AgentService;
 __decorate([
     (0, utils_1.preLazy)()
-], AgentService.prototype, "createScfAgent", null);
+], AgentService.prototype, "createAgent", null);
 __decorate([
     (0, utils_1.preLazy)()
 ], AgentService.prototype, "describeAgentList", null);

package/lib/env/index.js

@@ -573,7 +573,7 @@ class EnvService {
      */
     async deleteCustomDomain(params) {
         const { EnvId, Domain } = params;
-        // 先查询域名下是否有路由绑定
+        // 查询domain下的路由
         const queryRes = await this.describeHttpServiceRoute({
             EnvId,
             Filters: [
@@ -581,20 +581,18 @@ class EnvService {
                     Name: 'Domain',
                     Values: [Domain]
                 }
-            ],
-            Limit: 1
+            ]
         });
-        // 检查域名是否存在
         const domains = queryRes.Domains || [];
         const targetDomain = domains.find(d => d.Domain === Domain);
         if (!targetDomain) {
-            throw new error_1.CloudBaseError(`域名 ${Domain} 不存在`);
+            throw new error_1.CloudBaseError(`Domain ${Domain} does not exist`);
         }
-        // 检查域名下是否有路由绑定
+        // 检查是否有路由绑定
         const routes = targetDomain.Routes || [];
         if (routes.length > 0) {
             const routePaths = routes.map(r => r.Path).join(', ');
-            throw new error_1.CloudBaseError(`域名 ${Domain} 下还有 ${routes.length} 个路由绑定（${routePaths}），请先删除路由后再删除域名`);
+            throw new error_1.CloudBaseError(`Domain ${Domain} has ${routes.length} route binding(s) (${routePaths}). Please delete the routes before deleting the domain.`);
         }
         // 无路由绑定，可以删除域名
         return this.cloudService.request('DeleteHTTPServiceRoute', {

package/lib/permission/index.js

@@ -25,7 +25,9 @@ class PermissionService {
         if (!resourceType || !PERMISSION_BY_RESOURCE[resourceType]) {
             throw new Error('Invalid resourceType');
         }
-        if (typeof resource !== 'string' || resource.trim().length === 0) {
+        const isFunctionResourceType = resourceType === 'function';
+        const hasValidResourceValue = typeof resource === 'string' && resource.trim().length > 0;
+        if (!isFunctionResourceType && !hasValidResourceValue) {
             throw new Error('Invalid resource');
         }
         const allowed = PERMISSION_BY_RESOURCE[resourceType];
@@ -43,12 +45,7 @@ class PermissionService {
             //     throw new Error('securityRule must be a valid JSON string')
             // }
         }
-        const reqData = {
-            EnvId,
-            ResourceType: resourceType,
-            Resource: resource,
-            Permission: permission
-        };
+        const reqData = Object.assign({ EnvId, ResourceType: resourceType, Permission: permission }, (hasValidResourceValue || !isFunctionResourceType ? { Resource: resource } : {}));
         if (permission === 'CUSTOM') {
             reqData.SecurityRule = securityRule;
         }

package/package.json

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

package/types/agent/index.d.ts

@@ -1,5 +1,5 @@
 import { Environment } from '../environment';
-import { ICreateFunctionAgentParams, ICreateScfAgentParams, ICreateTcbrAgentByImageParams, ICreateTcbrAgentByPackageParams, ICreateTcbrAgentByCodeParams, IDescribeAgentListParams, IDescribeAgentListResponse, IDescribeAgentResponse, IDeleteAgentParams, IDescribeCloudBaseBuildServiceParams, IDescribeCloudBaseBuildServiceResponse, ICreateAgentResponse, IDeleteAgentResponse, ICommonResponse, IUpdateAgentParams, IUpdateScfAgentParams, IUpdateScfAgentResponse, IUpdateTcbrAgentParams, IGetAgentLogsParams } from './type';
+import { ICreateFunctionAgentParams, ICreateAgentParams, ICreateTcbrAgentByImageParams, ICreateTcbrAgentByPackageParams, ICreateTcbrAgentByCodeParams, IDescribeAgentListParams, IDescribeAgentListResponse, IDescribeAgentResponse, IDeleteAgentParams, IDescribeCloudBaseBuildServiceParams, IDescribeCloudBaseBuildServiceResponse, ICreateAgentResponse, IDeleteAgentResponse, ICommonResponse, IUpdateAgentParams, IUpdateScfAgentParams, IUpdateScfAgentResponse, IUpdateTcbrAgentParams, IGetAgentLogsParams } from './type';
 /**
  * Agent 管理类
  * 支持三种部署方式：
@@ -12,14 +12,14 @@ export declare class AgentService {
     private tcbService;
     constructor(environment: Environment);
     /**
-     * 创建 SCF Agent
+     * 创建 Agent
      * 支持两种方式：
      * 1. 传入 cwd 代码目录，自动打包上传
      * 2. 传入 ZipFile / CosBucketRegion + TempCosObjectName，直接上传
      * @param params 创建参数
      * @returns Agent 创建结果
      */
-    createScfAgent(params: ICreateScfAgentParams): Promise<ICreateAgentResponse>;
+    createAgent(params: ICreateAgentParams): Promise<ICreateAgentResponse>;
     /**
      * 查询 Agent 列表
      * @param params 查询参数

package/types/agent/type.d.ts

@@ -28,12 +28,12 @@ export interface ISessionConfig {
     MaxConcurrency?: number;
 }
 /**
- * 创建 SCF Agent 的参数
+ * 创建 Agent 的参数
  * 支持两种方式：
  * 1. 传入 cwd 代码目录，自动打包上传
  * 2. 传入 ZipFile / CosBucketRegion + TempCosObjectName，直接上传
  */
-export interface ICreateScfAgentParams {
+export interface ICreateAgentParams {
     /** Agent 名称 */
     Name: string;
     /** Agent ID，不传则自动生成 */

package/types/permission/types.d.ts

@@ -2,7 +2,7 @@ export type PermissionResourceType = 'function' | 'storage' | 'table' | 'collect
 export type BasePermission = 'READONLY' | 'PRIVATE' | 'ADMINWRITE' | 'ADMINONLY' | 'CUSTOM';
 export interface ModifyResourcePermissionOptions {
     resourceType: PermissionResourceType;
-    resource: string;
+    resource?: string;
     permission: BasePermission;
     securityRule?: string;
 }