Merge pull request #497 from snyk/fix/azure-repos-ignore-disabled

fix: ignore disabled azure repos from listing
snyk · Nov 18, 2024 · 89889e0 · 89889e0
2 parents 7c54e54 + 0afee01
commit 89889e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/source-handlers/azure/list-repos.ts b/src/lib/source-handlers/azure/list-repos.ts
@@ -15,6 +15,7 @@ interface AzureReposResponse {
     name: string;
     project: { name: string };
     defaultBranch: string;
+    isDisabled: boolean;
   }[];
 }
 export async function fetchAllRepos(
@@ -61,9 +62,8 @@ async function getRepos(
     Response body: ${JSON.stringify(body)}`);
   }
   const { value: repos } = body;
-  repos.map((repo) => {
-    const { name, project, defaultBranch } = repo;
-    if (name && project && project.name && defaultBranch) {
+  repos.map(({ name, project, defaultBranch, isDisabled }) => {
+    if (name && project && project.name && defaultBranch && !isDisabled) {
       repoList.push({
         name,
         owner: project.name,

diff --git a/test/lib/fixtures/azure/org-repos.json b/test/lib/fixtures/azure/org-repos.json
@@ -58,7 +58,7 @@
       "remoteUrl": "https://dev.azure.com/remoteUrl",
       "sshUrl": "",
       "webUrl": "https://dev.azure.com/remoteUrl",
-      "isDisabled": false
+      "isDisabled": true
     }
   ],
   "count": 3

diff --git a/test/lib/source-handlers/azure/azure.test.ts b/test/lib/source-handlers/azure/azure.test.ts
@@ -70,7 +70,7 @@ describe('Testing azure-devops interaction', () => {
   });
   test('Test listAzureRepos with one page', async () => {
     const repos = await listAzureRepos('reposTestOrg', 'https://azure-tests');
-    expect(repos).toHaveLength(3);
+    expect(repos).toHaveLength(2);
   });
   test('listAzureRepos to fail', async () => {
     expect(async () => {

diff --git a/test/system/orgs:data/gitlab.test.ts b/test/system/orgs:data/gitlab.test.ts
@@ -26,7 +26,7 @@ describe('General `snyk-api-import orgs:data <...>`', () => {
         expect(stderr).toEqual('');
         expect(err).toBeNull();
         expect(stdout).toMatch(
-          'Found 7 group(s). Written the data to file: group-hello-gitlab-orgs.json',
+          'Found 9 group(s). Written the data to file: group-hello-gitlab-orgs.json',
         );
         deleteFiles([
           path.resolve(__dirname, `group-${groupId}-gitlab-orgs.json`),