Merge branch 'next'

Dockerfile

@@ -44,13 +44,6 @@ RUN set -eux; \
     chmod -R g+rwX /home/node; \
     chown -R 1000 /home/node
 
-RUN set -eux; \
-    apk upgrade --no-cache; \
-    apk add --no-cache libcap; \
-    rm -rf /var/cache/apk/*
-
-RUN setcap 'cap_net_raw+ep' $(which node)
-
 # change workgin dir
 WORKDIR $HOME/
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brightsec/cli",
-  "version": "12.3.0",
+  "version": "12.4.0-next.1",
   "private": false,
   "repository": {
     "type": "git",

src/Commands/GetEntryPoints.spec.ts

@@ -2,7 +2,16 @@ import 'reflect-metadata';
 import { Logger, logger } from '../Utils';
 import { GetEntryPoints } from './GetEntryPoints';
 import { EntryPoints } from '../EntryPoint';
-import { mock, reset, spy, instance, when, anything, verify } from 'ts-mockito';
+import {
+  mock,
+  reset,
+  spy,
+  instance,
+  when,
+  anything,
+  verify,
+  objectContaining
+} from 'ts-mockito';
 import { container } from 'tsyringe';
 import { Arguments } from 'yargs';
 
@@ -34,14 +43,23 @@ describe('GetEntryPoints', () => {
     it('should correctly pass config from args', async () => {
       const args = {
         project: '1',
+        limit: 10,
         verbose: true,
+        pretty: true,
+        connectivity: ['connected', 'ok'],
+        status: ['open', 'closed', 'failed'],
         _: [],
         $0: ''
       } as Arguments;
 
       when(processSpy.exit(anything())).thenReturn(undefined);
       when(
-        mockedEntryPoints.entrypoints({ projectId: '1', limit: 10 })
+        mockedEntryPoints.entrypoints(
+          objectContaining({
+            projectId: '1',
+            limit: 10
+          })
+        )
       ).thenResolve([
         {
           id: '1',

src/Commands/GetEntryPoints.ts

@@ -30,6 +30,11 @@ export class GetEntryPoints implements CommandModule {
         describe: 'Limit the number of entrypoints',
         default: 10
       })
+      .option('pretty', {
+        describe: 'Pretty print the output',
+        boolean: true,
+        default: false
+      })
       .option('connectivity', {
         describe: 'Filter by connectivity',
         array: true,
@@ -70,20 +75,18 @@ export class GetEntryPoints implements CommandModule {
         status: args.status as string[]
       });
 
-      if (args.verbose) {
-        // eslint-disable-next-line no-console
-        console.log('%j', entryPoints);
-      } else {
-        // eslint-disable-next-line no-console
-        console.log(
-          '%j',
-          entryPoints.map((entryPoint) => ({
+      const ep = args.verbose
+        ? entryPoints
+        : entryPoints.map((entryPoint) => ({
             id: entryPoint.id,
             method: entryPoint.method,
             url: entryPoint.url
-          }))
-        );
-      }
+          }));
+
+      // eslint-disable-next-line no-console
+      console.log(
+        args.pretty ? JSON.stringify(ep, null, 2) : JSON.stringify(ep)
+      );
 
       process.exitCode = 0;
     } catch (e) {