Skip to content
This repository has been archived by the owner on Aug 8, 2024. It is now read-only.

upgrade node to 18 and sdk #25

Merged
merged 3 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- name: Check out code repository source code
uses: actions/checkout@v3

- id: setup-node
name: Setup Node
uses: actions/setup-node@v1
uses: actions/setup-node@v3
with:
node-version: 14.x

- name: Check out code repository source code
uses: actions/checkout@v2
node-version: 18.x

- name: Install dependencies
run: yarn
Expand All @@ -34,16 +34,16 @@ jobs:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
steps:
- name: Setup Node
uses: actions/setup-node@v1
with:
node-version: 14.x

- name: Check out repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 2

- name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x

# Fetch tags and describe the commit before the merge commit
# to see if it's a version publish
- name: Fetch tags
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/questions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@ jobs:
runs-on: ubuntu-latest

steps:
- id: setup-node
name: Setup Node
uses: actions/setup-node@v1
with:
node-version: 14.x

- name: Check out `main` branch
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
path: source

- name: Check out target branch questions
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{github.event.pull_request.head.ref}}
repository: ${{github.event.pull_request.head.repo.full_name}}
path: target

- id: setup-node
name: Setup Node
uses: actions/setup-node@v3
with:
node-version: 18.x

- name: Install dependencies for `main` branch
run: yarn install --cwd source
run: yarn install --cwd source --frozen-lockfile

- name: Validate questions on target branch
env:
Expand All @@ -35,6 +35,6 @@ jobs:
${{ secrets.MANAGED_QUESTIONS_JUPITERONE_API_KEY }}
run:
yarn --cwd source j1-integration validate-question-file -a
$MANAGED_QUESTIONS_JUPITERONE_ACCOUNT_ID -k
--frozen-lockfile $MANAGED_QUESTIONS_JUPITERONE_ACCOUNT_ID -k
$MANAGED_QUESTIONS_JUPITERONE_API_KEY -p
../target/jupiterone/questions/questions.yaml
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ dist/
.env
.eslintcache
tsconfig.tsbuildinfo

.idea
.npmrc
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18
1 change: 0 additions & 1 deletion .nvmrc

This file was deleted.

3 changes: 2 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ dist
coverage/
.j1-integration
.j1-integration-cache
.gitleaks.yml
.gitleaks.yml
CHANGELOG.md
18 changes: 12 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jupiterone/graph-netskope",
"version": "1.2.6",
"version": "1.2.7",
"description": "A JupiterOne Integration for ingesting data of the Netskope",
"repository": {
"type": "git",
Expand All @@ -16,11 +16,15 @@
"publishConfig": {
"access": "public"
},
"engines": {
"node": ">=18.0.0 <19.x"
},
"scripts": {
"start": "j1-integration collect",
"graph": "j1-integration visualize",
"graph:types": "j1-integration visualize-types",
"graph:spec": "j1-integration visualize-types --project-path docs/spec --output-file ./.j1-integration/types-graph/index.spec.html",
"graph:dependencies": "j1-integration visualize-dependencies",
"validate:questions:dry": "j1-integration validate-question-file --dry-run",
"validate:questions": "j1-integration validate-question-file -a $MANAGED_QUESTIONS_JUPITERONE_ACCOUNT_ID -k $MANAGED_QUESTIONS_JUPITERONE_API_KEY",
"lint": "eslint . --cache --fix --ext .ts,.tsx",
Expand All @@ -31,15 +35,17 @@
"test:env": "LOAD_ENV=1 yarn test",
"test:ci": "yarn format:check && yarn lint && yarn type-check && yarn test",
"build": "tsc -p tsconfig.dist.json --declaration && cp README.md dist/README.md && cp -r jupiterone/ dist/jupiterone/",
"prepush": "yarn format:check && yarn lint && yarn type-check && jest --changedSince main"
"prepush": "yarn format:check && yarn lint && yarn type-check && jest --changedSince main",
"postversion": "cp package.json ./dist/package.json"
},
"peerDependencies": {
"@jupiterone/integration-sdk-core": "^8.22.0"
"@jupiterone/integration-sdk-core": "^13.2.0"
},
"devDependencies": {
"@jupiterone/integration-sdk-core": "^8.22.0",
"@jupiterone/integration-sdk-dev-tools": "^8.22.0",
"@jupiterone/integration-sdk-testing": "^8.22.0",
"@jupiterone/integration-sdk-core": "^13.2.0",
"@jupiterone/integration-sdk-dev-tools": "^13.2.0",
"@jupiterone/integration-sdk-testing": "^13.2.0",
"@types/node": "^22.1.0",
"@types/to-json-schema": "^0.2.4"
},
"dependencies": {
Expand Down
10 changes: 4 additions & 6 deletions src/client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,8 @@ export class APIClient {
skip: `${this.paginateEntitiesPerPage * page}`,
});

const body = await this.request<NetskopeResponse<AppInstance[]>>(
endpoint,
);
const body =
await this.request<NetskopeResponse<AppInstance[]>>(endpoint);

if (body.status === 'error') {
throw new IntegrationProviderAPIError({
Expand Down Expand Up @@ -215,9 +214,8 @@ export class APIClient {
token: this.config.apiV1Token,
});

const body = await this.getRequest<NetskopeResponse<AppInstance[]>>(
endpoint,
);
const body =
await this.getRequest<NetskopeResponse<AppInstance[]>>(endpoint);

if (body.status === 'error') {
throw new IntegrationProviderAPIError({
Expand Down
4 changes: 2 additions & 2 deletions src/steps/device/__snapshots__/index.test.ts.snap
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`build-tenant-and-device-relationships 1`] = `
Object {
"_class": Array [
{
"_class": [
"Device",
],
"_key": "netskope_device:CLW247-360",
Expand Down
Loading
Loading