Skip to content

Commit

Permalink
fix spinners + interactive
Browse files Browse the repository at this point in the history
Signed-off-by: razzle <harry@razzle.cloud>
  • Loading branch information
Noxsios committed Mar 19, 2024
1 parent 45ec9b0 commit 247d197
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
7 changes: 6 additions & 1 deletion src/pkg/packager/filters/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,11 @@ func (f *deploymentFilter) Apply(pkg types.ZarfPackage) ([]types.ZarfComponent,
} else {
component := groupedComponents[groupKey][0]

if isRequired(component) {
selectedComponents = append(selectedComponents, component)
continue
}

if f.isInteractive {
selected, err := interactive.SelectOptionalComponent(component)
if err != nil {
Expand All @@ -172,7 +177,7 @@ func (f *deploymentFilter) Apply(pkg types.ZarfPackage) ([]types.ZarfComponent,
}
}

if component.Default || isRequired(component) {
if component.Default {
selectedComponents = append(selectedComponents, component)
continue
}
Expand Down
8 changes: 0 additions & 8 deletions src/pkg/packager/mirror.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ import (

// Mirror pulls resources from a package (images, git repositories, etc) and pushes them to remotes in the air gap without deploying them
func (p *Packager) Mirror() (err error) {
spinner := message.NewProgressSpinner("Mirroring Zarf package %s", p.cfg.PkgOpts.PackageSource)
defer spinner.Stop()

filter := filters.Combine(
filters.ByLocalOS(runtime.GOOS),
filters.BySelectState(p.cfg.PkgOpts.OptionalComponents),
Expand All @@ -42,11 +39,6 @@ func (p *Packager) Mirror() (err error) {
return fmt.Errorf("mirror cancelled")
}

p.cfg.Pkg.Components, err = filter.Apply(p.cfg.Pkg)
if err != nil {
return err
}

p.cfg.State = &types.ZarfState{
RegistryInfo: p.cfg.InitOpts.RegistryInfo,
GitServer: p.cfg.InitOpts.GitServer,
Expand Down
1 change: 1 addition & 0 deletions src/pkg/packager/sources/tarball.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ func (s *TarballSource) LoadPackage(dst *layout.PackagePaths, filter filters.Com
return pkg, nil, err
}
if filter != nil {
spinner.Stop()
pkg.Components, err = filter.Apply(pkg)
if err != nil {
return pkg, nil, err
Expand Down

0 comments on commit 247d197

Please sign in to comment.