implement suggestions

cmd/dev.go

@@ -132,20 +132,6 @@ func readPipedStdin() []byte {
 	return nil
 }
 
-func readBytesFromFile(filePath string) []byte {
-	fileToEncrypt, err := os.Open(filePath)
-	if err != nil {
-		cli.ExitWithError(fmt.Sprintf("Failed to open file at path: %s", filePath), err)
-	}
-	defer fileToEncrypt.Close()
-
-	bytes, err := io.ReadAll(fileToEncrypt)
-	if err != nil {
-		cli.ExitWithError(fmt.Sprintf("Failed to read bytes from file at path: %s", filePath), err)
-	}
-	return bytes
-}
-
 func init() {
 	designCmd := man.Docs.GetCommand("dev/design-system",
 		man.WithRun(dev_designSystem),

cmd/tdf-decrypt.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/opentdf/otdfctl/pkg/cli"
 	"github.com/opentdf/otdfctl/pkg/man"
+	"github.com/opentdf/otdfctl/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -28,9 +29,11 @@ func dev_tdfDecryptCmd(cmd *cobra.Command, args []string) {
 	// Prefer file argument over piped input over default filename
 	bytesToDecrypt := piped
 	var tdfFile string
+	var err error
 	if len(args) > 0 {
 		tdfFile = args[0]
-		bytesToDecrypt = readBytesFromFile(tdfFile)
+		bytesToDecrypt, err = utils.ReadBytesFromFile(tdfFile)
+		cli.ExitWithError("Failed to read file:", err)
 	}
 
 	if len(bytesToDecrypt) == 0 {

cmd/tdf-encrypt.go

@@ -11,6 +11,7 @@ import (
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/opentdf/otdfctl/pkg/cli"
 	"github.com/opentdf/otdfctl/pkg/man"
+	"github.com/opentdf/otdfctl/pkg/utils"
 	"github.com/spf13/cobra"
 )
 
@@ -63,8 +64,10 @@ func dev_tdfEncryptCmd(cmd *cobra.Command, args []string) {
 
 	// prefer filepath argument over stdin input
 	bytesSlice := piped
+	var err error
 	if filePath != "" {
-		bytesSlice = readBytesFromFile(filePath)
+		bytesSlice, err = utils.ReadBytesFromFile(filePath)
+		cli.ExitWithError("Failed to read file:", err)
 	}
 
 	// auto-detect mime type if not provided

pkg/handlers/tdf.go

@@ -9,9 +9,9 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"os"
 	"strings"
 
+	"github.com/opentdf/otdfctl/pkg/utils"
 	"github.com/opentdf/platform/sdk"
 )
 
@@ -62,7 +62,7 @@ func (h Handler) EncryptBytes(tdfType string, unencrypted []byte, attrValues []s
 			err := json.Unmarshal([]byte(assertions), &assertionConfigs)
 			if err != nil {
 				// if unable to marshal to json, interpret as file string and try to read from file
-				assertionBytes, err := readBytesFromFile(assertions)
+				assertionBytes, err := utils.ReadBytesFromFile(assertions)
 				if err != nil {
 					return nil, errors.Join(ErrTDFUnableToReadAssertions, err)
 				}
@@ -114,7 +114,7 @@ func (h Handler) EncryptBytes(tdfType string, unencrypted []byte, attrValues []s
 	}
 }
 
-func (h Handler) DecryptBytes(toDecrypt []byte, assertionVerification string, disableAssertionCheck bool) (*bytes.Buffer, error) {
+func (h Handler) DecryptBytes(toDecrypt []byte, assertionVerificationKeysFile string, disableAssertionCheck bool) (*bytes.Buffer, error) {
 	out := &bytes.Buffer{}
 	pt := io.Writer(out)
 	ec := bytes.NewReader(toDecrypt)
@@ -126,9 +126,9 @@ func (h Handler) DecryptBytes(toDecrypt []byte, assertionVerification string, di
 	case sdk.Standard:
 		opts := []sdk.TDFReaderOption{sdk.WithDisableAssertionVerification(disableAssertionCheck)}
 		var assertionVerificationKeys sdk.AssertionVerificationKeys
-		if assertionVerification != "" {
+		if assertionVerificationKeysFile != "" {
 			// read the file
-			assertionVerificationBytes, err := readBytesFromFile(assertionVerification)
+			assertionVerificationBytes, err := utils.ReadBytesFromFile(assertionVerificationKeysFile)
 			if err != nil {
 				return nil, errors.Join(ErrTDFUnableToReadAssertionVerificationKeys, err)
 			}
@@ -215,20 +215,6 @@ func (h Handler) InspectTDF(toInspect []byte) (TDFInspect, []error) {
 	}
 }
 
-func readBytesFromFile(filePath string) ([]byte, error) {
-	fileToEncrypt, err := os.Open(filePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open file at path %s: %w", filePath, err)
-	}
-	defer fileToEncrypt.Close()
-
-	bytes, err := io.ReadAll(fileToEncrypt)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read bytes from file at path %s: %w", filePath, err)
-	}
-	return bytes, nil
-}
-
 func correctKeyType(assertionKey sdk.AssertionKey, public bool) (interface{}, error) {
 	strKey, ok := assertionKey.Key.(string)
 	if !ok {

pkg/utils/read.go

@@ -0,0 +1,21 @@
+package utils
+
+import (
+	"fmt"
+	"io"
+	"os"
+)
+
+func ReadBytesFromFile(filePath string) ([]byte, error) {
+	fileToEncrypt, err := os.Open(filePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to open file at path %s: %w", filePath, err)
+	}
+	defer fileToEncrypt.Close()
+
+	bytes, err := io.ReadAll(fileToEncrypt)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read bytes from file at path %s: %w", filePath, err)
+	}
+	return bytes, nil
+}