@aikidosec/ci-api-client 1.0.9 → 1.0.11

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/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/apiKey.js

@@ -1,7 +1,7 @@
 import { Argument } from 'commander';
 import { setApiKey } from '../configuration.js';
 import { outputError, outputLog } from '../output.js';
-const API_KEY_REGEX = /^AIK_CI_[a-zA-Z0-9]{64}$/g;
+const API_KEY_REGEX = /^(?:AIK_CI_|AIK_CI_US_|AIK_CI_ME_)[A-Za-z0-9]{64}$/;
 function cli(apiKey) {
     const isValidApiKey = API_KEY_REGEX.test(apiKey) || apiKey.trim().length === 128;
     if (apiKey && !isValidApiKey) {

package/lib/commands/scan.js

@@ -118,7 +118,7 @@ export const scan = async ({ repoId, baseCommitId, headCommitId, branchName, opt
     pollStatus();
 };
 const parseCliOptions = (userCliOptions) => {
-    const apiOptions = { version: '1.0.9' };
+    const apiOptions = { version: '1.0.11' };
     const cliOptions = { pollInterval: 5 };
     if (userCliOptions.pullRequestTitle) {
         apiOptions.pull_request_metadata = {

package/lib/commands/scanRelease.js

@@ -120,7 +120,7 @@ export const scan = async ({ repoId, commitId, options, pollInterval = 10, onSta
     pollStatus();
 };
 const parseCliOptions = (userCliOptions) => {
-    const apiOptions = { version: '1.0.9' };
+    const apiOptions = { version: '1.0.11' };
     const cliOptions = { pollInterval: 10 };
     if (userCliOptions.pullRequestTitle) {
         apiOptions.pull_request_metadata = {

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.9');
+    .version('1.0.11');
 apiKey.cliSetup(program);
 scan.cliSetup(program);
 scanRelease.cliSetup(program);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aikidosec/ci-api-client",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "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(),

package/src/commands/apiKey.ts

@@ -2,7 +2,7 @@ import { Argument, Command } from 'commander';
 import { setApiKey } from '../configuration.js';
 import { outputError, outputLog } from '../output.js';
 
-const API_KEY_REGEX = /^AIK_CI_[a-zA-Z0-9]{64}$/g;
+const API_KEY_REGEX = /^(?:AIK_CI_|AIK_CI_US_|AIK_CI_ME_)[A-Za-z0-9]{64}$/;
 
 function cli(apiKey: string): void {
   const isValidApiKey =

package/src/commands/scan.ts

@@ -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.9' };
+  const apiOptions: TScanApiOptions = { version: '1.0.11' };
   const cliOptions: TScanCliOptions = { pollInterval: 5 };
 
   if (userCliOptions.pullRequestTitle) {

package/src/commands/scanRelease.ts

@@ -70,7 +70,6 @@ async function cli(
   options: TScanUserCliOptions,
   command: string
 ) {
-
   const apiKey = getApiKey();
 
   if (!apiKey) {
@@ -145,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);
@@ -194,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,
@@ -243,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.9' };
+  const apiOptions: TScanApiOptions = { version: '1.0.11' };
   const cliOptions: TScanCliOptions = { pollInterval: 10 };
 
   if (userCliOptions.pullRequestTitle) {
@@ -312,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(
@@ -356,7 +349,7 @@ export const cliSetup = (program: Command) =>
         '--base-branch <branchname>',
         'Base branch for the release gated scan.'
       )
-    ) 
+    )
     .description('Run a release scan of an Aikido repo.')
     .action(cli);
 

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.9');
+  .version('1.0.11');
 
 // 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"