From ebb825e6ed63b13851e82e0f132376ee3559392b Mon Sep 17 00:00:00 2001 From: Nicolas Ontiveros Date: Mon, 17 Jul 2023 11:08:50 -0700 Subject: [PATCH] validate static refactor --- pkg/api/admin/openshiftcluster_validatestatic.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkg/api/admin/openshiftcluster_validatestatic.go b/pkg/api/admin/openshiftcluster_validatestatic.go index 0a9b0f771dc..2b21bc125c3 100644 --- a/pkg/api/admin/openshiftcluster_validatestatic.go +++ b/pkg/api/admin/openshiftcluster_validatestatic.go @@ -29,11 +29,15 @@ func (sv openShiftClusterStaticValidator) validateDelta(oc, current *OpenShiftCl return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodePropertyChangeNotAllowed, err.Target, err.Message) } - if !(oc.Properties.MaintenanceTask == "" || - oc.Properties.MaintenanceTask == MaintenanceTaskEverything || - oc.Properties.MaintenanceTask == MaintenanceTaskOperator || - oc.Properties.MaintenanceTask == MaintenanceTaskRenewCerts || - oc.Properties.MaintenanceTask == MaintenanceTaskPucmPending) { + return validateMaintenanceTask(oc.Properties.MaintenanceTask) +} + +func validateMaintenanceTask(task MaintenanceTask) error { + if !(task == "" || + task == MaintenanceTaskEverything || + task == MaintenanceTaskOperator || + task == MaintenanceTaskRenewCerts || + task == MaintenanceTaskPucmPending) { return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidParameter, "properties.maintenanceTask", "Invalid enum parameter.") }