#208, #351. FIX packager/compose: to no longer add the optional compo…

…sed package when the user chooses to not import that composed packages.
zarf-dev · Mar 3, 2022 · b1c3ade · b1c3ade
1 parent 1731cea
commit b1c3ade
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cli/internal/packager/compose.go b/cli/internal/packager/compose.go
@@ -15,7 +15,7 @@ func GetComposedAssets() (components []types.ZarfComponent) {
 			importedComponents := getSubPackageAssets(component)
 			components = append(components, importedComponents...)
 
-		} else {
+		} else if !hasSubPackage(&component) {
 			components = append(components, component)
 		}
 	}
@@ -31,7 +31,7 @@ func getSubPackageAssets(importComponent types.ZarfComponent) (components []type
 	for _, componentToCompose := range importedPackage.Components {
 		if shouldAddImportedPackage(&componentToCompose) {
 			components = append(components, getSubPackageAssets(componentToCompose)...)
-		} else {
+		} else if !hasSubPackage(&componentToCompose) {
 			prepComponentToCompose(&componentToCompose, importedPackage.Metadata.Name, importComponent.Import.Path)
 			components = append(components, componentToCompose)
 		}