fix types

Author: jilgue

__tests__/getLabels.test.ts

@@ -10,7 +10,7 @@ const nooctokit = new Octokit({
     auth: '1234567890'
 })
 
-const prNumber = '15'
+const prNumber = 15
 const repoName = 'monom-manifests'
 const owner = 'ThingsO2'
 
@@ -20,7 +20,7 @@ test('get labels', async () => {
 })
 
 test('get labels not found', async () => {
-    const labels = await getLabels(octokit, '99999', repoName, owner)
+    const labels = await getLabels(octokit, 99999, repoName, owner)
     expect(labels).toBeUndefined()
 })
 

__tests__/main.test.ts

@@ -12,7 +12,7 @@ const nooctokit = new Octokit({
 })
 
 const input = {
-    prNumber: '135',
+    prNumber: 135,
     repoName: 'monom-manifests',
     owner: 'ThingsO2'
 }

__tests__/mergePR.test.ts

@@ -10,7 +10,7 @@ const nooctokit = new Octokit({
     auth: '1234567890'
 })
 
-const prNumber = '6'
+const prNumber = 6
 const repoName = 'github-action-close-code-pr'
 const owner = 'ThingsO2'
 
@@ -22,7 +22,7 @@ test('merge PR', async () => {
 })
 
 test('merge PR already merged', async () => {
-    const mergeResult = await mergePR(octokit, '5', repoName, owner)
+    const mergeResult = await mergePR(octokit, 5, repoName, owner)
     expect(mergeResult).toBeUndefined()
 })
 

__tests__/searchCodePR.test.ts

@@ -10,7 +10,7 @@ const nooctokit = new Octokit({
     auth: '1234567890'
 })
 
-const prNumber = '135'
+const prNumber = 135
 const repoName = 'monom-manifests'
 const owner = 'ThingsO2'
 
@@ -22,7 +22,7 @@ test('search code PR', async () => {
 })
 
 test('search code PR not found', async () => {
-    const res = await searchCodePR(octokit, '15', repoName, owner)
+    const res = await searchCodePR(octokit, 15, repoName, owner)
     expect(res).toBeUndefined()
 })
 

src/getLabels.ts

@@ -4,7 +4,7 @@ import { Endpoints } from "@octokit/types"
 
 type listLabelsOnIssueResponse = Endpoints["GET /repos/{owner}/{repo}/issues/{issue_number}/labels"]["response"]
 
