cleanup

Author: jakedoublev

cmd/tdf-decrypt.go

@@ -3,7 +3,6 @@ package cmd
 import (
 	"fmt"
 	"os"
-	"strings"
 
 	"github.com/opentdf/otdfctl/pkg/cli"
 	"github.com/opentdf/otdfctl/pkg/man"
@@ -32,35 +31,20 @@ func dev_tdfDecryptCmd(cmd *cobra.Command, args []string) {
 		cli.ExitWithError("Failed to decrypt file", err)
 	}
 
-	if output == "stdout" {
+	if output == "" {
 		// Print decrypted content to stdout
 		fmt.Print(decrypted.String())
 		return
-	} else if output != "" {
-		// Here 'output' is the filename given with -o
-		f, err := os.Create(output)
-		if err != nil {
-			cli.ExitWithError("Failed to write decrypted data to file", err)
-		}
-		defer f.Close()
-		_, err = f.Write(decrypted.Bytes())
-		if err != nil {
-			cli.ExitWithError("Failed to write decrypted data to file", err)
-		}
-		return
-	} else {
-		// Here the 'output' filename is based on the input filename
-		// Write decrypted string to file with stripped .tdf extension
-		f, err := os.Create(strings.Replace(tdfFile, ".tdf", "", 1))
-		if err != nil {
-			cli.ExitWithError("Failed to write decrypted data to file", err)
-		}
-		defer f.Close()
-		_, err = f.Write(decrypted.Bytes())
-		if err != nil {
-			cli.ExitWithError("Failed to write decrypted data to file", err)
-		}
-		return
+	}
+	// Here 'output' is the filename given with -o
+	f, err := os.Create(output)
+	if err != nil {
+		cli.ExitWithError("Failed to write decrypted data to file", err)
+	}
+	defer f.Close()
+	_, err = f.Write(decrypted.Bytes())
+	if err != nil {
+		cli.ExitWithError("Failed to write decrypted data to file", err)
 	}
 }
 

docs/man/decrypt/_index.md

@@ -5,8 +5,8 @@ command:
   flags:
     - name: out
       shorthand: o
-      description: "The decrypted out destination. Default: 'stdout'. Options: ['file', 'stdout']"
-      default: 'stdout'
+      description: 'The file destination for decrypted content to be written.'
+      default: ''
 ---
 
 Decrypt a Trusted Data Format (TDF) file and output the contents to stdout or a file in the current working directory.
@@ -23,5 +23,4 @@ otdfctl decrypt
 otdfctl decrypt hello.txt.tdf # print to stdout
 otdfctl decrypt hello.txt.tdf > hello.txt # consume stdout to write to hello.txt file
 otdfctl decrypt hello.txt.tdf -o hello.txt # write to hello.txt file
-
 ```