fix: Fix Octokit not using github_token (#51)

Signed-off-by: Oğuzhan Durgun <[email protected]>
cerbos · Feb 17, 2023 · 8fec844 · 8fec844
1 parent 3ed5633
commit 8fec844
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 51 deletions.
diff --git a/__tests__/get-url-to-download.test.ts b/__tests__/get-url-to-download.test.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {expect, test} from '@jest/globals'
+import {Octokit} from '@octokit/core'
 import getURLToDownload from './../src/get-url-to-download'
 import {createRunningEnvironment} from './test-utils.test'
 
@@ -33,11 +34,12 @@ test('test getURLToDownload()', async () => {
     }
   ]
 
+  const octokit = new Octokit({})
   for (const testCase of testCases) {
     const url = await getURLToDownload(
+      octokit,
       testCase.inputRunningEnvironment,
-      testCase.inputVersion,
-      ''
+      testCase.inputVersion
     )
 
     console.log(

diff --git a/__tests__/get-version.test.ts b/__tests__/get-version.test.ts
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import {expect, test} from '@jest/globals'
+import {Octokit} from '@octokit/core'
 import getVersion from './../src/get-version'
 
 test('test getVersion()', async () => {
@@ -16,8 +17,9 @@ test('test getVersion()', async () => {
     {input: 'latest', unexpected: undefined}
   ]
 
+  const octokit = new Octokit({})
   for (const testCase of testCasesWithExpected) {
-    const version = await getVersion(testCase.input)
+    const version = await getVersion(octokit, testCase.input)
 
     console.log(
       `Test Case - Input ${testCase.input} - Expected ${testCase.expected} - Actual ${version}`
@@ -27,7 +29,7 @@ test('test getVersion()', async () => {
   }
 
   for (const testCase of testCasesWithUnexpected) {
-    const version = await getVersion(testCase.input)
+    const version = await getVersion(octokit, testCase.input)
 
     console.log(
       `Test Case - Input ${testCase.input} - Unexpected ${testCase.unexpected} - Actual ${version}`

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/get-url-to-download.ts b/src/get-url-to-download.ts
@@ -3,27 +3,14 @@
 
 import * as core from '@actions/core'
 import {Octokit} from '@octokit/core'
-import {HttpsProxyAgent} from 'https-proxy-agent'
 import {RunningEnvironment} from './get-running-environment'
 
 async function getURLToDownload(
+  octokit: Octokit,
   runningEnvironment: RunningEnvironment,
-  version: string,
-  githubToken: string
+  version: string
 ): Promise<string> {
   const assetName = `cerbos_${version}_${runningEnvironment.os}_${runningEnvironment.architecture}.tar.gz`
-  const requestAgent = process.env.http_proxy
-    ? new HttpsProxyAgent(process.env.http_proxy)
-    : undefined
-  const octokit = new Octokit({
-    auth: githubToken,
-    request: {
-      agent: requestAgent
-    },
-    userAgent: process.env['GITHUB_REPOSITORY']
-      ? process.env['GITHUB_REPOSITORY']
-      : 'cerbos-setup-action'
-  })
   const {data: releases} = await octokit.request(
     'GET /repos/{owner}/{repo}/releases',
     {

diff --git a/src/get-version.ts b/src/get-version.ts
@@ -3,10 +3,11 @@
 
 import {Octokit} from '@octokit/core'
 
-async function getVersion(inputVersion: string): Promise<string> {
+async function getVersion(
+  octokit: Octokit,
+  inputVersion: string
+): Promise<string> {
   if (inputVersion === '' || inputVersion === 'latest') {
-    const octokit = new Octokit()
-
     const {data: release} = await octokit.request(
       'GET /repos/{owner}/{repo}/releases/latest',
       {

diff --git a/src/main.ts b/src/main.ts
@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import * as core from '@actions/core'
+import {Octokit} from '@octokit/core'
+import {HttpsProxyAgent} from 'https-proxy-agent'
 import downloadAndCache from './download-and-cache'
 import getRunningEnvironment from './get-running-environment'
 import getURLToDownload from './get-url-to-download'
@@ -22,13 +24,21 @@ async function run(): Promise<void> {
   const runningEnvironment = await getRunningEnvironment()
   await validate(runningEnvironment)
 
-  const version = await getVersion(inputVersion)
-
-  const url = await getURLToDownload(
-    runningEnvironment,
-    version,
-    inputGitHubToken
-  )
+  const requestAgent = process.env.http_proxy
+    ? new HttpsProxyAgent(process.env.http_proxy)
+    : undefined
+  const octokit = new Octokit({
+    auth: inputGitHubToken,
+    request: {
+      agent: requestAgent
+    },
+    userAgent: process.env['GITHUB_REPOSITORY']
+      ? process.env['GITHUB_REPOSITORY']
+      : 'cerbos-setup-action'
+  })
+
+  const version = await getVersion(octokit, inputVersion)
+  const url = await getURLToDownload(octokit, runningEnvironment, version)
 
   await downloadAndCache(url, version)
 }