Merge pull request #352 from snyk-tech-services/feat/timeout-axios

Feat/timeout axios
snyk · Aug 8, 2022 · 77084f4 · 77084f4
2 parents ca4d931 + ddd9988
commit 77084f4
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 76 deletions.
diff --git a/package.json b/package.json
@@ -38,8 +38,8 @@
   ],
   "homepage": "https://github.com/snyk-tech-services/snyk-api-import#readme",
   "dependencies": {
-    "@gitbeaker/core": "35.6.1",
-    "@gitbeaker/node": "35.6.1",
+    "@gitbeaker/core": "35.7.0",
+    "@gitbeaker/node": "35.7.0",
     "@octokit/rest": "18.12.0",
     "@types/base-64": "^1.0.0",
     "base-64": "^1.0.0",
@@ -51,7 +51,7 @@
     "p-map": "4.0.0",
     "parse-link-header": "2.0.0",
     "sleep-promise": "8.0.1",
-    "snyk-request-manager": "1.7.1",
+    "snyk-request-manager": "1.8.0",
     "source-map-support": "^0.5.16",
     "split": "1.0.1",
     "yargs": "16.2.0"

diff --git a/src/lib/api/group/index.ts b/src/lib/api/group/index.ts
@@ -114,13 +114,8 @@ export async function listOrgsPerPage(
     page: pageNumber,
   };
   const orgs = await listOrgs(requestManager, groupId, params);
-  let hasNextPage;
-  if (orgs.length) {
-    hasNextPage = true;
-    data.push(...orgs);
-  } else {
-    hasNextPage = false;
-  }
+  const hasNextPage = orgs.length ? true : false;
+  data.push(...orgs);
   return { orgs: data, hasNextPage };
 }
 

diff --git a/src/lib/source-handlers/github/list-repos.ts b/src/lib/source-handlers/github/list-repos.ts
@@ -23,22 +23,18 @@ export async function fetchReposForPage(
   };
   const res = await octokit.repos.listForOrg(params);
   const repos = res && res.data;
-  let hasNextPage;
-  if (repos.length) {
-    hasNextPage = true;
-    repoData.push(
-      ...repos
-        .filter((repo) => !repo.archived)
-        .map((repo) => ({
-          fork: repo.fork,
-          name: repo.name,
-          owner: repo.owner?.login,
-          branch: repo.default_branch,
-        })),
-    );
-  } else {
-    hasNextPage = false;
-  }
+  const hasNextPage = repos.length ? true : false;
+  repoData.push(
+    ...repos
+      .filter((repo) => !repo.archived)
+      .map((repo) => ({
+        fork: repo.fork,
+        name: repo.name,
+        owner: repo.owner?.login,
+        branch: repo.default_branch,
+      })),
+  );
+
   return { repos: repoData, hasNextPage };
 }
 

diff --git a/src/lib/source-handlers/gitlab/list-groups.ts b/src/lib/source-handlers/gitlab/list-groups.ts
@@ -20,22 +20,16 @@ async function fetchOrgsForPage(
     perPage: 100,
     page: pageNumber,
   };
-  let hasNextPage;
-
   const orgs = await client.Groups.all(params);
