fix: cls for scf cant update index, dont throw and use warning

Author: wwwzbwcom

__tests__/cls/cls.test.ts

@@ -3,11 +3,46 @@ import { Scf } from '../../src';
 import { Cls } from '../../src';
 import { sleep } from '@ygkit/request';
 
-describe('Cls', () => {
-  const credentials = {
-    SecretId: process.env.TENCENT_SECRET_ID,
-    SecretKey: process.env.TENCENT_SECRET_KEY,
+const credentials = {
+  SecretId: process.env.TENCENT_SECRET_ID,
+  SecretKey: process.env.TENCENT_SECRET_KEY,
+};
+
+describe('Scf Cls', () => {
+  const client = new Cls(credentials, process.env.REGION);
+
+  const inputs: DeployInputs = {
+    region: 'ap-guangzhou',
+    name: 'SCF_logset_zyIdCSDW',
+    topic: 'SCF_logtopic_QExYJrDj',
+    period: 7,
+    rule: {
+      full_text: {
+        case_sensitive: true,
+        tokenizer: '!@#%^&*()_="\', <>/?|\\;:\n\t\r[]{}',
+      },
+      key_value: {
+        case_sensitive: true,
+        keys: ['SCF_RetMsg'],
+        types: ['text'],
+        tokenizers: [' '],
+      },
+    },
   };
+
+  test('deploy cls', async () => {
+    const res = await client.deploy(inputs);
+    expect(res).toEqual({
+      region: process.env.REGION,
+      name: inputs.name,
+      topic: inputs.topic,
+      logsetId: expect.any(String),
+      topicId: expect.any(String),
+    });
+  });
+});
+
+describe('Normal Cls', () => {
   const scf = new Scf(credentials, process.env.REGION);
   const client = new Cls(credentials, process.env.REGION);
 

src/modules/cls/dashboard.ts

@@ -196,7 +196,7 @@ export class ClsDashboard {
 
   // 获取 dashboard 列表
   async getList(): Promise<Dashboard[]> {
-    console.log(`Getting dashboard list}`);
+    console.log(`Getting dashboard list`);
     const res = await this.cls.clsClient.request({
       method: 'GET',
       path: '/dashboards',
@@ -248,7 +248,7 @@ export class ClsDashboard {
       try {
         parseData = JSON.parse(res.data);
       } catch (err) {
-        console.log(`get detail: ${id}, data: ${res.data}`);
+        console.log(`Get detail failed: ${id}, data: ${res.data}`);
       }
       const rawPanels: Raw.DashboardChart[] = parseData.panels;
 

src/modules/cls/index.ts

@@ -152,12 +152,27 @@ export default class Cls {
 
   // 更新索引
   async deployIndex(inputs: DeployIndexInputs) {
-    await updateIndex(this.clsClient, {
-      topicId: inputs.topicId!,
-      // FIXME: effective is always true in updateIndex
-      effective: inputs.effective !== false ? true : false,
-      rule: inputs.rule,
-    });
+    if (inputs.rule) {
+      console.log('Deploying index');
+
+      try {
+        await updateIndex(this.clsClient, {
+          topicId: inputs.topicId!,
+          // FIXME: effective is always true in updateIndex
+          effective: inputs.effective !== false ? true : false,
+          rule: inputs.rule,
+        });
+      } catch (err) {
+        console.log('' + err);
+        if (err.message.includes('403')) {
+          console.log('Cant update index of CLS for SCF');
+        } else {
+          throw err;
+        }
+      }
+
+      // TODO: SCF Logset 403
+    }
   }
 
   // 部署