fix: panic on template webhook validation

Signed-off-by: thxCode <[email protected]>
seal-io · Apr 18, 2024 · 8783c19 · 8783c19
1 parent 9999ec5
commit 8783c19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/webhooks/walruscore/catalog.go b/pkg/webhooks/walruscore/catalog.go
@@ -55,7 +55,6 @@ func (r *CatalogWebhook) validateFilter(obj runtime.Object) (ctrladmission.Warni
 				field.NewPath("spec.filters.includeExpression"), filters.IncludeExpression, err.Error())
 		}
 	}
-
 	if filters.ExcludeExpression != "" {
 		if _, err := regexp.Compile(filters.ExcludeExpression); err != nil {
 			return nil, field.Invalid(

diff --git a/pkg/webhooks/walruscore/template.go b/pkg/webhooks/walruscore/template.go
@@ -30,8 +30,11 @@ var _ ctrlwebhook.CustomValidator = (*TemplateWebhook)(nil)
 func (r *TemplateWebhook) ValidateCreate(ctx context.Context, obj runtime.Object) (ctrladmission.Warnings, error) {
 	t := obj.(*walruscore.Template)
 	_, err := sourceurl.ParseURLToSourceURL(t.Spec.VCSRepository.URL)
-	return nil, field.Invalid(
-		field.NewPath("spec.vcsRepository.url"), t.Spec.VCSRepository.URL, err.Error())
+	if err != nil {
+		return nil, field.Invalid(
+			field.NewPath("spec.vcsRepository.url"), t.Spec.VCSRepository.URL, err.Error())
+	}
+	return nil, nil
 }
 
 func (r *TemplateWebhook) ValidateDelete(ctx context.Context, obj runtime.Object) (ctrladmission.Warnings, error) {