refactor: refactor helm validate and set default timeout

devstream-io · Jun 30, 2022 · 7d0401a · 7d0401a
1 parent 8ab86a8
commit 7d0401a
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 15 deletions.
diff --git a/internal/pkg/plugin/argocd/validate.go b/internal/pkg/plugin/argocd/validate.go
@@ -7,5 +7,5 @@ import (
 
 // validate validates the options provided by the core.
 func validate(opts *Options) []error {
-	return helm.Validate(opts.GetHelmParam())
+	return helm.DefaultsAndValidate(opts.GetHelmParam())
 }
diff --git a/internal/pkg/plugin/hashicorpvault/validate.go b/internal/pkg/plugin/hashicorpvault/validate.go
@@ -7,5 +7,5 @@ import (
 
 // validate the options provided by the core.
 func validate(opts *Options) []error {
-	return helm.Validate(opts.GetHelmParam())
+	return helm.DefaultsAndValidate(opts.GetHelmParam())
 }
diff --git a/internal/pkg/plugin/helmgeneric/validate.go b/internal/pkg/plugin/helmgeneric/validate.go
@@ -7,5 +7,5 @@ import (
 
 // validate validates the options provided by the core.
 func validate(opts *Options) []error {
-	return helm.Validate(opts.GetHelmParam())
+	return helm.DefaultsAndValidate(opts.GetHelmParam())
 }
diff --git a/internal/pkg/plugin/jenkins/validate.go b/internal/pkg/plugin/jenkins/validate.go
@@ -10,7 +10,7 @@ import (
 
 // validate validates the options provided by the core.
 func validate(opts *Options) []error {
-	errs := helm.Validate(opts.GetHelmParam())
+	errs := helm.DefaultsAndValidate(opts.GetHelmParam())
 	if len(errs) != 0 {
 		return errs
 	}

diff --git a/internal/pkg/plugin/kubeprometheus/validate.go b/internal/pkg/plugin/kubeprometheus/validate.go
@@ -7,5 +7,5 @@ import (
 
 // validate validates the options provided by the core.
 func validate(opts *Options) []error {
-	return helm.Validate(opts.GetHelmParam())
+	return helm.DefaultsAndValidate(opts.GetHelmParam())
 }
diff --git a/internal/pkg/plugin/openldap/validate.go b/internal/pkg/plugin/openldap/validate.go
@@ -7,5 +7,5 @@ import (
 
 // validate validates the options provided by the core.
 func validate(opts *Options) []error {
-	return helm.Validate(opts.GetHelmParam())
+	return helm.DefaultsAndValidate(opts.GetHelmParam())
 }
diff --git a/internal/pkg/plugin/tekton/validate.go b/internal/pkg/plugin/tekton/validate.go
@@ -7,5 +7,5 @@ import (
 
 // validate validates the options provided by the core.
 func validate(opts *Options) []error {
-	return helm.Validate(opts.GetHelmParam())
+	return helm.DefaultsAndValidate(opts.GetHelmParam())
 }
diff --git a/pkg/util/helm/validation.go b/pkg/util/helm/validation.go
@@ -2,16 +2,19 @@ package helm
 
 import "github.com/devstream-io/devstream/pkg/util/validator"
 
-func Validate(param *HelmParam) []error {
-	Defaults(param)
-	return validator.Struct(param)
-}
-
-// Defaults set the default value with HelmParam.
-// TODO(daniel-hutao): don't call this function insides the Validate()
-func Defaults(param *HelmParam) {
+// defaults set the default value with HelmParam.
+func defaults(param *HelmParam) {
 	if param.Chart.Timeout == "" {
 		// Make the timeout be same as the default value for `--timeout` with `helm install/upgrade/rollback`
 		param.Chart.Timeout = "5m0s"
 	}
 }
+
+func validate(param *HelmParam) []error {
+	return validator.Struct(param)
+}
+
+func DefaultsAndValidate(param *HelmParam) []error {
+	defaults(param)
+	return validate(param)
+}