@contrast/cli 1.17.0 → 1.19.0

package/lib/config-diagnostics.js

@@ -17,9 +17,9 @@
 
 const commander = require('commander');
 const fs = require('fs');
+const { EOL } = require('os');
 const path = require('path');
 const { name: agentName, version: agentVersion } = require('../package.json');
-const core = require('@contrast/core')({ agentName, agentVersion });
 
 if (require.main === module) {
   commander.program
@@ -33,24 +33,30 @@ if (require.main === module) {
 }
 
 async function action(entrypoint, options) {
-  const { reporter, config } = core;
-  let Status;
+  const core = { agentName, agentVersion };
+  require('@contrast/core/lib/messages')(core);
+  require('@contrast/config')(core);
+  require('@contrast/logger').default(core, { level: 'silent' });
+  require('@contrast/core/lib/app-info')(core);
+  require('@contrast/scopes')(core);
+  require('@contrast/reporter').default(core);
 
   for (const err of core.config._errors) {
     throw err;
   }
 
+  let Status;
   try {
     if (!core.config.api.enable) {
       throw new Error('config.api.enable = false');
     }
-    await reporter.install();
+    await core.reporter.install();
     Status = 'TeamServer connection successful. Remote settings are included in output.';
   } catch (err) {
     Status = `Unable to connect to TeamServer. Remote settings are not included in output. Error: ${err.message}`;
   }
 
-  const content = JSON.stringify({ ...config.getReport({ redact: true }), Status }, null, 2);
+  const content = JSON.stringify({ ...core.config.getReport({ redact: true }), Status }, null, 2) + EOL;
 
   if (!options.quiet) {
     fs.writeFileSync(1, content, 'utf8');

package/lib/system-diagnostics.js

@@ -17,9 +17,9 @@
 
 const commander = require('commander');
 const fs = require('fs');
+const { EOL } = require('os');
 const path = require('path');
 const { name: agentName, version: agentVersion } = require('../package.json');
-const core = require('@contrast/core')({ agentName, agentVersion });
 
 if (require.main === module) {
   commander.program
@@ -32,7 +32,12 @@ if (require.main === module) {
 }
 
 async function action(options) {
-  const content = JSON.stringify(core.getSystemInfo(), null, 2).concat();
+  const core = { agentName, agentVersion };
+  require('@contrast/config')(core);
+  require('@contrast/logger').default(core, { level: 'silent' });
+  require('@contrast/core/lib/system-info')(core);
+
+  const content = JSON.stringify(core.getSystemInfo(), null, 2) + EOL;
 
   for (const err of core.config._errors) {
     throw err;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/cli",
-  "version": "1.17.0",
+  "version": "1.19.0",
   "description": "A collection of agent related CLI utilities",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -19,7 +19,11 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/core": "1.26.0",
+    "@contrast/config": "1.22.0",
+    "@contrast/core": "1.27.0",
+    "@contrast/logger": "1.7.0",
+    "@contrast/reporter": "1.22.0",
+    "@contrast/scopes": "^1.4.0",
     "commander": "^9.4.1"
   }
 }