Clean CR status message when necessary

akondur · akondur · commit a171761de4e1 · 2024-07-23T16:42:44.000-05:00
diff --git a/pkg/splunk/enterprise/util.go b/pkg/splunk/enterprise/util.go
@@ -2145,6 +2145,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro
 		}
 
 		// CSPL-2626 - Update error
+		origCR.(*enterpriseApi.Standalone).Status.Message = ""
 		if (crError != nil) && ((*crError) != nil) {
 			origCR.(*enterpriseApi.Standalone).Status.Message = (*crError).Error()
 		}
@@ -2168,6 +2169,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro
 		}
 
 		// CSPL-2626 - Update error
+		origCR.(*enterpriseApi.LicenseManager).Status.Message = ""
 		if (crError != nil) && ((*crError) != nil) {
 			origCR.(*enterpriseApi.LicenseManager).Status.Message = (*crError).Error()
 		}
@@ -2182,6 +2184,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro
 		}
 
 		// CSPL-2626 - Update error
+		origCR.(*enterpriseApi.SearchHeadCluster).Status.Message = ""
 		if (crError != nil) && ((*crError) != nil) {
 			origCR.(*enterpriseApi.SearchHeadCluster).Status.Message = (*crError).Error()
 		}
@@ -2196,6 +2199,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro
 		}
 
 		// CSPL-2626 - Update error
+		origCR.(*enterpriseApi.IndexerCluster).Status.Message = ""
 		if (crError != nil) && ((*crError) != nil) {
 			origCR.(*enterpriseApi.IndexerCluster).Status.Message = (*crError).Error()
 		}
@@ -2219,6 +2223,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro
 		}
 
 		// CSPL-2626 - Update error
+		origCR.(*enterpriseApi.ClusterManager).Status.Message = ""
 		if (crError != nil) && ((*crError) != nil) {
 			origCR.(*enterpriseApi.ClusterManager).Status.Message = (*crError).Error()
 		}
@@ -2233,6 +2238,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro
 		}
 
 		// CSPL-2626 - Update error
+		origCR.(*enterpriseApi.MonitoringConsole).Status.Message = ""
 		if (crError != nil) && ((*crError) != nil) {
 			origCR.(*enterpriseApi.MonitoringConsole).Status.Message = (*crError).Error()
 		}

Original file line number	Diff line number	Diff line change
`@@ -2145,6 +2145,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro`
`2145`	`2145`	`}`
`2146`	`2146`
`2147`	`2147`	`// CSPL-2626 - Update error`
	`2148`	`+ origCR.(*enterpriseApi.Standalone).Status.Message = ""`
`2148`	`2149`	`if (crError != nil) && ((*crError) != nil) {`
`2149`	`2150`	`origCR.(enterpriseApi.Standalone).Status.Message = (crError).Error()`
`2150`	`2151`	`}`
`@@ -2168,6 +2169,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro`
`2168`	`2169`	`}`
`2169`	`2170`
`2170`	`2171`	`// CSPL-2626 - Update error`
	`2172`	`+ origCR.(*enterpriseApi.LicenseManager).Status.Message = ""`
`2171`	`2173`	`if (crError != nil) && ((*crError) != nil) {`
`2172`	`2174`	`origCR.(enterpriseApi.LicenseManager).Status.Message = (crError).Error()`
`2173`	`2175`	`}`
`@@ -2182,6 +2184,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro`
`2182`	`2184`	`}`
`2183`	`2185`
`2184`	`2186`	`// CSPL-2626 - Update error`
	`2187`	`+ origCR.(*enterpriseApi.SearchHeadCluster).Status.Message = ""`
`2185`	`2188`	`if (crError != nil) && ((*crError) != nil) {`
`2186`	`2189`	`origCR.(enterpriseApi.SearchHeadCluster).Status.Message = (crError).Error()`
`2187`	`2190`	`}`
`@@ -2196,6 +2199,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro`
`2196`	`2199`	`}`
`2197`	`2200`
`2198`	`2201`	`// CSPL-2626 - Update error`
	`2202`	`+ origCR.(*enterpriseApi.IndexerCluster).Status.Message = ""`
`2199`	`2203`	`if (crError != nil) && ((*crError) != nil) {`
`2200`	`2204`	`origCR.(enterpriseApi.IndexerCluster).Status.Message = (crError).Error()`
`2201`	`2205`	`}`
`@@ -2219,6 +2223,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro`
`2219`	`2223`	`}`
`2220`	`2224`
`2221`	`2225`	`// CSPL-2626 - Update error`
	`2226`	`+ origCR.(*enterpriseApi.ClusterManager).Status.Message = ""`
`2222`	`2227`	`if (crError != nil) && ((*crError) != nil) {`
`2223`	`2228`	`origCR.(enterpriseApi.ClusterManager).Status.Message = (crError).Error()`
`2224`	`2229`	`}`
`@@ -2233,6 +2238,7 @@ func fetchCurrentCRWithStatusUpdate(ctx context.Context, client splcommon.Contro`
`2233`	`2238`	`}`
`2234`	`2239`
`2235`	`2240`	`// CSPL-2626 - Update error`
	`2241`	`+ origCR.(*enterpriseApi.MonitoringConsole).Status.Message = ""`
`2236`	`2242`	`if (crError != nil) && ((*crError) != nil) {`
`2237`	`2243`	`origCR.(enterpriseApi.MonitoringConsole).Status.Message = (crError).Error()`
`2238`	`2244`	`}`