-export async function getLabels(octokit: Octokit, prNumber: string, repoName: string, owner: string): Promise<string[] | undefined> {
+export async function getLabels(octokit: Octokit, prNumber: number, repoName: string, owner: string): Promise<string[] | undefined> {
 
     const res = await doRequest(octokit, prNumber, repoName, owner)
 
@@ -15,9 +15,9 @@ export async function getLabels(octokit: Octokit, prNumber: string, repoName: st
     return undefined
 }
 
-async function doRequest(octokit: Octokit, prNumber: string, repoName: string, owner: string): Promise<listLabelsOnIssueResponse> {
+async function doRequest(octokit: Octokit, prNumber: number, repoName: string, owner: string): Promise<listLabelsOnIssueResponse> {
 
-    const request = `GET /repos/${owner}/${repoName}/issues/${prNumber}/labels`
+    const request = "GET /repos/{owner}/{repo}/issues/{issue_number}/labels"
 
     try {
         const {data: res} = await octokit.request(request, {

src/main.ts

@@ -6,7 +6,7 @@ import { searchCodePR } from './searchCodePR'
 import { mergePR } from './mergePR'
 
 interface Input {
-    prNumber: string
+    prNumber: number
     repoName: string
     owner: string
 }
@@ -44,10 +44,11 @@ export const main = (octokit: Octokit, input: Input, merge: boolean): Promise<co
                         return core.ExitCode.Failure
                     }
                     if (merge) {
-                        return mergePR(octokit, codePR.number.toString(), codePR.base.repo.name, owner).then((mergeResult) => {
+                        return mergePR(octokit, codePR.number, codePR.base.repo.name, owner).then((mergeResult) => {
                             core.info(`Merge Result: ${mergeResult}`)
                             if (mergeResult === undefined) {
                                 core.setFailed(`Merge PR failed`)
+                                return core.ExitCode.Failure
                             }
                             return core.ExitCode.Success
                         })
@@ -60,7 +61,7 @@ export const main = (octokit: Octokit, input: Input, merge: boolean): Promise<co
 }
 
 try {
-    const prNumber = core.getInput('pr_number')
+    const prNumber = parseInt(core.getInput('pr_number'))
     const repoName = core.getInput('repo_name')
     const owner = core.getInput('owner')
 

src/mergePR.ts

@@ -4,7 +4,7 @@ import { Endpoints } from "@octokit/types"
 
 type mergePR = Endpoints["PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge"]["response"]
 
-export async function mergePR(octokit: Octokit, prNumber: string, repoName: string, owner: string): Promise<mergePR['data'] | undefined> {
+export async function mergePR(octokit: Octokit, prNumber: number, repoName: string, owner: string): Promise<mergePR['data'] | undefined> {
 
     const res = await doRequest(octokit, prNumber, repoName, owner)
 
@@ -15,8 +15,8 @@ export async function mergePR(octokit: Octokit, prNumber: string, repoName: stri
     return undefined
 }
 
-async function doRequest(octokit: Octokit, prNumber: string, repoName: string, owner: string): Promise<mergePR> {
-    const request = `PUT /repos/${owner}/${repoName}/pulls/${prNumber}/merge`
+async function doRequest(octokit: Octokit, prNumber: number, repoName: string, owner: string): Promise<mergePR> {
+    const request = "PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge"
 
     try {
         const { data: res } = await octokit.request(request, {

src/searchCodePR.ts

@@ -4,7 +4,7 @@ import { Endpoints } from "@octokit/types"
 
 type pullRequest = Endpoints["GET /repos/{owner}/{repo}/pulls/{pull_number}"]["response"]
 
-export async function searchCodePR(octokit: Octokit, prNumber: string, repoName: string, owner: string): Promise<pullRequest['data'] | undefined> {
+export async function searchCodePR(octokit: Octokit, prNumber: number, repoName: string, owner: string): Promise<pullRequest['data'] | undefined> {
 
     const res = await doRequest(octokit, prNumber, repoName, owner)
 
@@ -13,7 +13,7 @@ export async function searchCodePR(octokit: Octokit, prNumber: string, repoName:
         const match = res.data.title.match(re)
         if (match) {
             const originalRepoName = match[1]
-            const originalPrNumber = match[3]
+            const originalPrNumber = parseInt(match[3])
             const original = await doRequest(octokit, originalPrNumber, originalRepoName, owner)
             if (original.status === 200) {
                 return original.data
@@ -24,8 +24,8 @@ export async function searchCodePR(octokit: Octokit, prNumber: string, repoName:
     return undefined
 }
 
-async function doRequest(octokit: Octokit, prNumber: string, repoName: string, owner: string): Promise<pullRequest> {
-    const request = `GET /repos/${owner}/${repoName}/pulls/${prNumber}`
+async function doRequest(octokit: Octokit, prNumber: number, repoName: string, owner: string): Promise<pullRequest> {
+    const request = "GET /repos/{owner}/{repo}/pulls/{pull_number}"
 
     try {
         const {data: res } = await octokit.request(request, {

src/searchPRwithLabels.ts

@@ -16,13 +16,14 @@ export async function searchPRwithLabels(octokit: Octokit, repoName: string, own
 }
 
 async function doRequest(octokit: Octokit, repoName: string, owner: string, labels: string[]): Promise<listIssues> {
-    const request = `GET /repos/${owner}/${repoName}/issues`
+
+    const request = "GET /repos/{owner}/{repo}/issues"
 
     try {
         const {data: res } = await octokit.request(request, {
             owner: owner,
             repo: repoName,
-            labels: labels
+            labels: labels.join(","),
           })
         return {
             data: res,