Rebase to master & fix merge conflicts

Signed-off-by: David-Jaeyoon-Lee <[email protected]>
open-policy-agent · Oct 30, 2024 · f9e6699 · f9e6699
1 parent 9892845
commit f9e6699
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/pkg/gator/errors.go b/pkg/gator/errors.go
@@ -19,6 +19,7 @@ var (
 	// SyncSet.
 	ErrNotAGVKManifest = errors.New("not a GVKManifest")
 	// 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.

diff --git a/pkg/gator/reader/read_resources.go b/pkg/gator/reader/read_resources.go
@@ -250,7 +250,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
 	}
 

diff --git a/pkg/gator/verify/runner.go b/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)