Merge pull request #80 from wklken/fix_delete_action_policies

fix(prp/policy_crud): delete action policies return nil if aciton not…
TencentBlueKing · Feb 17, 2022 · c162701 · c162701
2 parents 6b43732 + 5fb4a2b
commit c162701
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/pkg/abac/prp/policy_curd.go b/pkg/abac/prp/policy_curd.go
@@ -11,6 +11,7 @@
 package prp
 
 import (
+	"database/sql"
 	"errors"
 
 	"github.com/TencentBlueKing/gopkg/collection/set"
@@ -359,6 +360,11 @@ func (m *policyManager) DeleteByActionID(systemID, actionID string) error {
 	// 1. 查询 action pk
 	actionPK, err := m.actionService.GetActionPK(systemID, actionID)
 	if err != nil {
+		// if action already deleted, just return
+		if errors.Is(err, sql.ErrNoRows) {
+			return nil
+		}
+
 		err = errorWrapf(err, "actionService.GetActionPK systemID=`%s`, actionID=`%s` fail", systemID, actionID)
 		return err
 	}