@jupiterone/integration-sdk-cli 11.0.0 → 11.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/integration-sdk-cli",
-  "version": "11.0.0",
+  "version": "11.0.3",
   "description": "The SDK for developing JupiterOne integrations",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -25,8 +25,8 @@
   },
   "dependencies": {
     "@jupiterone/data-model": "^0.54.0",
-    "@jupiterone/integration-sdk-core": "^11.0.0",
-    "@jupiterone/integration-sdk-runtime": "^11.0.0",
+    "@jupiterone/integration-sdk-core": "^11.0.3",
+    "@jupiterone/integration-sdk-runtime": "^11.0.3",
     "chalk": "^4",
     "commander": "^9.4.0",
     "fs-extra": "^10.1.0",
@@ -40,11 +40,10 @@
     "plop": "^3.1.2",
     "runtypes": "5.1.0",
     "upath": "^1.2.0",
-    "url-exists": "^1.0.3",
-    "vis": "^4.21.0-EOL"
+    "url-exists": "^1.0.3"
   },
   "devDependencies": {
-    "@jupiterone/integration-sdk-private-test-utils": "^11.0.0",
+    "@jupiterone/integration-sdk-private-test-utils": "^11.0.3",
     "@pollyjs/adapter-node-http": "^6.0.5",
     "@pollyjs/core": "^6.0.5",
     "@pollyjs/persister-fs": "^6.0.5",
@@ -54,7 +53,8 @@
     "@types/lodash": "^4.14.158",
     "@types/vis": "^4.21.20",
     "memfs": "^3.2.0",
-    "neo-forgery": "^2.0.0"
+    "neo-forgery": "^2.0.0",
+    "vis": "^4.21.0-EOL"
   },
-  "gitHead": "628e133a3ba1564d12736c1ba3654ee78dcc93e3"
+  "gitHead": "56969b96de598bbf0cc0299aec264f488d14d4b1"
 }

package/src/commands/visualize-types.ts

@@ -1,7 +1,7 @@
 import { createCommand } from 'commander';
 import { promises as fs } from 'fs';
 import * as path from 'path';
-import { Edge, Node, Options } from 'vis';
+import type { Edge, Node, Options } from 'vis';
 
 import {
   RelationshipDirection,

package/src/utils/generateVisHTML.ts

@@ -1,5 +1,5 @@
 import { defaultsDeep } from 'lodash';
-import { Node, Edge, Options } from 'vis';
+import type { Node, Edge, Options } from 'vis';
 
 export const nothingToDisplayMessage = 'There was no data found to visualize.';
 

package/src/utils/getSortedJupiterOneTypes.test.ts

@@ -6,8 +6,11 @@ import {
   StepMappedRelationshipMetadata,
   StepRelationshipMetadata,
 } from '@jupiterone/integration-sdk-core';
-import { collectGraphObjectMetadataFromSteps } from './getSortedJupiterOneTypes';
 import { randomUUID as uuid } from 'crypto';
+import {
+  alphabetizeMetadataProperties,
+  collectGraphObjectMetadataFromSteps,
+} from './getSortedJupiterOneTypes';
 
 function createIntegrationStep({
   entities = [],
@@ -214,3 +217,63 @@ describe('collectGraphObjectMetadataFromSteps', () => {
     });
   });
 });
+
+describe('alphabetizeMetadataProperties', () => {
+  it('should correctly sort an array of StepRelationshipMetadata', () => {
+    const { relationships } = alphabetizeMetadataProperties(
+      collectGraphObjectMetadataFromSteps([
+        createIntegrationStep({
+          relationships: [
+            {
+              _type: 'aws_account_has_service',
+              sourceType: 'aws_account',
+              _class: RelationshipClass.HAS,
+              targetType: 'aws_waf',
+            },
+          ],
+        }),
+        createIntegrationStep({
+          relationships: [
+            {
+              _type: 'aws_account_owns_service',
+              sourceType: 'aws_account',
+              _class: RelationshipClass.OWNS,
+              targetType: 'aws_apigateway',
+            },
+          ],
+        }),
+        createIntegrationStep({
+          relationships: [
+            {
+              _type: 'aws_account_has_service',
+              sourceType: 'aws_account',
+              _class: RelationshipClass.HAS,
+              targetType: 'aws_apigateway',
+            },
+          ],
+        }),
+      ]),
+    );
+
+    expect(relationships).toEqual([
+      {
+        _type: 'aws_account_has_service',
+        sourceType: 'aws_account',
+        _class: 'HAS',
+        targetType: 'aws_apigateway',
+      },
+      {
+        _type: 'aws_account_owns_service',
+        sourceType: 'aws_account',
+        _class: 'OWNS',
+        targetType: 'aws_apigateway',
+      },
+      {
+        _type: 'aws_account_has_service',
+        sourceType: 'aws_account',
+        _class: 'HAS',
+        targetType: 'aws_waf',
+      },
+    ]);
+  });
+});

