Merge branch 'main' into security_policy

defenseunicorns · May 10, 2024 · fd0a4ed · fd0a4ed
2 parents 223a116 + 9ca6e9a
commit fd0a4ed
Show file tree

Hide file tree

Showing 12 changed files with 388 additions and 397 deletions.
diff --git a/src/internal/packager/validate/validate.go b/src/internal/packager/validate/validate.go
diff --git a/src/pkg/packager/composer/list.go b/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
 		}