amends

Signed-off-by: Mikhail Scherba <[email protected]>
flant · Dec 19, 2024 · a063fe5 · a063fe5
1 parent 345d75f
commit a063fe5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/pkg/hook/config/config_v1.go b/pkg/hook/config/config_v1.go
@@ -518,15 +518,13 @@ func convertMutating(cfgV1 KubernetesAdmissionConfigV1) (htypes.MutatingConfig,
 }
 
 func (cv1 *HookConfigV1) CheckConversion(kubeConfigs []htypes.OnKubernetesEventConfig, cfgV1 KubernetesConversionConfigV1) error {
-	var allErr error
-
 	if len(cfgV1.IncludeSnapshotsFrom) > 0 {
 		if err := CheckIncludeSnapshots(kubeConfigs, cfgV1.IncludeSnapshotsFrom...); err != nil {
-			allErr = multierror.Append(allErr, fmt.Errorf("includeSnapshotsFrom is invalid: %w", err))
+			return fmt.Errorf("includeSnapshotsFrom is invalid: %w", err)
 		}
 	}
 
-	return allErr
+	return nil
 }
 
 func (cv1 *HookConfigV1) ConvertConversion(cfgV1 KubernetesConversionConfigV1) (htypes.ConversionConfig, error) {

diff --git a/pkg/hook/hook_manager.go b/pkg/hook/hook_manager.go
@@ -201,7 +201,7 @@ func (hm *Manager) loadHook(hookPath string) (*Hook, error) {
 	hook.WithTmpDir(hm.TempDir())
 
 	if hook.Config == nil {
-		return nil, fmt.Errorf("hook %s is marked as executable but doesn't contain config section", hook.Path)
+		return nil, fmt.Errorf("hook %q is marked as executable but doesn't contain config section", hook.Path)
 	}
 
 	hookEntry.Infof("Loaded config: %s", hook.GetConfigDescription())

diff --git a/pkg/shell-operator/operator.go b/pkg/shell-operator/operator.go
@@ -213,7 +213,7 @@ func (op *ShellOperator) initValidatingWebhookManager() error {
 
 	err := op.AdmissionWebhookManager.Init()
 	if err != nil {
-		return fmt.Errorf("ConversionWebhookManager init: %w", err)
+		return fmt.Errorf("ValidatingWebhookManager init: %w", err)
 	}
 
 	for _, hookName := range hookNames {