change secret remove logic in cli Upstream-commit: 063d5679c5662c260cd7d53efc10da0a835366e0 Component: engine