Skip to content

Commit

Permalink
Merge pull request openstack-k8s-operators#259 from abays/improve_val…
Browse files Browse the repository at this point in the history 
…id_dep_err_msgs

Improve specificity of validation err msgs for deps
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Apr 3, 2023
2 parents 9cc62ec + 824cfb2 commit e0bd376
Showing 1 changed file with 65 additions and 36 deletions.
101 changes: 65 additions & 36 deletions apis/core/v1beta1/openstackcontrolplane_webhook.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,31 +87,49 @@ func (r *OpenStackControlPlane) ValidateDelete() error {
return nil
}

func (r *OpenStackControlPlane) checkDepsEnabled(name string) bool {
// checkDepsEnabled - returns a non-empty string if required services are missing (disabled) for "name" service
func (r *OpenStackControlPlane) checkDepsEnabled(name string) string {

// "msg" will hold any dependency validation error we might find
msg := ""
// "reqs" will be set to the required services for "name" service
// if any of those required services are improperly disabled/missing
reqs := ""

switch name {
case "Keystone":
return (r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled)
if !(r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) {
reqs = "MariaDB or Galera"
}
case "Glance":
return (r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) &&
r.Spec.Keystone.Enabled
if !((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) && r.Spec.Keystone.Enabled) {
reqs = "MariaDB or Galera, Keystone"
}
case "Cinder":
return ((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) &&
r.Spec.Rabbitmq.Enabled &&
r.Spec.Keystone.Enabled)
if !((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) && r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
reqs = "MariaDB or Galera, Keystone, RabbitMQ"
}
case "Placement":
return (r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) &&
r.Spec.Keystone.Enabled
if !((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) && r.Spec.Keystone.Enabled) {
reqs = "MariaDB or Galera, Keystone"
}
case "Neutron":
return ((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) &&
r.Spec.Rabbitmq.Enabled &&
r.Spec.Keystone.Enabled)
if !((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) && r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled) {
reqs = "MariaDB or Galera, Keystone, RabbitMQ"
}
case "Nova":
return ((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) &&
r.Spec.Rabbitmq.Enabled &&
r.Spec.Keystone.Enabled && r.Spec.Placement.Enabled &&
r.Spec.Neutron.Enabled && r.Spec.Glance.Enabled)
if !((r.Spec.Mariadb.Enabled || r.Spec.Galera.Enabled) && r.Spec.Rabbitmq.Enabled && r.Spec.Keystone.Enabled &&
r.Spec.Placement.Enabled && r.Spec.Neutron.Enabled && r.Spec.Glance.Enabled) {
reqs = "MariaDB or Galera, Glance, Keystone, Neutron, Placement, RabbitMQ"
}
}

// If "reqs" is not the empty string, we have missing requirements
if reqs != "" {
msg = fmt.Sprintf("%s requires these services to be enabled: %s.", name, reqs)
}
return true

return msg
}

// ValidateServices implements common function for validating services
Expand All @@ -125,36 +143,47 @@ func (r *OpenStackControlPlane) ValidateServices(basePath *field.Path) field.Err
}

// Add service dependency validations
depErrorMsg := "%s service dependencies are not enabled."

if r.Spec.Keystone.Enabled && !r.checkDepsEnabled("Keystone") {
err := field.Invalid(basePath.Child("keystone").Child("enabled"), r.Spec.Keystone.Enabled, fmt.Sprintf(depErrorMsg, "Keystone"))
allErrs = append(allErrs, err)
if r.Spec.Keystone.Enabled {
if depErrorMsg := r.checkDepsEnabled("Keystone"); depErrorMsg != "" {
err := field.Invalid(basePath.Child("keystone").Child("enabled"), r.Spec.Keystone.Enabled, depErrorMsg)
allErrs = append(allErrs, err)
}
}

if r.Spec.Glance.Enabled && !r.checkDepsEnabled("Glance") {
err := field.Invalid(basePath.Child("glance").Child("enabled"), r.Spec.Glance.Enabled, fmt.Sprintf(depErrorMsg, "Glance"))
allErrs = append(allErrs, err)
if r.Spec.Glance.Enabled {
if depErrorMsg := r.checkDepsEnabled("Glance"); depErrorMsg != "" {
err := field.Invalid(basePath.Child("glance").Child("enabled"), r.Spec.Glance.Enabled, depErrorMsg)
allErrs = append(allErrs, err)
}
}

if r.Spec.Cinder.Enabled && !r.checkDepsEnabled("Cinder") {
err := field.Invalid(basePath.Child("cinder").Child("enabled"), r.Spec.Cinder.Enabled, fmt.Sprintf(depErrorMsg, "Cinder"))
allErrs = append(allErrs, err)
if r.Spec.Cinder.Enabled {
if depErrorMsg := r.checkDepsEnabled("Cinder"); depErrorMsg != "" {
err := field.Invalid(basePath.Child("cinder").Child("enabled"), r.Spec.Cinder.Enabled, depErrorMsg)
allErrs = append(allErrs, err)
}
}

if r.Spec.Placement.Enabled && !r.checkDepsEnabled("Placement") {
err := field.Invalid(basePath.Child("placement").Child("enabled"), r.Spec.Placement.Enabled, fmt.Sprintf(depErrorMsg, "Placement"))
allErrs = append(allErrs, err)
if r.Spec.Placement.Enabled {
if depErrorMsg := r.checkDepsEnabled("Placement"); depErrorMsg != "" {
err := field.Invalid(basePath.Child("placement").Child("enabled"), r.Spec.Placement.Enabled, depErrorMsg)
allErrs = append(allErrs, err)
}
}

if r.Spec.Neutron.Enabled && !r.checkDepsEnabled("Neutron") {
err := field.Invalid(basePath.Child("neutron").Child("enabled"), r.Spec.Neutron.Enabled, fmt.Sprintf(depErrorMsg, "Neutron"))
allErrs = append(allErrs, err)
if r.Spec.Neutron.Enabled {
if depErrorMsg := r.checkDepsEnabled("Neutron"); depErrorMsg != "" {
err := field.Invalid(basePath.Child("neutron").Child("enabled"), r.Spec.Neutron.Enabled, depErrorMsg)
allErrs = append(allErrs, err)
}
}

if r.Spec.Nova.Enabled && !r.checkDepsEnabled("Nova") {
err := field.Invalid(basePath.Child("nova").Child("enabled"), r.Spec.Nova.Enabled, fmt.Sprintf(depErrorMsg, "Nova"))
allErrs = append(allErrs, err)
if r.Spec.Nova.Enabled {
if depErrorMsg := r.checkDepsEnabled("Nova"); depErrorMsg != "" {
err := field.Invalid(basePath.Child("nova").Child("enabled"), r.Spec.Nova.Enabled, depErrorMsg)
allErrs = append(allErrs, err)
}
}

// Checks which call internal validation logic for individual service operators
Expand Down

0 comments on commit e0bd376

Please sign in to comment.