Skip to content

Commit

Permalink
better name
Browse files Browse the repository at this point in the history
Signed-off-by: Austin Abro <[email protected]>
  • Loading branch information
AustinAbro321 committed Jan 30, 2025
1 parent 795d0a5 commit e41de71
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/internal/packager2/layout/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"github.com/zarf-dev/zarf/src/pkg/zoci"
)

func resolveImports(ctx context.Context, pkg v1alpha1.ZarfPackage, packagePath, arch, flavor string, stack []string) (v1alpha1.ZarfPackage, error) {
stack = append(stack, packagePath)
func resolveImports(ctx context.Context, pkg v1alpha1.ZarfPackage, packagePath, arch, flavor string, importStack []string) (v1alpha1.ZarfPackage, error) {
importStack = append(importStack, packagePath)

variables := pkg.Variables
constants := pkg.Constants
Expand All @@ -48,7 +48,7 @@ func resolveImports(ctx context.Context, pkg v1alpha1.ZarfPackage, packagePath,
var importedPkg v1alpha1.ZarfPackage
if component.Import.Path != "" {
importPath := filepath.Join(packagePath, component.Import.Path)
for _, sp := range stack {
for _, sp := range importStack {
if sp == importPath {
return v1alpha1.ZarfPackage{}, fmt.Errorf("package %s imported in cycle by %s in component %s", filepath.ToSlash(importPath), filepath.ToSlash(packagePath), component.Name)
}
Expand All @@ -61,7 +61,7 @@ func resolveImports(ctx context.Context, pkg v1alpha1.ZarfPackage, packagePath,
if err != nil {
return v1alpha1.ZarfPackage{}, err
}
importedPkg, err = resolveImports(ctx, importedPkg, importPath, arch, flavor, stack)
importedPkg, err = resolveImports(ctx, importedPkg, importPath, arch, flavor, importStack)
if err != nil {
return v1alpha1.ZarfPackage{}, err
}
Expand Down Expand Up @@ -122,7 +122,7 @@ func resolveImports(ctx context.Context, pkg v1alpha1.ZarfPackage, packagePath,
pkg.Constants = slices.CompactFunc(constants, func(l, r v1alpha1.Constant) bool {
return l.Name == r.Name
})
stack = stack[0:len(stack)-1]
importStack = importStack[0:len(importStack)-1]
return pkg, nil
}

Expand Down

0 comments on commit e41de71

Please sign in to comment.