Minor

Signed-off-by: Halvdan Hoem Grelland <[email protected]>

Author: grelland

pkg/gator/reader/read_resources.go

@@ -261,7 +261,7 @@ func ReadExpansions(f fs.FS, path string) ([]*unstructured.Unstructured, error)
 	for _, obj := range objs {
 		gvk := obj.GroupVersionKind()
 		if gvk.Group != "expansion.gatekeeper.sh" || gvk.Kind != "ExpansionTemplate" {
-			return nil, gator.ErrNotAnExpansion
+			return nil, fmt.Errorf("%w: %q", gator.ErrNotAnExpansion, path)
 		}
 	}
 

pkg/gator/verify/runner.go

@@ -12,6 +12,12 @@ import (
 	"github.com/open-policy-agent/frameworks/constraint/pkg/client/reviews"
 	"github.com/open-policy-agent/frameworks/constraint/pkg/types"
 
+	admissionv1 "k8s.io/api/admission/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/utils/ptr"
+	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
+
 	"github.com/open-policy-agent/gatekeeper/v3/apis"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/expansion"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/gator"
@@ -20,11 +26,6 @@ import (
 	mutationtypes "github.com/open-policy-agent/gatekeeper/v3/pkg/mutation/types"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/target"
 	"github.com/open-policy-agent/gatekeeper/v3/pkg/util"
-	admissionv1 "k8s.io/api/admission/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/utils/ptr"
-	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 )
 
 // Runner defines logic independent of how tests are run and the results are
@@ -239,12 +240,12 @@ func (r *Runner) makeTestExpander(suiteDir string, t *Test) (*expand.Expander, e
 		return nil, nil
 	}
 
-	expansionsTemplates, err := reader.ReadExpansions(r.filesystem, path.Join(suiteDir, expansionPath))
+	expansionTemplates, err := reader.ReadExpansions(r.filesystem, path.Join(suiteDir, expansionPath))
 	if err != nil {
 		return nil, err
 	}
 
-	er, err := expand.NewExpander(expansionsTemplates)
+	er, err := expand.NewExpander(expansionTemplates)
 	return er, err
 }