Cleanup validation errors (#967)

* Simplify validation error handling (use native errors) * bump chart versoin to 1.44. * rename errors to match best practice --------- Co-authored-by: Richard Hagen <[email protected]>
equinor · Nov 7, 2023 · 15c20d5 · 15c20d5
1 parent 829f390
commit 15c20d5
Show file tree

Hide file tree

Showing 9 changed files with 698 additions and 680 deletions.
diff --git a/charts/radix-operator/Chart.yaml b/charts/radix-operator/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.24.0
-appVersion: 1.44.0
+version: 1.24.1
+appVersion: 1.44.1
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

diff --git a/pipeline-runner/steps/apply_radixconfig.go b/pipeline-runner/steps/apply_radixconfig.go
@@ -198,10 +198,10 @@ func CreateRadixApplication(radixClient radixclient.Interface,
 		ra.Name = strings.ToLower(ra.Name)
 	}
 
-	isRAValid, errs := validate.CanRadixApplicationBeInsertedErrors(radixClient, ra)
-	if !isRAValid {
+	err = validate.CanRadixApplicationBeInserted(radixClient, ra)
+	if err != nil {
 		log.Errorf("Radix config not valid.")
-		return nil, errorUtils.Concat(errs)
+		return nil, err
 	}
 	return ra, nil
 }

diff --git a/pipeline-runner/steps/promotion.go b/pipeline-runner/steps/promotion.go
@@ -129,8 +129,8 @@ func (cli *PromoteStepImplementation) Run(pipelineInfo *model.PipelineInfo) erro
 		return err
 	}
 
-	isValid, err := radixvalidators.CanRadixDeploymentBeInserted(cli.GetRadixclient(), radixDeployment)
-	if !isValid {
+	err = radixvalidators.CanRadixDeploymentBeInserted(radixDeployment)
+	if err != nil {
 		return err
 	}
 

diff --git a/pkg/apis/radixvalidators/errors.go b/pkg/apis/radixvalidators/errors.go