OCM-7169 | fix: warn revoked break glass credential

Signed-off-by: Maggie Chen <magchen@redhat.com>
openshift · May 9, 2024 · 0a3c0ed · 0a3c0ed
1 parent 0f7d409
commit 0a3c0ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/cmd/describe/breakglasscredential/cmd.go b/cmd/describe/breakglasscredential/cmd.go
@@ -109,8 +109,9 @@ func runWithRuntime(r *rosa.Runtime, cmd *cobra.Command, argv []string) error {
 	}
 
 	if breakGlassCredentialConfig.Status() == cmv1.BreakGlassCredentialStatusRevoked {
-		return fmt.Errorf("Break glass credential '%s' for cluster '%s' has been revoked.",
+		r.Reporter.Warnf("Break glass credential '%s' for cluster '%s' has been revoked.",
 			breakGlassCredentialId, clusterKey)
+		return nil
 	}
 
 	if output.HasFlag() {

diff --git a/cmd/describe/breakglasscredential/cmd_test.go b/cmd/describe/breakglasscredential/cmd_test.go
@@ -88,10 +88,11 @@ var _ = Describe("Break glass credential", func() {
 			testRuntime.ApiServer.AppendHandlers(RespondWithJSON(http.StatusOK, hypershiftClusterReady))
 			testRuntime.ApiServer.AppendHandlers(RespondWithJSON(http.StatusOK,
 				test.FormatResource(revokedCredential)))
-			_, stderr, err := test.RunWithOutputCaptureAndArgv(runWithRuntime, testRuntime.RosaRuntime,
+			stdout, stderr, err := test.RunWithOutputCaptureAndArgv(runWithRuntime, testRuntime.RosaRuntime,
 				Cmd, &[]string{})
-			Expect(err.Error()).To(Equal("Break glass credential 'test-id' for cluster 'cluster1' has been revoked."))
-			Expect(stderr).To(Equal(""))
+			Expect(err).To(BeNil())
+			Expect(stderr).To(Equal("WARN: Break glass credential 'test-id' for cluster 'cluster1' has been revoked.\n"))
+			Expect(stdout).To(Equal(""))
 		})
 	})
 })