package/src/utils/getSortedJupiterOneTypes.ts

@@ -1,14 +1,14 @@
-import { loadConfig } from '../config';
-import * as path from 'path';
-import { buildStepDependencyGraph } from '@jupiterone/integration-sdk-runtime';
 import {
   IntegrationStepExecutionContext,
   Step,
-  StepGraphObjectMetadataProperties,
   StepEntityMetadata,
-  StepRelationshipMetadata,
+  StepGraphObjectMetadataProperties,
   StepMappedRelationshipMetadata,
+  StepRelationshipMetadata,
 } from '@jupiterone/integration-sdk-core';
+import { buildStepDependencyGraph } from '@jupiterone/integration-sdk-runtime';
+import * as path from 'path';
+import { loadConfig } from '../config';
 
 export interface TypesCommandArgs {
   projectPath: string;
@@ -57,15 +57,26 @@ function alphabetizeEntityMetadataPropertyByTypeCompareFn(
 }
 
 function alphabetizeRelationshipMetadataPropertyByTypeCompareFn(
-  a: StepRelationshipMetadata,
-  b: StepRelationshipMetadata,
+  a: StepRelationshipMetadata | StepMappedRelationshipMetadata,
+  b: StepRelationshipMetadata | StepMappedRelationshipMetadata,
 ): number {
-  if (a._type > b._type) return 1;
-  if (a._type < b._type) return -1;
+  if (a.sourceType > b.sourceType) return 1;
+  if (a.sourceType < b.sourceType) return -1;
+
+  if (a.targetType > b.targetType) return 1;
+  if (a.targetType < b.targetType) return -1;
+
+  if (a._class > b._class) return 1;
+  if (a._class < b._class) return -1;
+
+  if ('direction' in a && 'direction' in b) {
+    if (a.direction > b.direction) return 1;
+    if (a.direction < b.direction) return -1;
+  }
   return 0;
 }
 
-function alphabetizeMetadataProperties(
+export function alphabetizeMetadataProperties(
   metadata: StepGraphObjectMetadataProperties,
 ): StepGraphObjectMetadataProperties {
   return {

package/src/visualization/__tests__/generateVisHTML.test.ts

@@ -1,4 +1,4 @@
-import { Edge, Node } from 'vis';
+import type { Edge, Node } from 'vis';
 
 import {
   generateVisHTML,

package/src/visualization/createMappedRelationshipNodesAndEdges.ts

@@ -1,4 +1,4 @@
-import { Node, Edge, NodeOptions } from 'vis';
+import type { Node, Edge, NodeOptions } from 'vis';
 import {
   Entity,
   MappedRelationship,

package/src/visualization/generateDependencyVisualization.ts

@@ -5,7 +5,7 @@ import * as path from 'path';
 
 import { generateVisHTML } from '../utils/generateVisHTML';
 
-import { Node, Edge } from 'vis';
+import type { Node, Edge } from 'vis';
 
 // Color list to denote which steps have more direct dependencies.
 // Starting from cooler colors to warmer colors.

package/src/visualization/generateVisualization.ts

@@ -1,6 +1,6 @@
 import globby from 'globby';
 import upath from 'upath';
-import { Edge } from 'vis';
+import type { Edge } from 'vis';
 
 import { writeFileToPath } from '@jupiterone/integration-sdk-runtime';