Don't silently fail FS() on bad directory

Signed-off-by: Tamal Saha <tamal@appscode.com>

Author: tamalsaha

go.mod

@@ -18,7 +18,7 @@ require (
 	golang.org/x/net v0.55.0
 	gomodules.xyz/encoding v0.0.8
 	gomodules.xyz/jsonpath v0.0.2
-	gomodules.xyz/x v0.0.17
+	gomodules.xyz/x v0.0.18
 	gopkg.in/yaml.v2 v2.4.0
 	k8s.io/api v0.34.3
 	k8s.io/apiextensions-apiserver v0.34.3

go.sum

@@ -292,8 +292,8 @@ gomodules.xyz/sets v0.2.1 h1:vK3oUWoGVrZKLDKO/bzEo/ucHFdCE7+DxWPeWxK72KQ=
 gomodules.xyz/sets v0.2.1/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc=
 gomodules.xyz/testing v0.0.4 h1:XGKt4B64mBe7P9kPR0Rz1nCQpWoSpBEFdTGkfU1RLe4=
 gomodules.xyz/testing v0.0.4/go.mod h1:hD6aXtv9eVycPwS01zv+QTl5BrK2DXQgr6bHqnrW+44=
-gomodules.xyz/x v0.0.17 h1:Ik3wf0suCMiYPY0miFUh+q8BpjsUHc/7zvANbFViBQA=
-gomodules.xyz/x v0.0.17/go.mod h1:7R5182LvgWj1ZGlnpbhfSLsxM3lFN7LBettztpX+A2I=
+gomodules.xyz/x v0.0.18 h1:Hm4YKg32VYJmFOKpV4mLIPXEpkDFVIso3AhJC/ME9oc=
+gomodules.xyz/x v0.0.18/go.mod h1:lhsalLjQeL2ce489fu7xEVcR5nowKgltuvnXLGgUAdc=
 google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
 google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

vendor/gomodules.xyz/x/ioutil/reloader.go

@@ -5,6 +5,7 @@ import (
 	"embed"
 	iofs "io/fs"
 	"os"
+	"path/filepath"
 )
 
 const (
@@ -31,7 +32,17 @@ func NewReloader(dir string, fs embed.FS, loadFn func(fsys iofs.FS)) *Reloader {
 }
 
 func (r *Reloader) FS() iofs.FS {
-	if fi, err := os.Stat(r.dir); os.IsNotExist(err) || !fi.IsDir() {
+	// Fall back to the embedded FS unless the override directory exists.
+	// Guard against every stat error (not just IsNotExist) so a nil FileInfo
+	// is never dereferenced.
+	if fi, err := os.Stat(r.dir); err != nil || !fi.IsDir() {
+		return r.fs
+	}
+	// Only adopt the override directory once it has been fully populated,
+	// signaled by the presence of the trigger file. Without this check an
+	// empty or partially-written directory (e.g. a stale leftover) would
+	// silently shadow the embedded FS and load nothing.
+	if _, err := os.Stat(filepath.Join(r.dir, TriggerFile)); err != nil {
 		return r.fs
 	}
 	return os.DirFS(r.dir)

vendor/modules.txt

@@ -386,8 +386,8 @@ gomodules.xyz/pointer
 # gomodules.xyz/sets v0.2.1
 ## explicit; go 1.14
 gomodules.xyz/sets
-# gomodules.xyz/x v0.0.17
-## explicit; go 1.22.0
+# gomodules.xyz/x v0.0.18
+## explicit; go 1.25.0
 gomodules.xyz/x/ioutil
 gomodules.xyz/x/version
 # google.golang.org/protobuf v1.36.6