No error returns for removing a non-matching constraint (#170)

Signed-off-by: Becky Huang <beckyhd@google.com>
open-policy-agent · Jan 22, 2022 · f427e48 · f427e48
1 parent e2cb9e5
commit f427e48
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/constraint/pkg/client/drivers/local/local.go b/constraint/pkg/client/drivers/local/local.go
@@ -609,7 +609,9 @@ func (d *Driver) AddConstraint(ctx context.Context, constraint *unstructured.Uns
 func (d *Driver) RemoveConstraint(ctx context.Context, constraint *unstructured.Unstructured) error {
 	handlers, err := d.getTargetHandlers(constraint)
 	if err != nil {
-		return err
+		if !errors.Is(err, ErrMissingConstraintTemplate) {
+			return err
+		}
 	}
 	for _, target := range handlers {
 		relPath, err := createConstraintPath(target, constraint)

diff --git a/constraint/pkg/client/drivers/local/local_unit_test.go b/constraint/pkg/client/drivers/local/local_unit_test.go
@@ -623,12 +623,12 @@ func TestDriver_RemoveConstraint(t *testing.T) {
 			template:   CreateTemplate(MockTargetHandler, TemplateModule),
 			constraint: MakeConstraint(t, MockTemplate, "foo"),
 			toRemove:   MakeConstraint(t, "", "foo"),
-			wantError:  ErrMissingConstraintTemplate,
+			wantError:  nil,
 		},
 		{
 			name:      "No Template",
 			toRemove:  MakeConstraint(t, "Foos", "foo"),
-			wantError: ErrMissingConstraintTemplate,
+			wantError: nil,
 		},
 		{
 			name:      "No Constraint",