Merge branch 'main' into add_event_code

Author: civan

CHANGELOG.md

@@ -7,7 +7,47 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to
 [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+# Unreleased
+
+## 11.0.3
+
+- Moved `vis` dependency to devDependencies
+
+## 11.0.2
+
+- Republish 11.0.1
+
+## 11.0.1
+
+- **Breaking:** Also remove the deprecated/unused `graphObjectBufferThreshold`
+  on the FileSystemGraphObjectStoreParams
+
+## 11.0.0
+
+- **Breaking:** Change `TargetFilterKey` type to only allow composite keys.
+  Plain string keys are no longer allowed.
+
+- **Breaking:** Batch size Options removed:
+  - Removed unused `--upload-batch-size` and `--upload-relationship-batch-size`
+    options from CLI sync commands
+  - Removed unused `uploadBatchSize` and `uploadRelationshipBatchSize`
+    parameters from programmatic sync methods
+
+## 10.7.1 - 2023-09-26
+
+- Use batching by size as default - and the only option.
+
+## 10.7.0 - 2023-09-21
+
+- Changed the log level of the `Collected metric` log that is published when
+  logger.publishMetric is called to "debug"
+
+## 10.6.0 - 2023-09-21
+
+- Release with 10.1.0 changes again:
+- 'InMemoryGraphObjectStore' no longer stores a set amount of entities or
+  relationships, rather it works by measuring size in bytes of graph objects by
+  default.
 
 ## 10.5.3 - 2023-09-18
 

lerna.json

@@ -4,5 +4,5 @@
     "packages/integration-sdk-*",
     "packages/cli"
   ],
-  "version": "10.5.3"
+  "version": "11.0.3"
 }

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/cli",
-  "version": "10.5.3",
+  "version": "11.0.3",
   "description": "The JupiterOne cli",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
@@ -24,8 +24,8 @@
     "test": "jest"
   },
   "dependencies": {
-    "@jupiterone/integration-sdk-core": "^10.5.3",
-    "@jupiterone/integration-sdk-runtime": "^10.5.3",
+    "@jupiterone/integration-sdk-core": "^11.0.3",
+    "@jupiterone/integration-sdk-runtime": "^11.0.3",
     "@lifeomic/attempt": "^3.0.3",
     "commander": "^5.0.0",
     "globby": "^11.0.1",

packages/integration-sdk-benchmark/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/integration-sdk-benchmark",
-  "version": "10.5.3",
+  "version": "11.0.3",
   "private": true,
   "description": "SDK benchmarking scripts",
   "main": "./src/index.js",
@@ -15,8 +15,8 @@
     "benchmark": "for file in ./src/benchmarks/*; do yarn prebenchmark && node $file; done"
   },
   "dependencies": {
-    "@jupiterone/integration-sdk-core": "^10.5.3",
-    "@jupiterone/integration-sdk-runtime": "^10.5.3",
+    "@jupiterone/integration-sdk-core": "^11.0.3",
+    "@jupiterone/integration-sdk-runtime": "^11.0.3",
     "benchmark": "^2.1.4"
   }
 }

packages/integration-sdk-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/integration-sdk-cli",
-  "version": "10.5.3",
+  "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": "^10.5.3",
-    "@jupiterone/integration-sdk-runtime": "^10.5.3",
+    "@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": "^10.5.3",
+    "@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,6 +53,7 @@
     "@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"
   }
 }

packages/integration-sdk-cli/src/__tests__/options.test.ts

@@ -9,15 +9,12 @@ import {
   validateSyncOptions,
 } from '../commands/options';
 import {
-  DEFAULT_UPLOAD_BATCH_SIZE,
   JUPITERONE_DEV_API_BASE_URL,
   JUPITERONE_PROD_API_BASE_URL,
 } from '@jupiterone/integration-sdk-runtime';
 
 const syncOptions = (values?: Partial<SyncOptions>): SyncOptions => ({
   source: 'integration-managed',
-  uploadBatchSize: DEFAULT_UPLOAD_BATCH_SIZE,
-  uploadRelationshipBatchSize: DEFAULT_UPLOAD_BATCH_SIZE,
   skipFinalize: false,
   ...values,
 });

packages/integration-sdk-cli/src/commands/options.ts

@@ -1,5 +1,4 @@
 import {
-  DEFAULT_UPLOAD_BATCH_SIZE,
   getAccountFromEnvironment,
   getApiKeyFromEnvironment,
   JUPITERONE_DEV_API_BASE_URL,
@@ -39,8 +38,6 @@ export interface SyncOptions {
   source: 'integration-managed' | 'integration-external' | 'api';
   scope?: string | undefined;
   integrationInstanceId?: string | undefined;
-  uploadBatchSize: number;
-  uploadRelationshipBatchSize: number;
   skipFinalize: boolean;
 }
 
@@ -69,18 +66,6 @@ export function addSyncOptionsToCommand(command: Command): Command {
       'integration-managed',
     )
     .option('--scope <anystring>', 'specify synchronization job scope value')
-    .option(
-      '-u, --upload-batch-size <number>',
-      'specify number of entities and relationships per upload batch',
-      (value, _previous: Number) => Number(value),
-      DEFAULT_UPLOAD_BATCH_SIZE,
-    )
-    .option(
-      '-ur, --upload-relationship-batch-size <number>',
-      'specify number of relationships per upload batch, overrides --upload-batch-size',
-      (value, _previous: Number) => Number(value),
-      DEFAULT_UPLOAD_BATCH_SIZE,
-    )
     .option(
       '--skip-finalize',
       'skip synchronization finalization to leave job open for additional uploads',
@@ -127,8 +112,6 @@ export function getSyncOptions(options: OptionValues): SyncOptions {
     source: options.source,
     scope: options.scope,
     integrationInstanceId: options.integrationInstanceId,
-    uploadBatchSize: options.uploadBatchSize,
-    uploadRelationshipBatchSize: options.uploadRelationshipBatchSize,
     skipFinalize: options.skipFinalize,
   };
 }

packages/integration-sdk-cli/src/commands/run.ts

@@ -109,9 +109,6 @@ export function run(): Command {
                 stepId,
                 synchronizationJobContext: synchronizationContext,
                 uploadConcurrency: DEFAULT_UPLOAD_CONCURRENCY,
-                uploadBatchSize: options.uploadBatchSize,
-                uploadRelationshipsBatchSize:
-                  options.uploadRelationshipBatchSize,
               });
             },
           },

packages/integration-sdk-cli/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,

packages/integration-sdk-cli/src/generator/template/.prettierignore.hbs

@@ -2,4 +2,5 @@ dist
 coverage/
 .j1-integration
 .j1-integration-cache
-.gitleaks.yml
+.gitleaks.yml
+CHANGELOG.md