split validator

nobl9 · Oct 11, 2023 · f273a41 · f273a41
1 parent f2a61f6
commit f273a41
Show file tree

Hide file tree

Showing 9 changed files with 3,440 additions and 2,475 deletions.
diff --git a/manifest/v1alpha/aws.go b/manifest/v1alpha/aws.go
@@ -35,7 +35,7 @@ func AWSRegions() []AWSRegion {
 	}
 }
 
-func isValidRegion(code string, regions []AWSRegion) bool {
+func IsValidRegion(code string, regions []AWSRegion) bool {
 	for _, region := range regions {
 		if region.Code == code {
 			return true

diff --git a/manifest/v1alpha/parser/parser.go b/manifest/v1alpha/parser/parser.go
@@ -12,6 +12,7 @@ import (
 	"github.com/nobl9/nobl9-go/manifest/v1alpha"
 	"github.com/nobl9/nobl9-go/manifest/v1alpha/project"
 	"github.com/nobl9/nobl9-go/manifest/v1alpha/service"
+	"github.com/nobl9/nobl9-go/manifest/v1alpha/slo"
 )
 
 type unmarshalFunc func(v interface{}) error
@@ -48,7 +49,7 @@ func parseObject(kind manifest.Kind, unmarshal unmarshalFunc) (manifest.Object,
 	case manifest.KindService:
 		return genericParseObject[service.Service](unmarshal)
 	case manifest.KindSLO:
-		return genericParseObject[v1alpha.SLO](unmarshal)
+		return genericParseObject[slo.SLO](unmarshal)
 	case manifest.KindProject:
 		return genericParseObject[project.Project](unmarshal)
 	case manifest.KindAgent:

diff --git a/manifest/v1alpha/method.go → manifest/v1alpha/slo/budgeting_method.go b/manifest/v1alpha/method.go → manifest/v1alpha/slo/budgeting_method.go
@@ -1,4 +1,4 @@
-package v1alpha
+package slo
 
 import "fmt"
 

diff --git a/manifest/v1alpha/slo/slo.go b/manifest/v1alpha/slo/slo.go
@@ -55,7 +55,7 @@ type Spec struct {
 // Status holds dynamic fields returned when the Service is fetched from Nobl9 platform.
 // Status is not part of the static object definition.
 type Status struct {
-	ReplayStatus *v1alpha.ReplayStatus `json:"timeTravel,omitempty"`
+	ReplayStatus *ReplayStatus `json:"timeTravel,omitempty"`
 }
 
 type ReplayStatus struct {

diff --git a/manifest/v1alpha/slo/validation.go b/manifest/v1alpha/slo/validation.go
@@ -5,14 +5,15 @@ import (
 	"github.com/nobl9/nobl9-go/validation"
 )
 
+var sloValidation = validation.New[SLO](
+	v1alpha.FieldRuleMetadataName(func(s SLO) string { return s.Metadata.Name }),
+	v1alpha.FieldRuleMetadataDisplayName(func(s SLO) string { return s.Metadata.DisplayName }),
+	v1alpha.FieldRuleMetadataLabels(func(s SLO) v1alpha.Labels { return s.Metadata.Labels }),
+	v1alpha.FieldRuleSpecDescription(func(s SLO) string { return s.Spec.Description }),
+)
+
 func validate(s SLO) error {
-	v := validation.RulesForStruct(
-		v1alpha.FieldRuleMetadataName(func() string { return s.Metadata.Name }),
-		v1alpha.FieldRuleMetadataDisplayName(func() string { return s.Metadata.DisplayName }),
-		v1alpha.FieldRuleMetadataLabels(func() v1alpha.Labels { return s.Metadata.Labels }),
-		v1alpha.FieldRuleSpecDescription(func() string { return s.Spec.Description }),
-	)
-	if errs := v.Validate(); len(errs) > 0 {
+	if errs := sloValidation.Validate(s); len(errs) > 0 {
 		return v1alpha.NewObjectError(s, errs)
 	}
 	return nil