squash: removing comments and todos

Author: lholmquist

workspaces/bulk-import/plugins/bulk-import-backend/src/gitlab/GitlabAppManager.test.ts

@@ -22,34 +22,9 @@ import {
   CustomSingleInstanceGitlabCredentialsProvider,
 } from './GitlabAppManager';
 
-const octokit = {
-  paginate: async (fn: any) => (await fn()).data,
-  apps: {
-    listInstallations: jest.fn(),
-    listReposAccessibleToInstallation: jest.fn(),
-    createInstallationAccessToken: jest.fn(),
-  },
-};
-
-function createOctokit() {
-  return octokit;
-}
-
-jest.mock('@octokit/rest', () => {
-  return { Octokit: createOctokit };
-});
-
 describe('CustomSingleInstanceGithubCredentialsProvider tests', () => {
-  // let gitlab: ExtendedGitlabCredentialsProvider;
-
   beforeEach(() => {
     jest.resetAllMocks();
-    // gitlab = CustomSingleInstanceGitlabCredentialsProvider.create({
-    //   host: 'gitlab.com',
-    //   token: 'hardcoded_token',
-    //   apiBaseUrl: '',
-    //   baseUrl: 'http://gitlab.com',
-    // });
   });
 
   describe('CustomSingleInstanceGithubCredentialsProvider #GetAllCredentials Tests', () => {

workspaces/bulk-import/plugins/bulk-import-backend/src/gitlab/gitlabApiService.test.ts

@@ -213,30 +213,6 @@ describe('GitlabApiService tests', () => {
   });
 
   it('returns list of errors if they occur during the repository fetch phase', async () => {
-    // octokit.rest.users.getByUsername.mockImplementationOnce(async () => {
-    //   const githubDownError = new Error(
-    //     "The Unicorns have taken over. We're doing our best to get them under control and get Github back up and running",
-    //   );
-    //   githubDownError.name = '503 Service Unavailable';
-    //   throw githubDownError;
-    // });
-    // octokit.rest.repos.listForAuthenticatedUser.mockImplementationOnce(
-    //   async () => {
-    //     const customError = new Error('This is taking quite a while');
-    //     customError.name = '504 Gateway Timeout';
-    //     throw customError;
-    //   },
-    // );
-    // octokit.apps.listReposAccessibleToInstallation
-    //   .mockImplementationOnce(async () => {
-    //     const unauthorizedError = new Error('Bad credentials');
-    //     unauthorizedError.name = '401 Unauthorized';
-    //     throw unauthorizedError;
-    //   })
-    //   .mockReturnValue({
-    //     data: ghRepos,
-    //   });
-
     gitlabkit.Projects.all.mockImplementationOnce(async () => {
       const unauthorizedError = new Error('401 Unauthorized');
       unauthorizedError.name = '401 Unauthorized';

workspaces/bulk-import/plugins/bulk-import-backend/src/gitlab/utils/repoUtils.ts

@@ -25,7 +25,6 @@ import type {
 import gitUrlParse from 'git-url-parse';
 
 import { getBranchName } from '../../catalog/catalogUtils';
-// import { logErrorIfNeeded } from '../../helpers';
 import {
   DefaultPageNumber,
   DefaultPageSize,
@@ -154,7 +153,7 @@ export async function addGitlabTokenRepositories(
       /**
        * The Projects.all method with the membership: true option will grab all the repositories/projects the gitlab token has explicit access to.
        * These would include repositories they own, repositories where they are a collaborator,
-       * and repositories that they can access through an organization membership(TODO: see if that is true in gitlab).
+       * and repositories that they can access through an organization membership.
        */
       const { data, paginationInfo } = await gitlab.Projects.all({
         membership: true,

workspaces/bulk-import/plugins/bulk-import-backend/src/gitlab/utils/utils.ts

@@ -101,30 +101,6 @@ export async function getCredentialsForConfig(
   });
 }
 
-// export async function extractConfigAndCreds(
-//   githubCredentialsProvider: CustomGithubCredentialsProvider,
-//   integrations: ScmIntegrations,
-//   input: {
-//     repoUrl: string;
-//     defaultBranch?: string;
-//   },
-// ) {
-//   const ghConfig = integrations.github.byUrl(input.repoUrl)?.config;
-//   if (!ghConfig) {
-//     throw new Error(`Could not find GH integration from ${input.repoUrl}`);
-//   }
-
-//   const credentials = await githubCredentialsProvider.getAllCredentials({
-//     host: ghConfig.host,
-//   });
-//   if (credentials.length === 0) {
-//     throw new Error(`No credentials for GH integration`);
-//   }
-
-//   const gitUrl = gitUrlParse(input.repoUrl);
-//   return { ghConfig, credentials, gitUrl };
-// }
-
 export function handleError(
   deps: {
     logger: LoggerService;

workspaces/bulk-import/plugins/bulk-import-backend/src/service/handlers/import/bulkImports.ts

@@ -307,9 +307,12 @@ async function createPR(
       (await catalogInfoGenerator.generateDefaultCatalogInfoContent(
         req.repository.url,
       )),
-    prTitle: req[req.approvalTool === 'GITLAB' ? 'gitlab' : 'github']?.pullRequest?.title ?? `Add ${catalogFileName}`,
+    prTitle:
+      req[req.approvalTool === 'GITLAB' ? 'gitlab' : 'github']?.pullRequest
+        ?.title ?? `Add ${catalogFileName}`,
     prBody:
-      req[req.approvalTool === 'GITLAB' ? 'gitlab' : 'github']?.pullRequest?.body ??
+      req[req.approvalTool === 'GITLAB' ? 'gitlab' : 'github']?.pullRequest
+        ?.body ??
       `
 This pull request adds a **Backstage entity metadata file** to this repository so that the component can be added to a Backstage application.
 
@@ -347,7 +350,10 @@ async function handleAddedReposFromCreateImportJobs(
     if (!hasLocation) {
       continue;
     }
-    const gitApiService = req.approvalTool === 'GITLAB' ? deps.gitlabApiService : deps.githubApiService;
+    const gitApiService =
+      req.approvalTool === 'GITLAB'
+        ? deps.gitlabApiService
+        : deps.githubApiService;
     const hasCatalogInfoFileInRepo = await gitApiService.hasFileInRepo({
       repoUrl: req.repository.url,
       defaultBranch: req.repository.defaultBranch,
@@ -400,7 +406,10 @@ async function handlePrCreationRequest(
     req.repository.url,
     req.repository.defaultBranch,
   );
-  const gitApiService = req.approvalTool === 'GITLAB' ? deps.gitlabApiService : deps.githubApiService;
+  const gitApiService =
+    req.approvalTool === 'GITLAB'
+      ? deps.gitlabApiService
+      : deps.githubApiService;
   const prToRepo = await createPR(
     gitApiService,
     deps.logger,
@@ -411,7 +420,6 @@ async function handlePrCreationRequest(
   );
   if (prToRepo.errors && prToRepo.errors.length > 0) {
     return {
-      // TODO: should approvalTool be a param
       errors: prToRepo.errors,
       status: 'PR_ERROR',
       repository: req.repository,
@@ -435,7 +443,6 @@ async function handlePrCreationRequest(
       req.repository.defaultBranch,
     );
     return {
-      // TODO: should approvalTool be a param
       status: 'ADDED',
       lastUpdate: prToRepo.lastUpdate,
       repository: {
@@ -447,7 +454,6 @@ async function handlePrCreationRequest(
   }
 
   return {
-    // TODO: should approvalTool be a param
     approvalTool: req.approvalTool ?? 'GIT',
     errors: prToRepo.errors,
     status: 'WAIT_PR_APPROVAL',
@@ -457,7 +463,6 @@ async function handlePrCreationRequest(
       name: gitUrl.name,
       organization: gitUrl.organization,
     },
-    //TODO: also add gitlab based on ApprovalTool?
     [req.approvalTool === 'GITLAB' ? 'gitlab' : 'github']: {
       pullRequest: {
         url: prToRepo.prUrl,
@@ -528,7 +533,6 @@ export async function createImportJobs(
       result.push(await handlePrCreationRequest(deps, req, gitUrl));
     } catch (error: any) {
       result.push({
-        // TODO: should approvalTool be a param
         errors: [error.message],
         status: 'PR_ERROR',
         repository: {
@@ -572,7 +576,6 @@ async function dryRunCreateImportJobs(
       );
     }
     result.push({
-      // TODO: should approvalTool be a param
       errors: dryRunChecks.dryRunStatuses,
       catalogEntityName: req.catalogEntityName,
       repository: {
@@ -611,7 +614,10 @@ async function performDryRunChecks(
     return {};
   };
 
-  const gitApiService = req.approvalTool === 'GITLAB' ? deps.gitlabApiService : deps.githubApiService;
+  const gitApiService =
+    req.approvalTool === 'GITLAB'
+      ? deps.gitlabApiService
+      : deps.githubApiService;
   const checkEmptyRepo = async (): Promise<{
     dryRunStatuses?: CreateImportDryRunStatus[];
     errors?: string[];
@@ -648,7 +654,8 @@ async function performDryRunChecks(
     dryRunStatuses?: CreateImportDryRunStatus[];
     errors?: string[];
   }> => {
-    const gitDirLocation = req.approvalTool === 'GITLAB' ? '.gitlab' : '.github';
+    const gitDirLocation =
+      req.approvalTool === 'GITLAB' ? '.gitlab' : '.github';
     const exists = await gitApiService.hasFileInRepo({
       repoUrl: req.repository.url,
       defaultBranch: req.repository.defaultBranch,
@@ -774,7 +781,7 @@ export async function findImportStatusByRepo(
         body: openImportPr.prBody,
         catalogInfoContent: openImportPr.prCatalogInfoContent,
       },
-    }
+    };
 
     result.lastUpdate = openImportPr.lastUpdate;
   } catch (error: any) {

workspaces/bulk-import/plugins/bulk-import-backend/src/service/handlers/organization/organizations.ts

@@ -68,7 +68,6 @@ export async function findAllOrganizations(
   // sorting the output to make it deterministic and easy to navigate in the UI
   const organizations = sortOrgs(orgMap);
 
-  // TODO: Add the approvalTool?
   return {
     statusCode: 200,
     responseBody: {