Merge branch 'main' into migration

bytebase · Mar 13, 2024 · 0c5ddbd · 0c5ddbd
2 parents 683a910 + cf90e7e
commit 0c5ddbd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.github/actions/search-issue/action.yml b/.github/actions/search-issue/action.yml
@@ -9,6 +9,8 @@ inputs:
   token:
     description: "The API token obtained from bytebase/login action"
     required: true
+  headers:
+    description: 'JSON string of extra headers to include in the request. e.g Cloudflare Zero Trust headers {"CF-Access-Client-Id": "xxx", CF-Access-Client-Secret: "xxx"}'
   project-id:
     description: "The project ID. Example: example"
     required: true

diff --git a/.github/actions/upsert-issue/dist/index.js b/.github/actions/upsert-issue/dist/index.js
@@ -66,7 +66,7 @@ function run() {
         const description = core.getInput("description", { required: true });
         const assignee = core.getInput("assignee");
         const extraHeaders = core.getInput('headers');
-        let headers = extraHeaders ? JSON.parse(extraHeaders) : {};
+        headers = extraHeaders ? JSON.parse(extraHeaders) : {};
         headers = Object.assign({ "Content-Type": "application/json", 'Authorization': `Bearer ${token}` }, headers);
         projectUrl = `${url}/v1/projects/${projectId}`;
         const githubContext = github.context;

diff --git a/.github/actions/upsert-issue/index.ts b/.github/actions/upsert-issue/index.ts
@@ -37,7 +37,7 @@ async function run(): Promise<void> {
   const assignee = core.getInput("assignee")
   const extraHeaders: string = core.getInput('headers');
 
-  let headers: HeadersInit = extraHeaders ? JSON.parse(extraHeaders) : {};
+  headers = extraHeaders ? JSON.parse(extraHeaders) : {};
   headers = {
     "Content-Type": "application/json",
     'Authorization': `Bearer ${token}`,