fix: add useCITemp option

serverless-plus · Sep 15, 2020 · 37f0d67 · 37f0d67
1 parent a82429d
commit 37f0d67
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/apis/actions.ts b/src/apis/actions.ts
@@ -47,6 +47,7 @@ function createCodingCIJobReq({
   depotId,
   envs = [],
   pipeline,
+  useCITemp = false,
 }: CreateCodingCIJobOptions): CreateCodingCIJobRequest {
   if (!pipeline) {
     pipeline = new Pipeline();
@@ -56,9 +57,16 @@ function createCodingCIJobReq({
     let steps = stage.addSteps();
     steps.addShell('env');
     steps.addShell('date');
-    steps.addShell('echo TENCENT_SECRET_ID=$TENCENT_SECRET_ID > .env');
-    steps.addShell('echo TENCENT_SECRET_KEY=$TENCENT_SECRET_KEY >> .env');
-    steps.addShell('echo TENCENT_TOKEN=$TENCENT_TOKEN >> .env');
+    if (useCITemp) {
+      steps.addShell('echo TENCENT_SECRET_ID=$TENCENT_TEMP_SECRET_ID > .env');
+      steps.addShell('echo TENCENT_SECRET_KEY=$TENCENT_TEMP_SECRET_KEY >> .env');
+      steps.addShell('echo TENCENT_TOKEN=$TENCENT_TEMP_TOKEN >> .env');
+    } else {
+      steps.addShell('echo TENCENT_SECRET_ID=$TENCENT_SECRET_ID > .env');
+      steps.addShell('echo TENCENT_SECRET_KEY=$TENCENT_SECRET_KEY >> .env');
+      steps.addShell('echo TENCENT_TOKEN=$TENCENT_TOKEN >> .env');
+    }
+
     steps.addShell('echo SERVERLESS_PLATFORM_VENDOR=tencent >> .env');
     steps.addShell('echo SERVERLESS_PLATFORM_STAGE=$SERVERLESS_PLATFORM_STAGE >> .env');
 

diff --git a/src/apis/index.ts b/src/apis/index.ts
@@ -29,7 +29,7 @@ async function request(capi: Capi, options: RequestOptions): Promise<any | ApiEr
   try {
     const reqData = cleanEmptyValue(options) as RequestData;
     const res = await capi.request(reqData, {
-      isV3: true,
+      isV3: false,
       debug: false,
       host: 'coding.tencentcloudapi.com',
       RequestClient: 'slsplus_coding',

diff --git a/src/typings/ci-interfaces.d.ts b/src/typings/ci-interfaces.d.ts
@@ -257,6 +257,8 @@ export interface CreateCodingCIJobOptions {
   envs?: CIJobEnv[];
   // for customizing pipeline
   pipeline?: PipelineInterface;
+  // 是否使用 CI 提供的临时密钥作为鉴权信息，默认为 false
+  useCITemp?: boolean;
 }
 
 export interface CreateCodingCIJobRequest {