simplify webhook logic (#50)

Author: dgrove-oss

internal/controller/appwrapper_webhook.go

@@ -55,8 +55,8 @@ var _ webhook.CustomDefaulter = &AppWrapperWebhook{}
 // Default ensures that Suspend is set appropriately when an AppWrapper is created
 func (w *AppWrapperWebhook) Default(ctx context.Context, obj runtime.Object) error {
 	aw := obj.(*workloadv1beta2.AppWrapper)
+	log.FromContext(ctx).Info("Applying defaults", "job", aw)
 	jobframework.ApplyDefaultForSuspend((*AppWrapper)(aw), w.Config.ManageJobsWithoutQueueName)
-	log.FromContext(ctx).Info("Applied defaults", "job", aw)
 	return nil
 }
 
@@ -67,17 +67,10 @@ var _ webhook.CustomValidator = &AppWrapperWebhook{}
 // ValidateCreate validates invariants when an AppWrapper is created
 func (w *AppWrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
 	aw := obj.(*workloadv1beta2.AppWrapper)
+	log.FromContext(ctx).Info("Validating create", "job", aw)
 
 	allErrors := w.validateAppWrapperCreate(ctx, aw)
-	if w.Config.ManageJobsWithoutQueueName || jobframework.QueueName((*AppWrapper)(aw)) != "" {
-		allErrors = append(allErrors, jobframework.ValidateCreateForQueueName((*AppWrapper)(aw))...)
-	}
-
-	if len(allErrors) > 0 {
-		log.FromContext(ctx).Info("Validating create failed", "job", aw, "errors", allErrors)
-	} else {
-		log.FromContext(ctx).Info("Validating create succeeded", "job", aw)
-	}
+	allErrors = append(allErrors, jobframework.ValidateCreateForQueueName((*AppWrapper)(aw))...)
 
 	return nil, allErrors.ToAggregate()
 }
@@ -86,18 +79,11 @@ func (w *AppWrapperWebhook) ValidateCreate(ctx context.Context, obj runtime.Obje
 func (w *AppWrapperWebhook) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
 	oldAW := oldObj.(*workloadv1beta2.AppWrapper)
 	newAW := newObj.(*workloadv1beta2.AppWrapper)
+	log.FromContext(ctx).Info("Validating update", "job", newAW)
 
 	allErrors := w.validateAppWrapperUpdate(oldAW, newAW)
-	if w.Config.ManageJobsWithoutQueueName || jobframework.QueueName((*AppWrapper)(newAW)) != "" {
-		allErrors = append(allErrors, jobframework.ValidateUpdateForQueueName((*AppWrapper)(oldAW), (*AppWrapper)(newAW))...)
-		allErrors = append(allErrors, jobframework.ValidateUpdateForWorkloadPriorityClassName((*AppWrapper)(oldAW), (*AppWrapper)(newAW))...)
-	}
-
-	if len(allErrors) > 0 {
-		log.FromContext(ctx).Info("Validating update failed", "job", newAW, "errors", allErrors)
-	} else {
-		log.FromContext(ctx).Info("Validating update succeeded", "job", newAW)
-	}
+	allErrors = append(allErrors, jobframework.ValidateUpdateForQueueName((*AppWrapper)(oldAW), (*AppWrapper)(newAW))...)
+	allErrors = append(allErrors, jobframework.ValidateUpdateForWorkloadPriorityClassName((*AppWrapper)(oldAW), (*AppWrapper)(newAW))...)
 
 	return nil, allErrors.ToAggregate()
 }