From 0a3c0edfee2e18d35c31817aa68b0cfe8fca7fb8 Mon Sep 17 00:00:00 2001 From: Maggie Chen Date: Thu, 9 May 2024 11:01:57 -0400 Subject: [PATCH] OCM-7169 | fix: warn revoked break glass credential Signed-off-by: Maggie Chen --- cmd/describe/breakglasscredential/cmd.go | 3 ++- cmd/describe/breakglasscredential/cmd_test.go | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmd/describe/breakglasscredential/cmd.go b/cmd/describe/breakglasscredential/cmd.go index c9215944ea..23aef1deb8 100644 --- 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 index 7043b1a2d0..5b0e2ea6df 100644 --- 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("")) }) }) })