refactor: move validate to expose it as receivers

src/pkg/packager/composer/list.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/defenseunicorns/pkg/helpers"
-	"github.com/defenseunicorns/zarf/src/internal/packager/validate"
 	"github.com/defenseunicorns/zarf/src/pkg/layout"
 	"github.com/defenseunicorns/zarf/src/pkg/packager/deprecated"
 	"github.com/defenseunicorns/zarf/src/pkg/utils"
@@ -142,7 +141,7 @@ func NewImportChain(head types.ZarfComponent, index int, originalPackageName, ar
 		}
 
 		// TODO: stuff like this should also happen in linting
-		if err := validate.ImportDefinition(&node.ZarfComponent); err != nil {
+		if err := node.ZarfComponent.ValidateImportDefinition(); err != nil {
 			return ic, err
 		}
 

src/pkg/packager/create.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/defenseunicorns/pkg/helpers"
 	"github.com/defenseunicorns/zarf/src/config"
-	"github.com/defenseunicorns/zarf/src/internal/packager/validate"
 	"github.com/defenseunicorns/zarf/src/pkg/layout"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/pkg/packager/creator"
@@ -41,7 +40,7 @@ func (p *Packager) Create() (err error) {
 	}
 
 	// Perform early package validation.
-	if err := validate.Run(p.cfg.Pkg); err != nil {
+	if err := p.cfg.Pkg.Validate(); err != nil {
 		return fmt.Errorf("unable to validate package: %w", err)
 	}
 

src/pkg/packager/dev.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/defenseunicorns/pkg/helpers"
 	"github.com/defenseunicorns/zarf/src/config"
-	"github.com/defenseunicorns/zarf/src/internal/packager/validate"
 	"github.com/defenseunicorns/zarf/src/pkg/layout"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/pkg/packager/creator"
@@ -53,7 +52,7 @@ func (p *Packager) DevDeploy() error {
 		return err
 	}
 
-	if err := validate.Run(p.cfg.Pkg); err != nil {
+	if err := p.cfg.Pkg.Validate(); err != nil {
 		return fmt.Errorf("unable to validate package: %w", err)
 	}
 

src/pkg/packager/filters/deploy.go

@@ -75,7 +75,7 @@ func (f *deploymentFilter) Apply(pkg types.ZarfPackage) ([]types.ZarfComponent,
 
 				selectState, matchedRequest := includedOrExcluded(component.Name, f.requestedComponents)
 
-				if !isRequired(component) {
+				if !component.IsRequired() {
 					if selectState == excluded {
 						// If the component was explicitly excluded, record the match and continue
 						matchedRequests[matchedRequest] = true
@@ -161,7 +161,7 @@ func (f *deploymentFilter) Apply(pkg types.ZarfPackage) ([]types.ZarfComponent,
 			} else {
 				component := groupedComponents[groupKey][0]
 
-				if isRequired(component) {
+				if component.IsRequired() {
 					selectedComponents = append(selectedComponents, component)
 					continue
 				}

src/pkg/packager/filters/os_test.go

@@ -7,23 +7,22 @@ package filters
 import (
 	"testing"
 
-	"github.com/defenseunicorns/zarf/src/internal/packager/validate"
 	"github.com/defenseunicorns/zarf/src/types"
 	"github.com/stretchr/testify/require"
 )
 
 func TestLocalOSFilter(t *testing.T) {
 
 	pkg := types.ZarfPackage{}
-	for _, os := range validate.SupportedOS() {
+	for _, os := range types.SupportedOS() {
 		pkg.Components = append(pkg.Components, types.ZarfComponent{
 			Only: types.ZarfComponentOnlyTarget{
 				LocalOS: os,
 			},
 		})
 	}
 
-	for _, os := range validate.SupportedOS() {
+	for _, os := range types.SupportedOS() {
 		filter := ByLocalOS(os)
 		result, err := filter.Apply(pkg)
 		if os == "" {

src/pkg/packager/filters/utils.go

@@ -7,8 +7,6 @@ package filters
 import (
 	"path"
 	"strings"
-
-	"github.com/defenseunicorns/zarf/src/types"
 )
 
 type selectState int
@@ -42,14 +40,3 @@ func includedOrExcluded(componentName string, requestedComponentNames []string)
 	// All other cases we don't know if we should include or exclude yet
 	return unknown, ""
 }
-
-// isRequired returns if the component is required or not.
-func isRequired(c types.ZarfComponent) bool {
-	requiredExists := c.Required != nil
-	required := requiredExists && *c.Required
-
-	if requiredExists {
-		return required
-	}
-	return false
-}

src/pkg/packager/generate.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/defenseunicorns/pkg/helpers"
 	"github.com/defenseunicorns/zarf/src/config"
-	"github.com/defenseunicorns/zarf/src/internal/packager/validate"
 	"github.com/defenseunicorns/zarf/src/pkg/layout"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/types"
@@ -73,7 +72,7 @@ func (p *Packager) Generate() (err error) {
 		p.cfg.Pkg.Components[i].Images = images[name]
 	}
 
-	if err := validate.Run(p.cfg.Pkg); err != nil {
+	if err := p.cfg.Pkg.Validate(); err != nil {
 		return err
 	}
 

src/pkg/packager/sources/cluster.go

@@ -8,7 +8,6 @@ import (
 	"fmt"
 
 	"github.com/defenseunicorns/pkg/helpers"
-	"github.com/defenseunicorns/zarf/src/internal/packager/validate"
 	"github.com/defenseunicorns/zarf/src/pkg/cluster"
 	"github.com/defenseunicorns/zarf/src/pkg/layout"
 	"github.com/defenseunicorns/zarf/src/pkg/packager/filters"
@@ -23,7 +22,7 @@ var (
 
 // NewClusterSource creates a new cluster source.
 func NewClusterSource(pkgOpts *types.ZarfPackageOptions) (PackageSource, error) {
-	if !validate.IsLowercaseNumberHyphenNoStartHyphen(pkgOpts.PackageSource) {
+	if !types.IsLowercaseNumberHyphenNoStartHyphen(pkgOpts.PackageSource) {
 		return nil, fmt.Errorf("invalid package name %q", pkgOpts.PackageSource)
 	}
 	cluster, err := cluster.NewClusterWithWait(cluster.DefaultTimeout)

src/pkg/variables/types.go

@@ -4,6 +4,13 @@
 // Package variables contains functions for interacting with variables
 package variables
 
+import (
+	"fmt"
+	"regexp"
+
+	"github.com/defenseunicorns/zarf/src/config/lang"
+)
+
 // VariableType represents a type of a Zarf package variable
 type VariableType string
 
@@ -14,6 +21,12 @@ const (
 	FileVariableType VariableType = "file"
 )
 
+var (
+	// IsUppercaseNumberUnderscore is a regex for uppercase, numbers and underscores.
+	// https://regex101.com/r/tfsEuZ/1
+	IsUppercaseNumberUnderscore = regexp.MustCompile(`^[A-Z0-9_]+$`).MatchString
+)
+
 // Variable represents a variable that has a value set programmatically
 type Variable struct {
 	Name       string       `json:"name" jsonschema:"description=The name to be used for the variable,pattern=^[A-Z0-9_]+$"`
@@ -46,3 +59,25 @@ type SetVariable struct {
 	Variable `json:",inline"`
 	Value    string `json:"value" jsonschema:"description=The value the variable is currently set with"`
 }
+
+// Validate runs all validation checks on a package variable.
+func (v Variable) Validate() error {
+	if !IsUppercaseNumberUnderscore(v.Name) {
+		return fmt.Errorf(lang.PkgValidateMustBeUppercase, v.Name)
+	}
+	return nil
+}
+
+// Validate runs all validation checks on a package constant.
+func (c Constant) Validate() error {
+	// ensure the constant name is only capitals and underscores
+	if !IsUppercaseNumberUnderscore(c.Name) {
+		return fmt.Errorf(lang.PkgValidateErrPkgConstantName, c.Name)
+	}
+
+	if !regexp.MustCompile(c.Pattern).MatchString(c.Value) {
+		return fmt.Errorf(lang.PkgValidateErrPkgConstantPattern, c.Name, c.Pattern)
+	}
+
+	return nil
+}

src/types/component.go

@@ -81,6 +81,15 @@ func (c ZarfComponent) RequiresCluster() bool {
 	return false
 }
 
+// IsRequired returns if the component is required or not.
+func (c ZarfComponent) IsRequired() bool {
+	if c.Required != nil {
+		return *c.Required
+	}
+
+	return false
+}
+
 // ZarfComponentOnlyTarget filters a component to only show it for a given local OS and cluster.
 type ZarfComponentOnlyTarget struct {
 	LocalOS string                   `json:"localOS,omitempty" jsonschema:"description=Only deploy component to specified OS,enum=linux,enum=darwin,enum=windows"`