fix: added raw type to outputFormatter so that it is possible to show the secret content verbatim, pk secrets get now returns just the secret content and --env is removed

Author: CMCDragonkai

src/bin/secrets/CommandGet.ts

@@ -15,10 +15,6 @@ class CommandGet extends CommandPolykey {
       'Path to where the secret to be retrieved, specified as <vaultName>:<directoryPath>',
       parsers.parseSecretPath,
     );
-    this.option(
-      '-e, --env',
-      'Wrap the secret in an environment variable declaration',
-    );
     this.addOption(binOptions.nodeId);
     this.addOption(binOptions.clientHost);
     this.addOption(binOptions.clientPort);
@@ -54,7 +50,6 @@ class CommandGet extends CommandPolykey {
           port: clientOptions.clientPort,
           logger: this.logger.getChild(PolykeyClient.name),
         });
-        const isEnv: boolean = options.env ?? false;
         const secretMessage = new secretsPB.Secret();
         const vaultMessage = new vaultsPB.Vault();
         vaultMessage.setNameOrId(secretPath[0]);
@@ -64,29 +59,13 @@ class CommandGet extends CommandPolykey {
           (auth) => pkClient.grpcClient.vaultsSecretsGet(secretMessage, auth),
           meta,
         );
-        const secretContent = Buffer.from(response.getSecretContent_asU8())
-          .toString('utf-8')
-          .trim();
-        if (isEnv) {
-          process.stdout.write(
-            binUtils.outputFormatter({
-              type: options.format === 'json' ? 'json' : 'list',
-              data: [
-                `Export ${secretMessage
-                  .getSecretName()
-                  .toUpperCase()
-                  .replace('-', '_')}='${secretContent}'`,
-              ],
-            }),
-          );
-        } else {
-          process.stdout.write(
-            binUtils.outputFormatter({
-              type: options.format === 'json' ? 'json' : 'list',
-              data: [`${secretMessage.getSecretName()}: ${secretContent}`],
-            }),
-          );
-        }
+        const secretContent = response.getSecretContent_asU8();
+        process.stdout.write(
+          binUtils.outputFormatter({
+            type: 'raw',
+            data: secretContent,
+          }),
+        );
       } finally {
         if (pkClient! != null) await pkClient.stop();
       }

src/bin/utils/utils.ts

@@ -26,6 +26,10 @@ function verboseToLogLevel(c: number = 0): LogLevel {
 }
 
 type OutputObject =
+  | {
+      type: 'raw';
+      data: string | Uint8Array;
+    }
   | {
       type: 'list';
       data: Array<string>;
@@ -47,9 +51,11 @@ type OutputObject =
       data: Error;
     };
 
-function outputFormatter(msg: OutputObject): string {
+function outputFormatter(msg: OutputObject): string | Uint8Array {
   let output = '';
-  if (msg.type === 'list') {
+  if (msg.type === 'raw') {
+    return msg.data;
+  } else if (msg.type === 'list') {
     for (let elem in msg.data) {
       // Empty string for null or undefined values
       if (elem == null) {

tests/bin/secrets/secrets.test.ts

@@ -134,7 +134,7 @@ describe('CLI secrets', () => {
           env: {},
           cwd: dataDir,
         });
-        expect(result.stdout).toBe('MySecret: this is the secret\n');
+        expect(result.stdout).toBe('this is the secret');
         expect(result.exitCode).toBe(0);
       },
     );