fix(asw): remove auto create role feature

Author: yugasun

__tests__/asw.test.ts

@@ -13,13 +13,13 @@ describe('Account', () => {
     key: 'value',
   });
 
+  const roleArn = 'qcs::cam::uin/100015854621:roleName/serverless-test-aws';
+
   const options: {
     definition: string;
     name: string;
     resourceId?: string;
-    role?: string;
-    uin: string;
-    appId: string;
+    roleArn: string;
     input?: string;
   } = {
     definition: JSON.stringify({
@@ -31,8 +31,7 @@ describe('Account', () => {
       },
     }),
     name: 'serverless-test',
-    uin: process.env.TENCENT_UIN,
-    appId: process.env.TENCENT_APP_ID,
+    roleArn,
     input,
   };
 
@@ -44,8 +43,7 @@ describe('Account', () => {
     expect(res).toEqual({
       requestId: expect.any(String),
       resourceId: expect.any(String),
-      isNewRole: expect.any(Boolean),
-      roleName: expect.stringContaining('serverless-test_'),
+      roleArn,
     });
     createResult = res;
   });
@@ -60,13 +58,12 @@ describe('Account', () => {
 
   test('update', async () => {
     options.resourceId = createResult.resourceId;
-    options.role = createResult.roleName;
+    options.roleArn = createResult.roleArn;
     const res = await client.update(options as UpdateOptions);
     expect(res).toEqual({
       requestId: expect.any(String),
       resourceId: createResult.resourceId,
-      isNewRole: expect.any(Boolean),
-      roleName: expect.stringContaining('serverless-test_'),
+      roleArn,
     });
   });
 
@@ -102,8 +99,5 @@ describe('Account', () => {
       requestId: expect.any(String),
       resourceId: createResult.resourceId,
     });
-
-    // 删除测试创建的角色
-    await client.cam.DeleteRole(createResult.roleName);
   });
 });

src/modules/asw/index.ts

@@ -17,13 +17,12 @@ import {
 import APIS, { ActionType } from './apis';
 import { pascalCaseProps, randomId } from '../../utils/index';
 import { CapiCredentials, RegionType } from '../interface';
-import { Account, Cam } from '../../';
+import { Cam } from '../../';
 
 export default class Asw {
   credentials: CapiCredentials;
   capi: Capi;
   region: RegionType;
-  account: Account;
   cam: Cam;
 
   constructor(credentials: CapiCredentials, region: RegionType = 'ap-guangzhou') {
@@ -38,8 +37,6 @@ export default class Asw {
       Token: this.credentials.Token,
     });
 
-    this.account = new Account(credentials);
-
     this.cam = new Cam(credentials);
   }
 
@@ -70,8 +67,7 @@ export default class Asw {
     const {
       definition,
       name,
-      role,
-      uin,
+      roleArn,
       type = 'STANDARD',
       chineseName = 'serverless',
       description = 'Created By Serverless',
@@ -82,22 +78,14 @@ export default class Asw {
     const reqParams: CreateApiOptions = {
       Definition: definition,
       FlowServiceName: name,
-      IsNewRole: !!role,
+      IsNewRole: false,
       Type: type,
       FlowServiceChineseName: chineseName,
       Description: description,
       EnableCLS: enableCls,
+      RoleResource: roleArn,
     };
 
-    let roleName = role;
-
-    if (!roleName) {
-      // 如果上层传入 appId 直接使用上层 appId，如果没有尝试通过 accountInfo 中来获取
-      const { appId } = options;
-      roleName = await this.createRole(name, appId!);
-    }
-    reqParams.RoleResource = `qcs::cam::uin/${uin}:roleName/${roleName}`;
-
     if (input) {
       reqParams.Input = input;
     }
@@ -109,8 +97,7 @@ export default class Asw {
     return {
       requestId: RequestId,
       resourceId: FlowServiceResource,
-      isNewRole: reqParams.IsNewRole,
-      roleName,
+      roleArn,
     };
   }
 
@@ -124,8 +111,7 @@ export default class Asw {
       resourceId,
       definition,
       name,
-      role,
-      uin,
+      roleArn,
       type = 'STANDARD',
       chineseName = 'serverless',
       description = 'Created By Serverless',
@@ -136,23 +122,14 @@ export default class Asw {
       FlowServiceResource: resourceId,
       Definition: definition,
       FlowServiceName: name,
-      IsNewRole: !role,
+      IsNewRole: false,
       Type: type,
       FlowServiceChineseName: chineseName,
       Description: description,
       EnableCLS: enableCls,
+      RoleResource: roleArn,
     };
 
-    let roleName = role;
-
-    if (!roleName) {
-      // 如果上层传入 appId 直接使用上层 appId，如果没有尝试通过 accountInfo 中来获取
-      const { appId } = options;
-      roleName = await this.createRole(name, appId!);
-    }
-
-    reqParams.RoleResource = `qcs::cam::uin/${uin}:roleName/${roleName}`;
-
     const { RequestId, FlowServiceResource } = await this.request({
       ...reqParams,
       Action: 'ModifyFlowService',
@@ -161,8 +138,7 @@ export default class Asw {
     return {
       requestId: RequestId,
       resourceId: FlowServiceResource,
-      isNewRole: reqParams.IsNewRole,
-      roleName,
+      roleArn,
     };
   }
 

src/modules/asw/interface.ts

@@ -29,12 +29,10 @@ export interface CreateOptions {
   definition: string;
   // 状态机服务名称，必须唯一
   name: string;
-  // 用户主账号 UIN
-  uin: string;
   // 是否是新创建角色
   isNewRole?: boolean;
   // 角色名称
-  role?: string;
+  roleArn: string;
   // 状态机类型，EXPRESS，STANDARD
   type?: string;
   // 状态机服务中文名称
@@ -45,9 +43,6 @@ export interface CreateOptions {
   enableCls?: boolean;
   // 状态机默认输入参数
   input?: string;
-
-  // app id
-  appId?: string;
 }
 
 export type UpdateOptions = Omit<CreateOptions, 'input'> & {
@@ -63,14 +58,12 @@ export interface BaseResult {
 }
 
 export interface CreateResult extends BaseResult {
-  // 是否是新建角色
-  isNewRole: boolean;
-  // 角色名称
-  roleName: string;
+  // 角色 arn
+  roleArn: string;
 }
 export type UpdateResult = BaseResult & {
-  isNewRole: boolean;
-  roleName: string;
+  // 角色 arn
+  roleArn: string;
 };
 export type DeleteResult = BaseResult;