Remove duplicate ReadFileBytes utility code and check for string zero…

… value (#48) * Remove duplicate code and check string zero value for ReadFileBytes
greenpau · Jan 4, 2024 · c2f045e · c2f045e
1 parent 31cf77b
commit c2f045e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 51 deletions.
diff --git a/assets/cla/consent.yaml b/assets/cla/consent.yaml
@@ -43,4 +43,6 @@
   email: Michael94Ellis@gmail.com
 - name: Peter Oettig
   email: oss-cla@oettig.de
+- name: Phil Porada
+  email: philporada@gmail.com
 
diff --git a/internal/utils/file.go b/internal/utils/file.go
diff --git a/pkg/identity/database.go b/pkg/identity/database.go
@@ -17,17 +17,18 @@ package identity
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/greenpau/go-authcrunch/internal/utils"
-	"github.com/greenpau/go-authcrunch/pkg/errors"
-	"github.com/greenpau/go-authcrunch/pkg/requests"
-	"github.com/greenpau/go-authcrunch/pkg/util"
-	"github.com/greenpau/versioned"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/greenpau/go-authcrunch/pkg/errors"
+	"github.com/greenpau/go-authcrunch/pkg/requests"
+	"github.com/greenpau/go-authcrunch/pkg/util"
+	fileutil "github.com/greenpau/go-authcrunch/pkg/util/file"
+	"github.com/greenpau/versioned"
 )
 
 var (
@@ -142,7 +143,7 @@ func NewDatabase(fp string) (*Database, error) {
 		if fileInfo.IsDir() {
 			return nil, errors.ErrNewDatabase.WithArgs(fp, "path points to a directory")
 		}
-		b, err := utils.ReadFileBytes(fp)
+		b, err := fileutil.ReadFileBytes(fp)
 		if err != nil {
 			return nil, errors.ErrNewDatabase.WithArgs(fp, err)
 		}

diff --git a/pkg/util/file/utils.go b/pkg/util/file/utils.go
@@ -17,6 +17,7 @@ package file
 import (
 	"bufio"
 	"bytes"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -80,6 +81,9 @@ func ReadFile(filePath string) (string, error) {
 }
 
 func expandHomePath(fp string) (string, error) {
+	if fp == "" {
+		return fp, fmt.Errorf("cannot expand an empty string")
+	}
 	if fp[0] != '~' {
 		return fp, nil
 	}
@@ -93,8 +97,10 @@ func expandHomePath(fp string) (string, error) {
 
 // ReadFileBytes expands home directory and reads a file.
 func ReadFileBytes(fp string) ([]byte, error) {
-	var err error
-	fp, err = expandHomePath(fp)
+	if fp == "" {
+		return nil, fmt.Errorf("cannot expand an empty string")
+	}
+	fp, err := expandHomePath(fp)
 	if err != nil {
 		return nil, err
 	}