@contrast/cli 1.2.0 → 1.3.0

package/lib/config-diagnostics.js

@@ -15,34 +15,45 @@
  */
 'use strict';
 
-const path = require('path');
-const fs = require('fs');
 const commander = require('commander');
+const fs = require('fs');
+const path = require('path');
+const { name: agentName, version: agentVersion } = require('../package.json');
+const core = require('@contrast/core')({ agentName, agentVersion });
 
-async function runDiagnostics (core = require('@contrast/core')()) {
+if (require.main === module) {
   commander.program
     .name('config-diagnostics')
     .description('The config-diagnostics utility returns the current effective node agent configuration.')
     .argument('<entrypoint>', 'The entrypoint JavaScript or ESM file for the application')
     .option('-q, --quiet', 'suppress logging to stdout')
     .option('-o, --output <string>', 'output directory for generated JSON file', path.join(process.cwd(), 'contrast_effective_config.json'))
-    .action(async function main(entrypoint, options) {
-      const { reporter, getEffectiveConfig } = core;
-      await reporter.install();
-      const content = JSON.stringify(getEffectiveConfig(), null, 2).concat('\n\n');
-
-      if (!options.quiet) {
-        fs.writeFileSync(1, content, 'utf8');
-      }
-      if (options.output) {
-        fs.writeFileSync(options.output, content, 'utf-8');
-      }
-    })
+    .action(action)
     .parse();
 }
 
-module.exports = runDiagnostics;
+async function action(entrypoint, options) {
+  const { reporter, getEffectiveConfig } = core;
+  let Status;
 
-if (require.main === module) {
-  runDiagnostics();
+  try {
+    if (!core.config.api.enable) {
+      throw new Error('config.api.enable = false');
+    }
+    await 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({ ...getEffectiveConfig(), Status }, null, 2);
+
+  if (!options.quiet) {
+    fs.writeFileSync(1, content, 'utf8');
+  }
+  if (options.output) {
+    fs.writeFileSync(options.output, content, 'utf-8');
+  }
 }
+
+module.exports.action = action;

package/lib/system-diagnostics.js

@@ -18,30 +18,29 @@
 const commander = require('commander');
 const fs = require('fs');
 const path = require('path');
+const { name: agentName, version: agentVersion } = require('../package.json');
+const core = require('@contrast/core')({ agentName, agentVersion });
 
-async function runDiagnostics (core = require('@contrast/core')()) {
+if (require.main === module) {
   commander.program
     .name('system-diagnostics')
     .description('The system-diagnostics utility returns the system info for the server/container the agent is running on.')
     .option('-q, --quiet', 'suppress logging to stdout')
     .option('-o, --output <string>', 'output directory for generated JSON file', path.join(process.cwd(), 'contrast_system_info.json'))
-    .action(async function main(options) {
-      const { reporter, getSystemInfo } = core;
-      await reporter.install();
-      const content = JSON.stringify(getSystemInfo(), null, 2).concat('\n\n');
-
-      if (!options.quiet) {
-        fs.writeFileSync(1, content, 'utf8');
-      }
-      if (options.output) {
-        fs.writeFileSync(options.output, content, 'utf-8');
-      }
-    })
+    .action(action)
     .parse();
 }
 
-module.exports = runDiagnostics;
+async function action(options) {
+  const content = JSON.stringify(core.getSystemInfo(), null, 2).concat();
+  console.log(content);
 
-if (require.main === module) {
-  runDiagnostics();
+  if (!options.quiet) {
+    fs.writeFileSync(1, content, 'utf8');
+  }
+  if (options.output) {
+    fs.writeFileSync(options.output, content, 'utf-8');
+  }
 }
+
+module.exports.action = action;

package/package.json

@@ -1,7 +1,7 @@
 {
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
   "name": "@contrast/cli",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "A collection of agent related CLI utilities",
   "scripts": {
     "test": "../scripts/test.sh"
@@ -20,8 +20,12 @@
   },
   "keywords": [],
   "license": "SEE LICENSE IN LICENSE",
+  "peerDependencies": {
+    "@contrast/agent": "5.0.0-alpha.2",
+    "@contrast/protect-agent": "5.5.0"
+  },
   "dependencies": {
-    "@contrast/core": "1.11.0",
+    "@contrast/core": "1.12.0",
     "commander": "^9.4.1"
   }
-}
+}