@jupiterone/integration-sdk-cli 12.0.0 → 12.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/integration-sdk-cli",
-  "version": "12.0.0",
+  "version": "12.1.0",
   "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": "^12.0.0",
-    "@jupiterone/integration-sdk-runtime": "^12.0.0",
+    "@jupiterone/integration-sdk-core": "^12.1.0",
+    "@jupiterone/integration-sdk-runtime": "^12.1.0",
     "chalk": "^4",
     "commander": "^9.4.0",
     "fs-extra": "^10.1.0",
@@ -43,7 +43,7 @@
     "url-exists": "^1.0.3"
   },
   "devDependencies": {
-    "@jupiterone/integration-sdk-private-test-utils": "^12.0.0",
+    "@jupiterone/integration-sdk-private-test-utils": "^12.1.0",
     "@pollyjs/adapter-node-http": "^6.0.5",
     "@pollyjs/core": "^6.0.5",
     "@pollyjs/persister-fs": "^6.0.5",
@@ -56,5 +56,5 @@
     "neo-forgery": "^2.0.0",
     "vis": "^4.21.0-EOL"
   },
-  "gitHead": "d71c21bb480ffb35462525aef33a15f702ab5c25"
+  "gitHead": "6f1fbc96e463d7d940fdc515d627fb48afb4267d"
 }

package/src/__tests__/cli.test.ts

