(GH-167) Move GetDefaultTemplatePath func to utils package

puppetlabs-toy-chest · Aug 20, 2021 · b7a4c05 · b7a4c05
1 parent bbd813f
commit b7a4c05
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/cmd/new/new.go b/cmd/new/new.go
@@ -2,8 +2,6 @@ package new
 
 import (
  "fmt"
- "os"
- "path/filepath"
  "strings"
 
  "github.com/puppetlabs/pdkgo/internal/pkg/pct"
@@ -77,7 +75,7 @@ func CreateCommand() *cobra.Command {
 }
 
 func preExecute(cmd *cobra.Command, args []string) error {
- defaultTemplatePath, err := getDefaultTemplatePath()
+ defaultTemplatePath, err := utils.GetDefaultTemplatePath()
  if err != nil {
  return err
  }
@@ -201,14 +199,3 @@ func execute(cmd *cobra.Command, args []string) error {
 
  return nil
 }
-
-func getDefaultTemplatePath() (string, error) {
- execDir, err := os.Executable()
- if err != nil {
- return "", err
- }
-
- defaultTemplatePath := filepath.Join(filepath.Dir(execDir), "templates")
- log.Trace().Msgf("Default template path: %v", defaultTemplatePath)
- return defaultTemplatePath, nil
-}
diff --git a/internal/pkg/utils/utils.go b/internal/pkg/utils/utils.go
@@ -46,3 +46,14 @@ func ChunkedCopy(dst io.Writer, src io.Reader) error {
  }
  }
 }
+
+func GetDefaultTemplatePath() (string, error) {
+ execDir, err := os.Executable()
+ if err != nil {
+ return "", err
+ }
+
+ defaultTemplatePath := filepath.Join(filepath.Dir(execDir), "templates")
+ log.Trace().Msgf("Default template path: %v", defaultTemplatePath)
+ return defaultTemplatePath, nil
+}