Merge branch 'main' into fixConfluenceExport

.github/workflows/build.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: Initialize Output
-        run: echo "::set-output name=didpublishnpm::false"
+        run: echo "didpublishnpm=false" >> $GITHUB_ENV
 
       - name: Check out source code
         uses: actions/checkout@v2
@@ -72,7 +72,7 @@ jobs:
         run: |
           echo "//registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}" > .npmrc
           npm publish --access public ./dist
-          echo "::set-output name=didpublishnpm::true"
+          echo "didpublishnpm=true" >> $GITHUB_ENV
 
   docker:
     if: github.ref == 'refs/heads/main'

Dockerfile

@@ -20,4 +20,4 @@ COPY --from=squidfunk/mkdocs-material:5.5.12 /usr/local/lib/python3.8/site-packa
 
 # This makes the 'mkdocs' command work as a 'docker run' argument
 COPY bin/docker-mkdocs /usr/local/bin/mkdocs
-RUN chmod +x /usr/local/bin/mkdocs
+RUN chmod +x /usr/local/bin/mkdocs

README.md

@@ -129,7 +129,7 @@ JupiterOne account, so that you and others in your organization can access them
 online.
 
 ```bash
-psp publish -c ./config.json -t ./templates -a $J1_ACCOUNT_ID -k $J1_API_TOKEN
+psp publish -c ./templates/config.json -t ./templates -a $J1_ACCOUNT_ID -k $J1_API_TOKEN
 ```
 
 or

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jupiterone/security-policy-builder",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Configurable compilation of policies, standards, and procedures documentation.",
   "author": "JupiterOne <[email protected]>",
   "keywords": [
@@ -24,8 +24,7 @@
     "local-publish": "export $(grep -v '^#' .env | xargs); ./bin/psp publish -n -c ./config.json -t ./templates -a $J1_ACCOUNT_ID -k $J1_API_TOKEN",
     "publish:patch": "yarn version --patch",
     "publish:minor": "yarn version --minor",
-    "publish:major": "yarn version --major",
-    "preversion": "yarn test"
+    "publish:major": "yarn version --major"
   },
   "dependencies": {
     "@jupiterone/security-policy-templates": "^2.9.0",

src/j1/index.ts

@@ -6,7 +6,7 @@ import { Entity, EntityPropertyValue } from '~/src/j1/types';
 import { EntityForSync, RelationshipForSync } from '~/src/types';
 import * as j1GraphQL from './j1GraphQL';
 
-export type JupiterOneEnvironment = 'localhost' | 'dev' | 'prod' | undefined;
+export type JupiterOneEnvironment = 'localhost' | 'dev' | 'prod' | 'fedramp' | undefined;
 
 export type J1Options = {
   accountId: string;
@@ -323,6 +323,10 @@ class JupiterOneClient {
       persisterRestApiUrl = 'https://api.dev.jupiterone.io';
       persisterGraphQLApiUrl = 'https://api.dev.jupiterone.io/graphql';
       queryGraphQLApiUrl = 'https://api.dev.jupiterone.io/graphql';
+    } else if (targetEnvironment === 'fedramp') {
+      persisterRestApiUrl = 'https://api.fedramp.jupiterone.io';
+      persisterGraphQLApiUrl = 'https://api.fedramp.jupiterone.io/graphql';
+      queryGraphQLApiUrl = 'https://api.fedramp.jupiterone.io/graphql';
     } else {
       throw new Error(
         'Unrecognized target JupiterOne environment: ' + targetEnvironment