@@ -124,6 +124,7 @@ describe('collect', () => {
           dependsOn: undefined,
           partialTypes: [],
           encounteredTypes: ['test_account'],
+          encounteredTypeCounts: expect.any(Object),
           status: StepResultStatus.CACHED,
           startTime: expect.any(Number),
           endTime: expect.any(Number),
@@ -136,6 +137,7 @@ describe('collect', () => {
           declaredTypes: ['my_groups'],
           partialTypes: [],
           encounteredTypes: [],
+          encounteredTypeCounts: expect.any(Object),
           status: StepResultStatus.SUCCESS,
           startTime: expect.any(Number),
           endTime: expect.any(Number),
@@ -148,6 +150,7 @@ describe('collect', () => {
           dependsOn: undefined,
           partialTypes: [],
           encounteredTypes: [],
+          encounteredTypeCounts: expect.any(Object),
           status: StepResultStatus.DISABLED,
         },
       ],
@@ -171,6 +174,7 @@ describe('collect', () => {
           declaredTypes: ['my_account'],
           partialTypes: [],
           encounteredTypes: [],
+          encounteredTypeCounts: expect.any(Object),
           status: StepResultStatus.SUCCESS,
           startTime: expect.any(Number),
           endTime: expect.any(Number),
@@ -183,6 +187,7 @@ describe('collect', () => {
           declaredTypes: ['my_groups'],
           partialTypes: [],
           encounteredTypes: [],
+          encounteredTypeCounts: expect.any(Object),
           status: StepResultStatus.SUCCESS,
           startTime: expect.any(Number),
           endTime: expect.any(Number),
@@ -194,6 +199,7 @@ describe('collect', () => {
           declaredTypes: ['my_user'],
           partialTypes: [],
           encounteredTypes: [],
+          encounteredTypeCounts: expect.any(Object),
           status: StepResultStatus.SUCCESS,
           startTime: expect.any(Number),
           endTime: expect.any(Number),
@@ -226,6 +232,7 @@ describe('collect', () => {
             declaredTypes: ['my_user'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.FAILURE,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -257,6 +264,7 @@ describe('collect', () => {
             declaredTypes: ['my_user'],
             partialTypes: [],
             encounteredTypes: ['my_user'],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -291,6 +299,7 @@ describe('collect', () => {
             declaredTypes: ['my_account'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.DISABLED,
           },
           {
@@ -300,6 +309,7 @@ describe('collect', () => {
             declaredTypes: ['my_groups'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.DISABLED,
           },
           {
@@ -308,6 +318,7 @@ describe('collect', () => {
             declaredTypes: ['my_user'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -342,6 +353,7 @@ describe('collect', () => {
             declaredTypes: ['my_account'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -354,6 +366,7 @@ describe('collect', () => {
             declaredTypes: ['my_groups'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.DISABLED,
           },
           {
@@ -362,6 +375,7 @@ describe('collect', () => {
             declaredTypes: ['my_user'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -398,6 +412,7 @@ describe('collect', () => {
             declaredTypes: ['my_account'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -410,6 +425,7 @@ describe('collect', () => {
             declaredTypes: ['my_groups'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.DISABLED,
           },
           {
@@ -418,6 +434,7 @@ describe('collect', () => {
             declaredTypes: ['my_user'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -451,6 +468,7 @@ describe('collect', () => {
             declaredTypes: ['my_account'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -463,6 +481,7 @@ describe('collect', () => {
             declaredTypes: ['my_groups'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.SUCCESS,
             startTime: expect.any(Number),
             endTime: expect.any(Number),
@@ -474,6 +493,7 @@ describe('collect', () => {
             declaredTypes: ['my_user'],
             partialTypes: [],
             encounteredTypes: [],
+            encounteredTypeCounts: expect.any(Object),
             status: StepResultStatus.DISABLED,
           },
         ],

package/src/generator/newIntegration.ts

@@ -90,10 +90,17 @@ function newIntegration(plop: NodePlopAPI) {
         return [];
       }
 
+      // @jupiterone/graph-foo -> graph-foo
+      // graph-foo -> graph-foo
+      const directoryName = path.join(
+        process.cwd(),
+        path.basename(data.packageName),
+      );
+
       const actions: any[] = [];
       actions.push({
         type: 'addMany',
-        destination: '.',
+        destination: directoryName,
         base: path.join(__dirname, '/template'),
         templateFiles: path.join(__dirname + '/template/**'),
         globOptions: { dot: true },
@@ -104,7 +111,10 @@ function newIntegration(plop: NodePlopAPI) {
       for (const step of data.steps) {
         actions.push({
           type: 'add',
-          path: path.normalize(`src/steps/${kebabCase(step.name)}/index.ts`),
+          path: path.join(
+            directoryName,
+            path.normalize(`src/steps/${kebabCase(step.name)}/index.ts`),
+          ),
           templateFile: path.join(__dirname, 'stepTemplate/index.ts.hbs'),
           data: step,
           force: true,
@@ -113,19 +123,19 @@ function newIntegration(plop: NodePlopAPI) {
 
       actions.push({
         type: 'yarnInstall',
-        path: '.',
+        path: directoryName,
         verbose: true,
       });
 
       actions.push({
         type: 'yarnFormat',
-        path: '.',
+        path: directoryName,
         verbose: true,
       });
 
       actions.push({
         type: 'yarnLint',
-        path: '.',
+        path: directoryName,
         verbose: true,
       });
 

package/src/generator/template/.github/workflows/build.yml.hbs

@@ -27,27 +27,3 @@ jobs:
 
       - name: Run build
         run: yarn build
-
-  # Publishing is done in a separate job to allow
-  # for all matrix builds to complete.
-  BuildRelease:
-    needs: test
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'
-    name: Checkout Code
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          token: $\{{ secrets.AUTO_GITHUB_PAT_TOKEN }}
-      - name: Setup Node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 18.x
-          cache: yarn
-      - name: Build and Release
-        uses: jupiterone/action-npm-build-release@v1
-        with:
-          npm_auth_token: $\{{ secrets.NPM_AUTH_TOKEN }}
-          gh_token: $\{{ secrets.AUTO_GITHUB_PAT_TOKEN }}

package/src/generator/template/package.json.hbs

@@ -1,10 +1,10 @@
 {
   "name": "{{packageName}}",
-  "version": "0.0.0",
+  "version": "0.0.1",
   "description": "{{packageDescription}}",
   "license": "MPL-2.0",
-  "main": "src/index.js",
-  "types": "src/index.d.ts",
+  "main": "dist/src/index.js",
+  "types": "dist/src/index.d.ts",
   "files": [
     "src",
     "jupiterone"
@@ -13,7 +13,7 @@
     "access": "public"
   },
   "engines": {
-    "node": ">=18.0.0 <19.x"
+    "node": ">=18.0.0 <20.x"
   },
   "scripts": {
     "start": "j1-integration collect",
@@ -36,28 +36,11 @@
     "postversion": "cp package.json ./dist/package.json"
   },
   "peerDependencies": {
-    "@jupiterone/integration-sdk-core": "^10.5.0"
+    "@jupiterone/integration-sdk-core": "^12.0.0"
   },
   "devDependencies": {
-    "@jupiterone/integration-sdk-core": "^10.5.0",
-    "@jupiterone/integration-sdk-dev-tools": "^10.5.0",
-    "@jupiterone/integration-sdk-testing": "^10.5.0",
-    "auto": "^10.36.5"
-  },
-  "auto": {
-    "plugins": [
-      [
-        "npm",
-        {
-          "setRcToken": false,
-          "publishFolder": "./dist"
-        }
-      ],
-      "released"
-    ],
-    "onlyPublishWithReleaseLabel": true,
-    "shipit": {
-      "prerelease": false
-    }
+    "@jupiterone/integration-sdk-core": "^12.0.0",
+    "@jupiterone/integration-sdk-dev-tools": "^12.0.0",
+    "@jupiterone/integration-sdk-testing": "^12.0.0",
   }
 }

package/dist/src/generator/template/.github/workflows/codeql-analysis.yml.hbs

@@ -1,69 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: 'CodeQL'
-
-on:
-  push:
-    branches: ['main']
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: ['main']
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['javascript']
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: $\{{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          queries: security-extended,security-and-quality
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      # - run: |
-      #   echo "Run, Build Application using script"
-      #   ./location_of_script_within_repo/buildscript.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2

package/dist/src/generator/template/.github/workflows/integration-deployment.yml.hbs

@@ -1,36 +0,0 @@
-name: J1 Integration deployment
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  j1-integration-deployment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get integration name
-        id: get-integration-name
-        uses: actions/github-script@0.9.0
-        with:
-          script: |
-            const repositoryName = context.payload.repository.name
-            const integrationName = repositoryName.replace("graph-", "")
-            core.setOutput('integrationName', integrationName)
-      - name: Get version number
-        id: get-version-number
-        uses: actions/github-script@0.9.0
-        with:
-          script: |
-            const tagName = context.payload.release.tag_name
-            const versionNumber = tagName.replace("v", "")
-            core.setOutput('versionNumber', versionNumber)
-      - name: Bump integration deployment version
-        uses: JupiterOne/integration-github-actions/create-integration-deployment@v1
-        with:
-          integrationName:
-            $\{{ steps.get-integration-name.outputs.integrationName }}
-          releaseNotes: $\{{ github.event.release.body }}
-          version: $\{{ steps.get-version-number.outputs.versionNumber }}
-          githubToken: $\{{ secrets.AUTO_GITHUB_PAT_TOKEN }}
-          npmAuthToken: $\{{ secrets.NPM_AUTH_TOKEN }}

package/src/generator/template/.github/workflows/codeql-analysis.yml.hbs

@@ -1,69 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: 'CodeQL'
-
-on:
-  push:
-    branches: ['main']
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: ['main']
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['javascript']
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      # Initializes the CodeQL tools for scanning.
-      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
-        with:
-          languages: $\{{ matrix.language }}
-          # If you wish to specify custom queries, you can do so here or in a config file.
-          # By default, queries listed here will override any specified in a config file.
-          # Prefix the list here with "+" to use these queries and those in the config file.
-
-          # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-          queries: security-extended,security-and-quality
-
-      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-      # If this step fails, then you should remove it and run the build manually (see below)
-      - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
-
-      # ℹ️ Command-line programs to run using the OS shell.
-      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-
-      #   If the Autobuild fails above, remove it and uncomment the following three lines.
-      #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
-
-      # - run: |
-      #   echo "Run, Build Application using script"
-      #   ./location_of_script_within_repo/buildscript.sh
-
-      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2

package/src/generator/template/.github/workflows/integration-deployment.yml.hbs

@@ -1,36 +0,0 @@
-name: J1 Integration deployment
-
-on:
-  release:
-    types:
-      - published
-
-jobs:
-  j1-integration-deployment:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get integration name
-        id: get-integration-name
-        uses: actions/github-script@0.9.0
-        with:
-          script: |
-            const repositoryName = context.payload.repository.name
-            const integrationName = repositoryName.replace("graph-", "")
-            core.setOutput('integrationName', integrationName)
-      - name: Get version number
-        id: get-version-number
-        uses: actions/github-script@0.9.0
-        with:
-          script: |
-            const tagName = context.payload.release.tag_name
-            const versionNumber = tagName.replace("v", "")
-            core.setOutput('versionNumber', versionNumber)
-      - name: Bump integration deployment version
-        uses: JupiterOne/integration-github-actions/create-integration-deployment@v1
-        with:
-          integrationName:
-            $\{{ steps.get-integration-name.outputs.integrationName }}
-          releaseNotes: $\{{ github.event.release.body }}
-          version: $\{{ steps.get-version-number.outputs.versionNumber }}
-          githubToken: $\{{ secrets.AUTO_GITHUB_PAT_TOKEN }}
-          npmAuthToken: $\{{ secrets.NPM_AUTH_TOKEN }}