fixups

nodesource · Nov 12, 2024 · 0cc48e3 · 0cc48e3
1 parent 3e8615c
commit 0cc48e3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/nsolid.js b/lib/nsolid.js
@@ -713,10 +713,11 @@ function updateConfig(config = {}) {
     nsolidConfig.otlp = null;
   }
 
-  if (nsolidConfig.grpc) {
-    // Make sure it's a valid URL otherwise it might crash
+  if (nsolidConfig.grpc && !nsolidConfig.saas) {
+    // Make sure it's a valid URL otherwise it might crash in the grpc++
+    // URLParser implementation
     try {
-      new URL(nsolidConfig.grpc);
+      new URL(`http://${nsolidConfig.grpc}`);
     } catch {
       process._rawDebug(`Invalid grpc url: "${nsolidConfig.grpc}"`);
       nsolidConfig.grpc = null;
@@ -776,9 +777,7 @@ function initializeConfig(nsolidConfig) {
   if (nsolidConfig.saas) {
     if (nsolidConfig.command) {
       nsolidConfig.saas = undefined;
-    } else if (nsolidConfig.grpc) {
-      nsolidConfig.grpc = parseSaasEnvVar(nsolidConfig.saas, 0);
-    } else {
+    } else if (!nsolidConfig.grpc) {
       nsolidConfig.command = parseSaasEnvVar(nsolidConfig.saas, 0);
     }
   }
@@ -907,7 +906,7 @@ function initializeConfig(nsolidConfig) {
     nsolidConfig.bulk = 'localhost:' + nsolidConfig.bulk;
   if (nsolidConfig.statsd && +nsolidConfig.statsd)
     nsolidConfig.statsd = 'localhost:' + nsolidConfig.statsd;
-  if (nsolidConfig.grpc && +nsolidConfig.grpc)
+  if (!nsolidConfig.saas && nsolidConfig.grpc && +nsolidConfig.grpc)
     nsolidConfig.grpc = 'localhost:' + nsolidConfig.grpc;
 
   return nsolidConfig;

diff --git a/test/parallel/test-nsolid-config-saas.js b/test/parallel/test-nsolid-config-saas.js
@@ -166,7 +166,7 @@ function execProc7() {
     assert.strictEqual(code, 0);
     const config = JSON.parse(output);
     assert.strictEqual(config.command, undefined);
-    assert.strictEqual(config.grpc, saasCommand);
+    assert.strictEqual(config.grpc, `${PORT}`);
     assert.strictEqual(config.saas, saasToken);
   });
 }