Fix readDir regression

This reverts the `tpl/os` package, excluding new integration test, to `v0.92.2`.

We need some more tests and investigation into the old behaviour before we can change this.

Fixes gohugoio#9609

hugofs/fs.go

@@ -67,18 +67,25 @@ func NewFrom(fs afero.Fs, cfg config.Provider) *Fs {
 	return newFs(fs, cfg)
 }
 
-func newFs(base afero.Fs, cfg config.Provider) *Fs {
+func NewForWorkingDir(base afero.Fs, workingDir string) *Fs {
 	return &Fs{
 		Source:      base,
 		Destination: base,
 		Os:          &afero.OsFs{},
-		WorkingDir:  getWorkingDirFs(base, cfg),
+		WorkingDir:  getWorkingDirFs(base, workingDir),
 	}
 }
 
-func getWorkingDirFs(base afero.Fs, cfg config.Provider) *afero.BasePathFs {
-	workingDir := cfg.GetString("workingDir")
+func newFs(base afero.Fs, cfg config.Provider) *Fs {
+	return &Fs{
+		Source:      base,
+		Destination: base,
+		Os:          &afero.OsFs{},
+		WorkingDir:  getWorkingDirFs(base, cfg.GetString("workingDir")),
+	}
+}
 
+func getWorkingDirFs(base afero.Fs, workingDir string) *afero.BasePathFs {
 	if workingDir != "" {
 		return afero.NewBasePathFs(afero.NewReadOnlyFs(base), workingDir).(*afero.BasePathFs)
 	}

hugolib/integrationtest_builder.go

@@ -265,7 +265,7 @@ func (s *IntegrationTestBuilder) initBuilder() {
 
 		logger := loggers.NewBasicLoggerForWriter(s.Cfg.LogLevel, &s.logBuff)
 
-		fs := hugofs.NewFrom(afs, config.New())
+		fs := hugofs.NewForWorkingDir(afs, s.Cfg.WorkingDir)
 
 		for _, f := range s.data.Files {
 			filename := filepath.Join(s.Cfg.WorkingDir, f.Name)

tpl/os/integration_test.go

@@ -49,3 +49,5 @@ START:|{{ range $entry := $entries }}{{ if not $entry.IsDir }}{{ $entry.Name }}|
 START:|config.toml|myproject.txt|:END:
 `)
 }
+
+// Issue 9609

tpl/os/os.go

@@ -19,35 +19,33 @@ import (
 	"errors"
 	"fmt"
 	_os "os"
-	"path/filepath"
 
+	"github.com/gohugoio/hugo/common/herrors"
 	"github.com/gohugoio/hugo/deps"
 	"github.com/spf13/afero"
 	"github.com/spf13/cast"
 )
 
 // New returns a new instance of the os-namespaced template functions.
 func New(d *deps.Deps) *Namespace {
-	var readFileFs, workFs afero.Fs
+	var rfs afero.Fs
+	if d.Fs != nil {
+		rfs = d.Fs.WorkingDir
+		if d.PathSpec != nil && d.PathSpec.BaseFs != nil {
+			rfs = afero.NewReadOnlyFs(afero.NewCopyOnWriteFs(d.PathSpec.BaseFs.Content.Fs, d.Fs.WorkingDir))
+		}
 
-	// The docshelper script does not have or need all the dependencies set up.
-	if d.PathSpec != nil {
-		readFileFs = afero.NewReadOnlyFs(afero.NewCopyOnWriteFs(d.PathSpec.BaseFs.Content.Fs, d.PathSpec.BaseFs.Work))
-		// See #9599
-		workFs = d.PathSpec.BaseFs.WorkDir
 	}
 
 	return &Namespace{
-		readFileFs: readFileFs,
-		workFs:     workFs,
+		readFileFs: rfs,
 		deps:       d,
 	}
 }
 
 // Namespace provides template functions for the "os" namespace.
 type Namespace struct {
 	readFileFs afero.Fs
-	workFs     afero.Fs
 	deps       *deps.Deps
 }
 
@@ -69,9 +67,8 @@ func (ns *Namespace) Getenv(key interface{}) (string, error) {
 // readFile reads the file named by filename in the given filesystem
 // and returns the contents as a string.
 func readFile(fs afero.Fs, filename string) (string, error) {
-	filename = filepath.Clean(filename)
-	if filename == "" || filename == "." || filename == string(_os.PathSeparator) {
-		return "", errors.New("invalid filename")
+	if filename == "" {
+		return "", errors.New("readFile needs a filename")
 	}
 
 	b, err := afero.ReadFile(fs, filename)
@@ -100,12 +97,13 @@ func (ns *Namespace) ReadFile(i interface{}) (string, error) {
 
 // ReadDir lists the directory contents relative to the configured WorkingDir.
 func (ns *Namespace) ReadDir(i interface{}) ([]_os.FileInfo, error) {
+	defer herrors.Recover()
 	path, err := cast.ToStringE(i)
 	if err != nil {
 		return nil, err
 	}
 
-	list, err := afero.ReadDir(ns.workFs, path)
+	list, err := afero.ReadDir(ns.deps.Fs.WorkingDir, path)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read directory %q: %s", path, err)
 	}