Merge pull request #63 from snyk-labs/develop

release fix
snyk-labs · Jun 22, 2023 · 03f77f4 · 03f77f4
2 parents 3467d81 + c367417
commit 03f77f4
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 28 deletions.
diff --git a/src/lib/client/abstraction/org/projects.ts b/src/lib/client/abstraction/org/projects.ts
@@ -54,7 +54,7 @@ export const getV3 = async (
         v1TypedResult.projects?.push({
           id: resultSet[page][i].id,
           name: resultSet[page][i].attributes.name,
-          type: resultSet[page][i].type,
+          type: resultSet[page][i].attributes.type,
           origin: resultSet[page][i].attributes.origin,
           created: resultSet[page][i].attributes.created.toString(),
           testFrequency:

diff --git a/test/fixtures/abstraction/org/projectsV3toV1.json b/test/fixtures/abstraction/org/projectsV3toV1.json
@@ -3,7 +3,7 @@
     {
       "id": "7c62c3bd-539a-4ee6-b1a0-1f3b5196849b",
       "name": "snyk-tech-services/snyk-delta:package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "github",
       "created": "2023-01-10T16:37:37.804Z",
       "testFrequency": "daily",
@@ -14,7 +14,7 @@
     {
       "id": "db066cb9-b373-46da-b918-b49b541e0d63",
       "name": "antoine-snyk-demo/TestRepoAntoine",
-      "type": "project",
+      "type": "sast",
       "origin": "bitbucket-server",
       "created": "2023-01-10T14:10:03.186Z",
       "testFrequency": "weekly",
@@ -25,7 +25,7 @@
     {
       "id": "0cc9d21b-4ac7-4f27-8c6a-b32b4cdf5c68",
       "name": "Snyk Demo/java-goof",
-      "type": "project",
+      "type": "sast",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:49:49.395Z",
       "testFrequency": "weekly",
@@ -36,7 +36,7 @@
     {
       "id": "38e02916-0cf7-4927-ba98-06afae9fef36",
       "name": "Snyk Demo/java-goof:todolist-web-struts/pom.xml",
-      "type": "project",
+      "type": "maven",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:49:42.637Z",
       "testFrequency": "daily",
@@ -47,7 +47,7 @@
     {
       "id": "019e3f03-5230-4d4f-9326-2fdc7161016f",
       "name": "Snyk Demo/java-goof:todolist-core/pom.xml",
-      "type": "project",
+      "type": "maven",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:49:42.616Z",
       "testFrequency": "daily",
@@ -58,7 +58,7 @@
     {
       "id": "4737fc9c-3894-40ba-9dc5-aa8ae658c9f6",
       "name": "Snyk Demo/java-goof:todolist-web-common/pom.xml",
-      "type": "project",
+      "type": "maven",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:49:42.572Z",
       "testFrequency": "daily",
@@ -69,7 +69,7 @@
     {
       "id": "7ae91d60-d686-4035-b94e-32159359b253",
       "name": "jeff-snyk-demo/java-goof",
-      "type": "project",
+      "type": "sast",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:43:11.924Z",
       "testFrequency": "weekly",
@@ -80,7 +80,7 @@
     {
       "id": "f3b2e1cf-69e2-4fab-89a0-b17e0979abc6",
       "name": "jeff-snyk-demo/java-goof:todolist-web-struts/pom.xml",
-      "type": "project",
+      "type": "maven",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:42:20.990Z",
       "testFrequency": "daily",
@@ -91,7 +91,7 @@
     {
       "id": "b9046a1a-3e69-4d21-a6d2-c71f649cb7b5",
       "name": "jeff-snyk-demo/java-goof:todolist-web-common/pom.xml",
-      "type": "project",
+      "type": "maven",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:42:20.894Z",
       "testFrequency": "daily",
@@ -102,7 +102,7 @@
     {
       "id": "b4d24542-e0ee-4166-80bc-cd474c2bc968",
       "name": "jeff-snyk-demo/java-goof:todolist-core/pom.xml",
-      "type": "project",
+      "type": "maven",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:42:20.782Z",
       "testFrequency": "daily",
@@ -113,7 +113,7 @@
     {
       "id": "377585da-e344-4938-a0af-126d27eb16ec",
       "name": "antoine-snyk-demo/testOrgana",
-      "type": "project",
+      "type": "sast",
       "origin": "bitbucket-server",
       "created": "2023-01-10T13:25:59.163Z",
       "testFrequency": "weekly",
@@ -124,7 +124,7 @@
     {
       "id": "0f6028ea-8abd-4c31-8dcc-3973dc3c8c47",
       "name": "antoine-snyk-demo/TestRepoAntoine:GoofieSubFolder/package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "bitbucket-server",
       "created": "2023-01-10T12:43:26.082Z",
       "testFrequency": "daily",
@@ -135,7 +135,7 @@
     {
       "id": "ac7c3f02-5ef4-4123-9d13-88a8f89dd821",
       "name": "antoine-snyk-demo/TestRepoAntoine:goof/package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "bitbucket-server",
       "created": "2023-01-10T12:43:25.935Z",
       "testFrequency": "daily",
@@ -146,7 +146,7 @@
     {
       "id": "9f803629-6836-4f1f-82d7-93765df5c794",
       "name": "antoine-snyk-demo/testOrgana:pom.xml",
-      "type": "project",
+      "type": "maven",
       "origin": "bitbucket-server",
       "created": "2023-01-10T12:43:21.306Z",
       "testFrequency": "daily",
@@ -157,7 +157,7 @@
     {
       "id": "5634c570-cfd4-4964-b96f-42cc54c39e61",
       "name": "aarlaud-playground/python-flask-sample-app",
-      "type": "project",
+      "type": "sast",
       "origin": "github",
       "created": "2023-01-05T23:39:41.297Z",
       "testFrequency": "weekly",
@@ -168,7 +168,7 @@
     {
       "id": "70c8adbd-18cb-4b4f-8200-16e8c458839e",
       "name": "aarlaud-playground/python-flask-sample-app:Dockerfile",
-      "type": "project",
+      "type": "dockerfile",
       "origin": "github",
       "created": "2023-01-05T23:36:30.682Z",
       "testFrequency": "daily",
@@ -179,7 +179,7 @@
     {
       "id": "048e7057-bd8d-4868-a2db-8db7b0918581",
       "name": "github-stats",
-      "type": "project",
+      "type": "npm",
       "origin": "cli",
       "created": "2021-10-21T11:43:42.450Z",
       "testFrequency": "daily",
@@ -190,7 +190,7 @@
     {
       "id": "175d3317-e43e-4046-b23b-422e2a2da6db",
       "name": "github-stats",
-      "type": "project",
+      "type": "npm",
       "origin": "cli",
       "created": "2019-10-28T14:27:09.573Z",
       "testFrequency": "daily",
@@ -201,7 +201,7 @@
     {
       "id": "3b96638d-0611-4184-9746-0431cee363c4",
       "name": "snyk-filter",
-      "type": "project",
+      "type": "npm",
       "origin": "cli",
       "created": "2019-10-10T19:37:21.928Z",
       "testFrequency": "daily",
@@ -212,7 +212,7 @@
     {
       "id": "c19ad262-4100-4918-b9be-ad361904e9b8",
       "name": "/Users/antoine/Documents/dev/Snyk/licenseTextAndCopyrightBOM:go.mod",
-      "type": "project",
+      "type": "gomodules",
       "origin": "cli",
       "created": "2019-08-14T01:36:44.431Z",
       "testFrequency": "daily",
@@ -223,7 +223,7 @@
     {
       "id": "6200ee2a-7a57-49ea-9694-6f694e09564a",
       "name": "aarlaud-snyk/snyk-jar-scan:package.json",
-      "type": "project",
+      "type": "yarn",
       "origin": "github",
       "created": "2018-10-21T03:17:46.799Z",
       "testFrequency": "daily",
@@ -234,7 +234,7 @@
     {
       "id": "7439e322-f9c1-4c42-8367-002b33b9d946",
       "name": "aarlaud-snyk/gitlab-stats:package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "github",
       "created": "2018-06-22T17:41:23.633Z",
       "testFrequency": "daily",
@@ -245,7 +245,7 @@
     {
       "id": "994beb01-b69e-449b-afa9-17764b7d9c09",
       "name": "aarlaud-snyk/angularSnykScanner:package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "github",
       "created": "2018-05-03T21:31:06.135Z",
       "testFrequency": "daily",
@@ -256,7 +256,7 @@
     {
       "id": "14e85ea8-e34c-4aff-865c-ae95ad4ed351",
       "name": "aarlaud-snyk/angularSnykScanner:templates/package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "github",
       "created": "2018-05-03T21:31:06.115Z",
       "testFrequency": "daily",
@@ -267,7 +267,7 @@
     {
       "id": "0f376a8b-8590-40de-8388-24fa99b406a5",
       "name": "aarlaud-snyk/angularSnykScanner:tmp/package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "github",
       "created": "2018-05-03T21:31:06.104Z",
       "testFrequency": "daily",
@@ -278,7 +278,7 @@
     {
       "id": "26e10cce-7279-4583-8be7-2d4f4c82a0ca",
       "name": "aarlaud-snyk/snyk-filter:package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "github",
       "created": "2018-03-22T00:43:40.538Z",
       "testFrequency": "daily",
@@ -289,7 +289,7 @@
     {
       "id": "afd64e9a-e96a-4049-83ce-ceed670dde4f",
       "name": "aarlaud-snyk/github-stats:package.json",
-      "type": "project",
+      "type": "npm",
       "origin": "github",
       "created": "2018-02-03T23:02:21.713Z",
       "testFrequency": "daily",