fix error handling and check kind when reading expansion template

Signed-off-by: David-Jaeyoon-Lee <[email protected]>

pkg/gator/errors.go

@@ -9,7 +9,7 @@ var (
 	// ErrNotAConstraint indicates the user-indicated file does not contain a
 	// Constraint.
 	ErrNotAConstraint = errors.New("not a Constraint")
-	// ErrNotAnExpansion indicates the user-indicated file does not contain a
+	// ErrNotAnExpansion indicates the user-indicated file does not contain an
 	// ExpansionTemplate.
 	ErrNotAnExpansion = errors.New("not an Expansion Template")
 	// ErrAddingTemplate indicates a problem instantiating a Suite's ConstraintTemplate.

pkg/gator/reader/read_constraints.go

@@ -184,7 +184,7 @@ func ReadExpansion(f fs.FS, path string) (*unstructured.Unstructured, error) {
 	}
 
 	gvk := u.GroupVersionKind()
-	if gvk.Group != "expansion.gatekeeper.sh" {
+	if gvk.Group != "expansion.gatekeeper.sh" || gvk.Kind != "ExpansionTemplate" {
 		return nil, gator.ErrNotAnExpansion
 	}
 

pkg/gator/verify/runner.go

@@ -366,6 +366,10 @@ func (r *Runner) runReview(ctx context.Context, newClient func() (gator.Client,
 	}
 
 	review, err := c.Review(ctx, au, reviews.EnforcementPoint(util.GatorEnforcementPoint))
+	if err != nil {
+		return nil, fmt.Errorf("reviewing %v %s/%s: %w",
+			toReview.GroupVersionKind(), toReview.GetNamespace(), toReview.GetName(), err)
+	}
 
 	if e != nil {
 		resultants, err := e.Expand(toReview)