Split reading zarf.yaml and setting arch apart

defenseunicorns · Jan 12, 2024 · 8e9790b · 8e9790b
1 parent 80fd2ec
commit 8e9790b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 19 deletions.
diff --git a/src/pkg/packager/create_stages.go b/src/pkg/packager/create_stages.go
@@ -33,9 +33,11 @@ import (
 )
 
 func (p *Packager) load() error {
-	if err := p.readZarfYAML(layout.ZarfYAML); err != nil {
-		return fmt.Errorf("unable to read the zarf.yaml file: %s", err.Error())
+	if err := utils.ReadYaml(p.layout.ZarfYAML, &p.cfg.Pkg); err != nil {
+		return err
 	}
+	p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
+
 	if p.isInitConfig() {
 		p.cfg.Pkg.Metadata.Version = config.CLIVersion
 	}

diff --git a/src/pkg/packager/deploy.go b/src/pkg/packager/deploy.go
@@ -44,9 +44,10 @@ func (p *Packager) Deploy() (err error) {
 		return fmt.Errorf("unable to load the package: %w", err)
 	}
 
-	if err = p.readZarfYAML(p.layout.ZarfYAML); err != nil {
+	if err := utils.ReadYaml(p.layout.ZarfYAML, &p.cfg.Pkg); err != nil {
 		return err
 	}
+	p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
 
 	p.runMigrations()
 

diff --git a/src/pkg/packager/inspect.go b/src/pkg/packager/inspect.go
@@ -5,6 +5,7 @@
 package packager
 
 import (
+	"github.com/defenseunicorns/zarf/src/config"
 	"github.com/defenseunicorns/zarf/src/internal/packager/sbom"
 	"github.com/defenseunicorns/zarf/src/pkg/utils"
 )
@@ -17,9 +18,10 @@ func (p *Packager) Inspect() (err error) {
 		return err
 	}
 
-	if err = p.readZarfYAML(p.layout.ZarfYAML); err != nil {
+	if err := utils.ReadYaml(p.layout.ZarfYAML, &p.cfg.Pkg); err != nil {
 		return err
 	}
+	p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
 
 	utils.ColorPrintYAML(p.cfg.Pkg, nil, false)
 

diff --git a/src/pkg/packager/mirror.go b/src/pkg/packager/mirror.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/defenseunicorns/zarf/src/config"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
+	"github.com/defenseunicorns/zarf/src/pkg/utils"
 	"github.com/defenseunicorns/zarf/src/types"
 )
 
@@ -21,9 +22,10 @@ func (p *Packager) Mirror() (err error) {
 	if err = p.source.LoadPackage(p.layout, true); err != nil {
 		return fmt.Errorf("unable to load the package: %w", err)
 	}
-	if err = p.readZarfYAML(p.layout.ZarfYAML); err != nil {
+	if err := utils.ReadYaml(p.layout.ZarfYAML, &p.cfg.Pkg); err != nil {
 		return err
 	}
+	p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
 
 	if err := p.stageSBOMViewFiles(); err != nil {
 		return err

diff --git a/src/pkg/packager/prepare.go b/src/pkg/packager/prepare.go
@@ -16,7 +16,6 @@ import (
 	"github.com/defenseunicorns/zarf/src/internal/packager/helm"
 	"github.com/defenseunicorns/zarf/src/internal/packager/kustomize"
 	"github.com/defenseunicorns/zarf/src/pkg/k8s"
-	"github.com/defenseunicorns/zarf/src/pkg/layout"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/pkg/utils"
 	"github.com/defenseunicorns/zarf/src/pkg/utils/helpers"
@@ -47,9 +46,10 @@ func (p *Packager) FindImages() (imgMap map[string][]string, err error) {
 	}
 	message.Note(fmt.Sprintf("Using build directory %s", p.cfg.CreateOpts.BaseDir))
 
-	if err = p.readZarfYAML(layout.ZarfYAML); err != nil {
-		return nil, fmt.Errorf("unable to read the zarf.yaml file: %s", err.Error())
+	if err := utils.ReadYaml(p.layout.ZarfYAML, &p.cfg.Pkg); err != nil {
+		return nil, err
 	}
+	p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
 
 	if err := p.composeComponents(); err != nil {
 		return nil, err

diff --git a/src/pkg/packager/publish.go b/src/pkg/packager/publish.go
@@ -103,9 +103,10 @@ func (p *Packager) Publish() (err error) {
 		if err = p.source.LoadPackage(p.layout, false); err != nil {
 			return fmt.Errorf("unable to load the package: %w", err)
 		}
-		if err = p.readZarfYAML(p.layout.ZarfYAML); err != nil {
+		if err := utils.ReadYaml(p.layout.ZarfYAML, &p.cfg.Pkg); err != nil {
 			return err
 		}
+		p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
 	}
 
 	// Get a reference to the registry for this package

diff --git a/src/pkg/packager/remove.go b/src/pkg/packager/remove.go
@@ -16,6 +16,7 @@ import (
 	"github.com/defenseunicorns/zarf/src/pkg/cluster"
 	"github.com/defenseunicorns/zarf/src/pkg/message"
 	"github.com/defenseunicorns/zarf/src/pkg/packager/sources"
+	"github.com/defenseunicorns/zarf/src/pkg/utils"
 	"github.com/defenseunicorns/zarf/src/pkg/utils/helpers"
 	"github.com/defenseunicorns/zarf/src/types"
 	"helm.sh/helm/v3/pkg/storage/driver"
@@ -38,9 +39,11 @@ func (p *Packager) Remove() (err error) {
 	if err = p.source.LoadPackageMetadata(p.layout, false, false); err != nil {
 		return err
 	}
-	if err = p.readZarfYAML(p.layout.ZarfYAML); err != nil {
+	if err := utils.ReadYaml(p.layout.ZarfYAML, &p.cfg.Pkg); err != nil {
 		return err
 	}
+	p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
+
 	p.filterComponents()
 	packageName = p.cfg.Pkg.Metadata.Name
 

diff --git a/src/pkg/packager/yaml.go b/src/pkg/packager/yaml.go
@@ -16,15 +16,6 @@ import (
 	"github.com/defenseunicorns/zarf/src/types"
 )
 
-// readZarfYAML reads a Zarf YAML file.
-func (p *Packager) readZarfYAML(path string) error {
-	if err := utils.ReadYaml(path, &p.cfg.Pkg); err != nil {
-		return err
-	}
-	p.arch = config.GetArch(p.cfg.Pkg.Metadata.Architecture, p.cfg.Pkg.Build.Architecture)
-	return nil
-}
-
 // filterComponents removes components not matching the current OS if filterByOS is set.
 func (p *Packager) filterComponents() {
 	// Filter each component to only compatible platforms.