fix: undelete all key bug

bcs-services/bcs-bscp/.gitignore

@@ -4,4 +4,5 @@ bcs-bscp
 bin
 .codecc
 .idea
-.vscode
+.vscode
+__debug_bin

bcs-services/bcs-bscp/cmd/data-service/service/kv.go

@@ -465,10 +465,7 @@ func (s *Service) UnDeleteKv(ctx context.Context, req *pbds.UnDeleteKvReq) (*pbb
 		}
 	}
 
-	kvState = []string{
-		string(table.KvStateDelete),
-	}
-	if err = s.dao.Kv().UpdateSelectedKVStates(kt, tx, req.Attachment.BizId, req.Attachment.AppId, kvState,
+	if err = s.dao.Kv().UpdateStateWithTx(kt, tx, req.Attachment.BizId, req.Attachment.AppId, req.Spec.Key,
 		table.KvStateUnchange); err != nil {
 		if rErr := tx.Rollback(); rErr != nil {
 			logs.Errorf("transaction rollback failed, err: %v, rid: %s", rErr, kt.Rid)

bcs-services/bcs-bscp/pkg/dal/dao/kv.go

@@ -53,6 +53,8 @@ type Kv interface {
 	// UpdateSelectedKVStates updates the states of selected kv pairs using a transaction
 	UpdateSelectedKVStates(kit *kit.Kit, tx *gen.QueryTx, bizID, appID uint32, targetKVStates []string,
 		newKVStates table.KvState) error
+	// UpdateStateWithTx updates the state of a kv pair with transaction
+	UpdateStateWithTx(kit *kit.Kit, tx *gen.QueryTx, bizID, appID uint32, key string, state table.KvState) error
 	// DeleteByStateWithTx deletes kv pairs with a specific state using a transaction
 	DeleteByStateWithTx(kit *kit.Kit, tx *gen.QueryTx, kv *table.Kv) error
 }
@@ -415,6 +417,30 @@ func (dao *kvDao) UpdateSelectedKVStates(kit *kit.Kit, tx *gen.QueryTx, bizID, a
 	return nil
 }
 
+// UpdateStateWithTx updates the state of a kv pair with transaction
+func (dao *kvDao) UpdateStateWithTx(kit *kit.Kit, tx *gen.QueryTx, bizID, appID uint32, key string,
+	state table.KvState) error {
+	if bizID <= 0 {
+		return errors.New("biz id should be set")
+	}
+
+	if appID <= 0 {
+		return errors.New("app id should be set")
+	}
+
+	if key == "" {
+		return errors.New("key cannot be empty")
+	}
+
+	if state.String() == "" {
+		return errors.New("state cannot be empty")
+	}
+
+	m := tx.Kv
+	_, err := m.WithContext(kit.Ctx).Where(m.BizID.Eq(bizID), m.AppID.Eq(appID), m.Key.Eq(key)).Update(m.KvState, state)
+	return err
+}
+
 // ListAllByAppID list all Kv by appID
 func (dao *kvDao) ListAllByAppID(kit *kit.Kit, appID uint32, bizID uint32, kvState []string) ([]*table.Kv, error) {
 	if appID == 0 {

bcs-services/bcs-bscp/pkg/dal/table/kv.go

@@ -265,3 +265,18 @@ const (
 	// KvStateUnchange 不变
 	KvStateUnchange KvState = "UNCHANGE"
 )
+
+// String get string value of KvState
+func (k KvState) String() string {
+	return string(k)
+}
+
+// Validate validate kv state is valid or not.
+func (k KvState) Validate() error {
+	switch k {
+	case KvStateAdd, KvStateDelete, KvStateRevise, KvStateUnchange:
+		return nil
+	default:
+		return errors.New("invalid kv state")
+	}
+}