Get rid of all usages of @octokit/types, and bump the rest of the octokit dependencies to the latest version

plugins/github-actions/src/api/GithubActionsApi.ts

@@ -15,12 +15,7 @@
  */
 
 import { createApiRef } from '@backstage/core';
-import {
-  ActionsListWorkflowRunsForRepoResponseData,
-  ActionsGetWorkflowResponseData,
-  ActionsGetWorkflowRunResponseData,
-  EndpointInterface,
-} from '@octokit/types';
+import { RestEndpointMethodTypes } from '@octokit/rest';
 
 export const githubActionsApiRef = createApiRef<GithubActionsApi>({
   id: 'plugin.githubactions.service',
@@ -42,7 +37,9 @@ export type GithubActionsApi = {
     pageSize?: number;
     page?: number;
     branch?: string;
-  }) => Promise<ActionsListWorkflowRunsForRepoResponseData>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['listWorkflowRuns']['response']['data']
+  >;
   getWorkflow: ({
     token,
     owner,
@@ -53,7 +50,9 @@ export type GithubActionsApi = {
     owner: string;
     repo: string;
     id: number;
-  }) => Promise<ActionsGetWorkflowResponseData>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['getWorkflow']['response']['data']
+  >;
   getWorkflowRun: ({
     token,
     owner,
@@ -64,7 +63,9 @@ export type GithubActionsApi = {
     owner: string;
     repo: string;
     id: number;
-  }) => Promise<ActionsGetWorkflowRunResponseData>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data']
+  >;
   reRunWorkflow: ({
     token,
     owner,
@@ -86,5 +87,7 @@ export type GithubActionsApi = {
     owner: string;
     repo: string;
     runId: number;
-  }) => Promise<EndpointInterface>;
+  }) => Promise<
+    RestEndpointMethodTypes['actions']['downloadJobLogsForWorkflowRun']['response']['data']
+  >;
 };

plugins/github-actions/src/api/GithubActionsClient.ts

@@ -15,13 +15,7 @@
  */
 
 import { GithubActionsApi } from './GithubActionsApi';
-import { Octokit } from '@octokit/rest';
-import {
-  ActionsListWorkflowRunsForRepoResponseData,
-  ActionsGetWorkflowResponseData,
-  ActionsGetWorkflowRunResponseData,
-  EndpointInterface,
-} from '@octokit/types';
+import { Octokit, RestEndpointMethodTypes } from '@octokit/rest';
 
 export class GithubActionsClient implements GithubActionsApi {
   async reRunWorkflow({
@@ -55,7 +49,9 @@ export class GithubActionsClient implements GithubActionsApi {
     pageSize?: number;
     page?: number;
     branch?: string;
-  }): Promise<ActionsListWorkflowRunsForRepoResponseData> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['listWorkflowRuns']['response']['data']
+  > {
     const workflowRuns = await new Octokit({
       auth: token,
     }).actions.listWorkflowRunsForRepo({
@@ -77,7 +73,9 @@ export class GithubActionsClient implements GithubActionsApi {
     owner: string;
     repo: string;
     id: number;
-  }): Promise<ActionsGetWorkflowResponseData> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['getWorkflow']['response']['data']
+  > {
     const workflow = await new Octokit({ auth: token }).actions.getWorkflow({
       owner,
       repo,
@@ -95,7 +93,9 @@ export class GithubActionsClient implements GithubActionsApi {
     owner: string;
     repo: string;
     id: number;
-  }): Promise<ActionsGetWorkflowRunResponseData> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['getWorkflowRun']['response']['data']
+  > {
     const run = await new Octokit({ auth: token }).actions.getWorkflowRun({
       owner,
       repo,
@@ -113,7 +113,9 @@ export class GithubActionsClient implements GithubActionsApi {
     owner: string;
     repo: string;
     runId: number;
-  }): Promise<EndpointInterface> {
+  }): Promise<
+    RestEndpointMethodTypes['actions']['downloadJobLogsForWorkflowRun']['response']['data']
+  > {
     const workflow = await new Octokit({
       auth: token,
     }).actions.downloadJobLogsForWorkflowRun({

plugins/github-actions/src/components/WorkflowRunDetails/WorkflowRunDetails.tsx

@@ -209,8 +209,8 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => {
               </TableCell>
               <TableCell>
                 <WorkflowRunStatus
-                  status={details.value?.status}
-                  conclusion={details.value?.conclusion}
+                  status={details.value?.status || undefined}
+                  conclusion={details.value?.conclusion || undefined}
                 />
               </TableCell>
             </TableRow>
@@ -218,7 +218,7 @@ export const WorkflowRunDetails = ({ entity }: { entity: Entity }) => {
               <TableCell>
                 <Typography noWrap>Author</Typography>
               </TableCell>
-              <TableCell>{`${details.value?.head_commit.author.name} (${details.value?.head_commit.author.email})`}</TableCell>
+              <TableCell>{`${details.value?.head_commit.author?.name} (${details.value?.head_commit.author?.email})`}</TableCell>
             </TableRow>
             <TableRow>
               <TableCell>

plugins/github-actions/src/components/useWorkflowRuns.ts

@@ -18,7 +18,6 @@ import { useAsyncRetry } from 'react-use';
 import { WorkflowRun } from './WorkflowRunsTable/WorkflowRunsTable';
 import { githubActionsApiRef } from '../api/GithubActionsApi';
 import { useApi, githubAuthApiRef, errorApiRef } from '@backstage/core';
-import { ActionsListWorkflowRunsForRepoResponseData } from '@octokit/types';
 
 export function useWorkflowRuns({
   owner,
@@ -55,44 +54,40 @@ export function useWorkflowRuns({
           page: page + 1,
           branch,
         })
-        .then(
-          (
-            workflowRunsData: ActionsListWorkflowRunsForRepoResponseData,
-          ): WorkflowRun[] => {
-            setTotal(workflowRunsData.total_count);
-            // Transformation here
-            return workflowRunsData.workflow_runs.map(run => ({
-              message: run.head_commit.message,
-              id: `${run.id}`,
-              onReRunClick: async () => {
-                try {
-                  await api.reRunWorkflow({
-                    token,
-                    owner,
-                    repo,
-                    runId: run.id,
-                  });
-                } catch (e) {
-                  errorApi.post(e);
-                }
+        .then((workflowRunsData): WorkflowRun[] => {
+          setTotal(workflowRunsData.total_count);
+          // Transformation here
+          return workflowRunsData.workflow_runs.map(run => ({
+            message: run.head_commit.message,
+            id: `${run.id}`,
+            onReRunClick: async () => {
+              try {
+                await api.reRunWorkflow({
+                  token,
+                  owner,
+                  repo,
+                  runId: run.id,
+                });
+              } catch (e) {
+                errorApi.post(e);
+              }
+            },
+            source: {
+              branchName: run.head_branch,
+              commit: {
+                hash: run.head_commit.id,
+                url: run.head_repository.branches_url.replace(
+                  '{/branch}',
+                  run.head_branch,
+                ),
               },
-              source: {
-                branchName: run.head_branch,
-                commit: {
-                  hash: run.head_commit.id,
-                  url: run.head_repository.branches_url.replace(
-                    '{/branch}',
-                    run.head_branch,
-                  ),
-                },
-              },
-              status: run.status,
-              conclusion: run.conclusion,
-              url: run.url,
-              githubUrl: run.html_url,
-            }));
-          },
-        )
+            },
+            status: run.status,
+            conclusion: run.conclusion,
+            url: run.url,
+            githubUrl: run.html_url,
+          }));
+        })
     );
   }, [page, pageSize, repo, owner]);