@aikidosec/ci-api-client 1.0.8 → 1.0.10

package/.env

@@ -1 +1,3 @@
 AIKIDO_API=https://app.aikido.dev
+AIKIDO_US_API=https://app.us.aikido.dev
+AIKIDO_ME_API=https://app.me.aikido.dev

package/README.md

@@ -80,6 +80,7 @@ Options:
   --minimum-severity-level <level>       Set the minimum severity level. Accepted options are: LOW, MEDIUM, HIGH and CRITICAL. (choices: "LOW",
                                          "MEDIUM", "HIGH", "CRITICAL")
   --poll-interval [interval]             The poll interval when checking for an updated scan result (preset: 5)
+  --base-branch <branchname>             Optional: base branch for the release gated scan.
   -h, --help                             display help for command
 ```
 

package/lib/aikidoApi.d.ts

@@ -15,6 +15,7 @@ export type TScanApiOptions = {
     minimum_severity?: string;
     version: string;
     is_release_gating?: boolean;
+    base_branch?: string;
 };
 export type TStartScanResult = {
     scan_id: number;

package/lib/aikidoApi.js

@@ -1,7 +1,16 @@
 import axios from 'axios';
 import { getApiKey } from './configuration.js';
 import { outputDebug } from './output.js';
-const getApiUrl = () => process.env.AIKIDO_API || 'https://app.aikido.dev';
+const getApiUrl = () => {
+    const apiKey = getApiKey();
+    if (apiKey.startsWith('AIK_CI_US_')) {
+        return process.env.AIKIDO_US_API || 'https://app.us.aikido.dev';
+    }
+    if (apiKey.startsWith('AIK_CI_ME_')) {
+        return process.env.AIKIDO_ME_API || 'https://app.me.aikido.dev';
+    }
+    return process.env.AIKIDO_API || 'https://app.aikido.dev';
+};
 const getApiHeaders = () => ({
     'Content-Type': 'application/json',
     'X-AIK-API-SECRET': getApiKey(),

package/lib/commands/scan.js

@@ -6,7 +6,7 @@ import { outputError, outputHttpError, outputLog, startSpinner, } from '../outpu
 async function cli(repoId, baseCommitId, headCommitId, branchName, options, command) {
     const apiKey = getApiKey();
     if (!apiKey) {
-        outputError('Please set an api key using: aikido-cli apikey <key>');
+        outputError('Please set an api key using: aikido-cli-client apikey <key>');
     }
     const { apiOptions, cliOptions } = parseCliOptions(options);
     let loader;
@@ -118,7 +118,7 @@ export const scan = async ({ repoId, baseCommitId, headCommitId, branchName, opt
     pollStatus();
 };
 const parseCliOptions = (userCliOptions) => {
-    const apiOptions = { version: '1.0.7' };
+    const apiOptions = { version: '1.0.10' };
     const cliOptions = { pollInterval: 5 };
     if (userCliOptions.pullRequestTitle) {
         apiOptions.pull_request_metadata = {

package/lib/commands/scanRelease.d.ts

@@ -23,6 +23,7 @@ type TScanUserCliOptions = {
     failOnIacScan?: boolean;
     minimumSeverityLevel?: string;
     pollInterval?: number;
+    baseBranch?: string;
 };
 declare function cli(repoId: string, commitId: string, options: TScanUserCliOptions, command: string): Promise<void>;
 export declare const scan: ({ repoId, commitId, options, pollInterval, onStart, onStartComplete, onStartFail, onScanStart, onNextPoll, onScanComplete, onScanFail, }: TScanArguments) => Promise<void>;

package/lib/commands/scanRelease.js

@@ -6,7 +6,7 @@ import { outputError, outputHttpError, outputLog, startSpinner, } from '../outpu
 async function cli(repoId, commitId, options, command) {
     const apiKey = getApiKey();
     if (!apiKey) {
-        outputError('Please set an api key using: aikido-cli apikey <key>');
+        outputError('Please set an api key using: aikido-cli-client apikey <key>');
     }
     const { apiOptions, cliOptions } = parseCliOptions(options);
     let loader;
@@ -120,7 +120,7 @@ export const scan = async ({ repoId, commitId, options, pollInterval = 10, onSta
     pollStatus();
 };
 const parseCliOptions = (userCliOptions) => {
-    const apiOptions = { version: '1.0.7' };
+    const apiOptions = { version: '1.0.10' };
     const cliOptions = { pollInterval: 10 };
     if (userCliOptions.pullRequestTitle) {
         apiOptions.pull_request_metadata = {
@@ -152,6 +152,9 @@ const parseCliOptions = (userCliOptions) => {
     if (userCliOptions.minimumSeverityLevel) {
         apiOptions.minimum_severity = userCliOptions.minimumSeverityLevel;
     }
+    if (userCliOptions.baseBranch) {
+        apiOptions.base_branch = userCliOptions.baseBranch;
+    }
     if (userCliOptions.pollInterval &&
         (isNaN(userCliOptions.pollInterval) || userCliOptions.pollInterval <= 0)) {
         outputError('Please provide a valid poll interval');
@@ -182,6 +185,7 @@ export const cliSetup = (program) => program
     .addOption(new Option('--poll-interval [interval]', 'The poll interval when checking for an updated scan result')
     .preset(10)
     .argParser(parseFloat))
+    .addOption(new Option('--base-branch <branchname>', 'Base branch for the release gated scan.'))
     .description('Run a release scan of an Aikido repo.')
     .action(cli);
 export default { cli, cliSetup, scan };

package/lib/commands/upload.js

@@ -7,7 +7,7 @@ import { promisify } from 'util';
 async function cli(options, command) {
     const apiKey = getApiKey();
     if (!apiKey) {
-        outputError('Please set an api key using: aikido-cli apikey <key>');
+        outputError('Please set an api key using: aikido-cli-client apikey <key>');
     }
     const { apiOptions, cliOptions } = await parseCliOptions(options);
     let loader = startSpinner('Uploading custom scan');

package/lib/index.js

@@ -11,7 +11,7 @@ export const program = new Command();
 program
     .name('Aikido API Client')
     .description('CLI api client to easily integrate the Aikido public CI API into custom deploy scripts')
-    .version('1.0.7');
+    .version('1.0.10');
 apiKey.cliSetup(program);
 scan.cliSetup(program);
 scanRelease.cliSetup(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aikidosec/ci-api-client",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "CLI api client to easily integrate the Aikido public CI API into custom deploy scripts",
   "license": "MIT",
   "author": "Bert Devriese <bert@builtinbruges.com>",

package/src/aikidoApi.ts

@@ -2,7 +2,19 @@ import axios from 'axios';
 import { getApiKey } from './configuration.js';
 import { outputDebug } from './output.js';
 
-const getApiUrl = () => process.env.AIKIDO_API || 'https://app.aikido.dev';
+const getApiUrl = () => {
+  const apiKey = getApiKey();
+
+  if (apiKey.startsWith('AIK_CI_US_')) {
+    return process.env.AIKIDO_US_API || 'https://app.us.aikido.dev';
+  }
+
+  if (apiKey.startsWith('AIK_CI_ME_')) {
+    return process.env.AIKIDO_ME_API || 'https://app.me.aikido.dev';
+  }
+
+  return process.env.AIKIDO_API || 'https://app.aikido.dev';
+};
 const getApiHeaders = () => ({
   'Content-Type': 'application/json',
   'X-AIK-API-SECRET': getApiKey(),
@@ -26,6 +38,7 @@ export type TScanApiOptions = {
   minimum_severity?: string;
   version: string;
   is_release_gating?: boolean;
+  base_branch?: string;
 };
 
 export type TStartScanResult = {

package/src/commands/scan.ts

@@ -76,7 +76,7 @@ async function cli(
   const apiKey = getApiKey();
 
   if (!apiKey) {
-    outputError('Please set an api key using: aikido-cli apikey <key>');
+    outputError('Please set an api key using: aikido-cli-client apikey <key>');
   }
 
   // Process command options and group them into apiOptions hash
@@ -245,7 +245,7 @@ export const scan = async ({
 const parseCliOptions = (userCliOptions: TScanUserCliOptions) => {
   // Version provided to the API corresponds with the version in package.json
   // of the cli client
-  const apiOptions: TScanApiOptions = { version: '1.0.7' };
+  const apiOptions: TScanApiOptions = { version: '1.0.10' };
   const cliOptions: TScanCliOptions = { pollInterval: 5 };
 
   if (userCliOptions.pullRequestTitle) {

package/src/commands/scanRelease.ts

@@ -61,6 +61,7 @@ type TScanUserCliOptions = {
   failOnIacScan?: boolean;
   minimumSeverityLevel?: string;
   pollInterval?: number;
+  baseBranch?: string;
 };
 
 async function cli(
@@ -69,11 +70,10 @@ async function cli(
   options: TScanUserCliOptions,
   command: string
 ) {
-
   const apiKey = getApiKey();
 
   if (!apiKey) {
-    outputError('Please set an api key using: aikido-cli apikey <key>');
+    outputError('Please set an api key using: aikido-cli-client apikey <key>');
   }
 
   // Process command options and group them into apiOptions hash
@@ -144,12 +144,10 @@ async function cli(
     loader?.fail();
 
     if (error.response?.status && error.response?.status === 404) {
-      if(error.response?.data?.reason_phrase) {
+      if (error.response?.data?.reason_phrase) {
         outputError(error.response?.data?.reason_phrase);
       } else {
-        outputError(
-          'Please verify your repository id or commit SHA'
-        );
+        outputError('Please verify your repository id or commit SHA');
       }
     } else {
       outputHttpError(error);
@@ -193,7 +191,6 @@ export const scan = async ({
   // Initialize a scan and call onStartComplete, onStartFail
   // handlers where needed
   try {
-
     result = await startScan({
       is_release_gating: true,
       head_commit_id: commitId,
@@ -242,7 +239,7 @@ export const scan = async ({
 const parseCliOptions = (userCliOptions: TScanUserCliOptions) => {
   // Version provided to the API corresponds with the version in package.json
   // of the cli client
-  const apiOptions: TScanApiOptions = { version: '1.0.7' };
+  const apiOptions: TScanApiOptions = { version: '1.0.10' };
   const cliOptions: TScanCliOptions = { pollInterval: 10 };
 
   if (userCliOptions.pullRequestTitle) {
@@ -275,6 +272,9 @@ const parseCliOptions = (userCliOptions: TScanUserCliOptions) => {
   if (userCliOptions.minimumSeverityLevel) {
     apiOptions.minimum_severity = userCliOptions.minimumSeverityLevel;
   }
+  if (userCliOptions.baseBranch) {
+    apiOptions.base_branch = userCliOptions.baseBranch;
+  }
   if (
     userCliOptions.pollInterval &&
     (isNaN(userCliOptions.pollInterval) || userCliOptions.pollInterval <= 0)
@@ -308,12 +308,9 @@ export const cliSetup = (program: Command) =>
       ).argRequired()
     )
     .addArgument(
-      new Argument(
-        '<commit_id>',
-        'The commit you want to scan'
-      )
-      .argRequired()
-      .argParser(validateCommitId)
+      new Argument('<commit_id>', 'The commit you want to scan')
+        .argRequired()
+        .argParser(validateCommitId)
     )
     .addOption(
       new Option(
@@ -347,6 +344,12 @@ export const cliSetup = (program: Command) =>
         .preset(10)
         .argParser(parseFloat)
     )
+    .addOption(
+      new Option(
+        '--base-branch <branchname>',
+        'Base branch for the release gated scan.'
+      )
+    )
     .description('Run a release scan of an Aikido repo.')
     .action(cli);
 

package/src/commands/upload.ts

@@ -44,7 +44,7 @@ async function cli(options: TUploadUserCliOptions, command: string) {
   const apiKey = getApiKey();
 
   if (!apiKey) {
-    outputError('Please set an api key using: aikido-cli apikey <key>');
+    outputError('Please set an api key using: aikido-cli-client apikey <key>');
   }
 
   // Process command options and group them into apiOptions hash

package/src/index.ts

@@ -20,7 +20,7 @@ program
   .description(
     'CLI api client to easily integrate the Aikido public CI API into custom deploy scripts'
   )
-  .version('1.0.7');
+  .version('1.0.10');
 
 // Load in all app commands and set them up in the `program` instance
 apiKey.cliSetup(program);
@@ -57,7 +57,7 @@ program
 program
   .option('--plain-output', 'Disables the formatting on output')
   .on('option:plain-output', function () {
-    chalk.level = 0 // Disables all formatting for chalk
+    chalk.level = 0; // Disables all formatting for chalk
   });
 
 // Add global option "--apikey"