-  if (orgs.length) {
-    hasNextPage = true;
+  const hasNextPage = orgs.length ? true : false;
+  orgsData.push(
+    ...orgs.map((org: any) => ({
+      name: org.full_path,
+      id: org.id,
+      url: org.web_url,
+    })),
+  );
 
-    orgsData.push(
-      ...orgs.map((org: any) => ({
-        name: org.full_path,
-        id: org.id,
-        url: org.web_url,
-      })),
-    );
-  } else {
-    hasNextPage = false;
-  }
   return {
     orgs: orgsData,
     hasNextPage,

diff --git a/src/lib/source-handlers/gitlab/list-repos.ts b/src/lib/source-handlers/gitlab/list-repos.ts
@@ -3,13 +3,13 @@ import * as debugLib from 'debug';
 import { getToken } from './get-token';
 
 import { getBaseUrl } from './get-base-url';
-import * as types from '@gitbeaker/core/dist/types';
+import * as gitBeakerTypes from '@gitbeaker/core';
 import { GitlabRepoData } from './types';
 
 const debug = debugLib('snyk:list-repos-script');
 
 export async function fetchGitlabReposForPage(
-  client: types.Gitlab,
+  client: gitBeakerTypes.Gitlab,
   groupName: string,
   pageNumber = 1,
   perPage = 100,
@@ -23,42 +23,41 @@ export async function fetchGitlabReposForPage(
     perPage,
     page: pageNumber,
   };
-  const projects = await client.Groups.projects(groupName, params);
-  let hasNextPage;
-  if (projects.length) {
-    hasNextPage = true;
-    repoData.push(
-      ...projects
-        .filter((project) => {
-          const {
-            archived,
-            shared_with_groups,
-            default_branch,
-          } = project as types.Types.ProjectExtendedSchema;
-          if (
-            archived ||
-            !default_branch ||
-            (shared_with_groups && shared_with_groups.length > 0)
-          ) {
-            return false;
-          }
-          return true;
-        })
-        .map((project) => ({
-          fork: !!project.forked_from_project,
-          name: project.path_with_namespace,
-          id: project.id,
-          branch: project.default_branch,
-        })),
-    );
-  } else {
-    hasNextPage = false;
+  const projects = (await client.Groups.projects(
+    groupName,
+    params,
+  )) as gitBeakerTypes.Types.ProjectExtendedSchema[];
+  const hasNextPage = projects.length ? true : false;
+
+  for (const project of projects) {
+    const {
+      archived,
+      shared_with_groups,
+      default_branch,
+      forked_from_project,
+      path_with_namespace,
+      id,
+    } = project;
+    if (
+      archived ||
+      !default_branch ||
+      (shared_with_groups && shared_with_groups.length > 0)
+    ) {
+      continue;
+    }
+
+    repoData.push({
+      fork: forked_from_project ? true : false,
+      name: path_with_namespace,
+      id,
+      branch: default_branch,
+    });
   }
   return { repos: repoData, hasNextPage };
 }
 
 async function fetchAllRepos(
-  client: types.Gitlab,
+  client: gitBeakerTypes.Gitlab,
   groupName: string,
   page = 0,
 ): Promise<GitlabRepoData[]> {

diff --git a/src/lib/source-handlers/gitlab/types.ts b/src/lib/source-handlers/gitlab/types.ts
@@ -1,5 +1,5 @@
 export interface GitlabRepoData {
-  // fork: boolean;
+  fork: boolean;
   branch: string;
   id: number;
   name: string;

diff --git a/test/scripts/generate-targets-data.test.ts b/test/scripts/generate-targets-data.test.ts
@@ -17,7 +17,7 @@ describe('generateTargetsImportDataFile Github script', () => {
   });
   it('generate Github repo data', async () => {
     process.env.GITHUB_TOKEN = process.env.GH_TOKEN;
-    filesToDelete.push(path.resolve(__dirname + '/github-import-targets.json'));
+    filesToDelete.push(path.resolve(__dirname + '/github-enterprise-import-targets.json'));
     const orgsData: CreatedOrg[] = [
       {
         orgId: 'org-id',
@@ -54,7 +54,7 @@ describe('generateTargetsImportDataFile Github script', () => {
   it('generate Github Enterprise repo data', async () => {
     process.env.GITHUB_TOKEN = process.env.TEST_GHE_TOKEN;
     const GHE_URL = process.env.TEST_GHE_URL;
-    filesToDelete.push(path.resolve(__dirname + '/github-import-targets.json'));
+    filesToDelete.push(path.resolve(__dirname + '/github-enterprise-import-targets.json'));
     const orgsData: CreatedOrg[] = [
       {
         orgId: 'org-id',