(maint) Break out utilsHelper to own file

internal/pkg/utils/utils.go

@@ -3,8 +3,6 @@ package utils
 import (
  "fmt"
  "io"
- "os"
- "path/filepath"
 )
 
 // contains checks if a string is present in a slice
@@ -48,30 +46,3 @@ func ChunkedCopy(dst io.Writer, src io.Reader) error {
  }
  }
 }
-
-type UtilsHelperI interface {
- IsModuleRoot() (string, error)
- Dir() (string, error)
-}
-
-type UtilsHelper struct{}
-
-// Check if we're currently in the module root dir.
-// Return the sanitized file path if we are in a module root, otherwise an empty string.
-func (u *UtilsHelper) IsModuleRoot() (string, error) {
- wd, err := os.Getwd()
- if err != nil {
- return "", err
- }
-
- _, err = os.Stat(filepath.Join(wd, "metadata.json"))
- if err != nil {
- return "", err
- }
-
- return filepath.Clean(wd), nil
-}
-
-func (u *UtilsHelper) Dir() (string, error) {
- return homedir.Dir()
-}

internal/pkg/utils/utilsHelper.go

@@ -0,0 +1,35 @@
+package utils
+
+import (
+ "os"
+ "path/filepath"
+
+ "github.com/mitchellh/go-homedir"
+)
+
+type UtilsHelperI interface {
+ IsModuleRoot() (string, error)
+ Dir() (string, error)
+}
+
+type UtilsHelper struct{}
+
+// Check if we're currently in the module root dir.
+// Return the sanitized file path if we are in a module root, otherwise an empty string.
+func (u *UtilsHelper) IsModuleRoot() (string, error) {
+ wd, err := os.Getwd()
+ if err != nil {
+ return "", err
+ }
+
+ _, err = os.Stat(filepath.Join(wd, "metadata.json"))
+ if err != nil {
+ return "", err
+ }
+
+ return filepath.Clean(wd), nil
+}
+
+func (u *UtilsHelper) Dir() (string, error) {
+ return homedir.Dir()
+}