solve some review comments

Author: vinit-chauhan

internal/cobraext/flags.go

@@ -142,8 +142,8 @@ const (
 	FilterCodeOwnerFlagName        = "code-owner"
 	FilterCodeOwnerFlagDescription = "code owners to filter by (comma-separated values)"
 
-	FilterIntegrationTypeFlagName        = "integration-type"
-	FilterIntegrationTypeFlagDescription = "integration types to filter by (comma-separated values)"
+	FilterPackageTypeFlagName        = "package-type"
+	FilterPackageTypeFlagDescription = "package types to filter by (comma-separated values)"
 
 	FilterInputFlagName        = "input"
 	FilterInputFlagDescription = "name of the inputs to filter by (comma-separated values)"
@@ -155,14 +155,14 @@ const (
 	FilterOutputPackageNameFlagShorthand   = "p"
 	FilterOutputPackageNameFlagDescription = "print the package name instead of the directory name in the output"
 
-	FilterPackagesFlagName        = "package-name"
+	FilterPackagesFlagName        = "packages"
 	FilterPackagesFlagDescription = "package names to filter by (comma-separated values)"
 
 	FilterSpecVersionFlagName        = "spec-version"
 	FilterSpecVersionFlagDescription = "Package spec version to filter by (semver)"
 
 	ForeachPoolSizeFlagName        = "parallel"
-	ForeachPoolSizeFlagDescription = "number of packages to execute in parallel (defaults to serial execution)"
+	ForeachPoolSizeFlagDescription = "Number of subcommands to execute in parallel (defaults to serial execution)"
 
 	GenerateTestResultFlagName        = "generate"
 	GenerateTestResultFlagDescription = "generate test result file"

internal/filter/category_flag.go renamed to internal/filter/category.go

@@ -14,7 +14,7 @@ import (
 type CategoryFlag struct {
 	FilterFlagBase
 
-	values map[string]struct{}
+	values []string
 }
 
 func (f *CategoryFlag) Parse(cmd *cobra.Command) error {
@@ -26,7 +26,8 @@ func (f *CategoryFlag) Parse(cmd *cobra.Command) error {
 		return nil
 	}
 
-	f.values = splitAndTrim(category, ",")
+	categories := splitAndTrim(category, ",")
+	f.values = categories
 	f.isApplied = true
 	return nil
 }

internal/filter/codeowner_flag.go renamed to internal/filter/codeowner.go

@@ -16,7 +16,7 @@ import (
 
 type CodeOwnerFlag struct {
 	FilterFlagBase
-	values map[string]struct{}
+	values []string
 }
 
 func (f *CodeOwnerFlag) Parse(cmd *cobra.Command) error {
@@ -37,7 +37,7 @@ func (f *CodeOwnerFlag) Validate() error {
 	validator := tui.Validator{Cwd: "."}
 
 	if f.values != nil {
-		for value := range f.values {
+		for _, value := range f.values {
 			if err := validator.GithubOwner(value); err != nil {
 				return fmt.Errorf("invalid code owner: %s: %w", value, err)
 			}

internal/filter/input_flag.go renamed to internal/filter/input.go

@@ -15,7 +15,7 @@ type InputFlag struct {
 	FilterFlagBase
 
 	// flag specific fields
-	values map[string]struct{}
+	values []string
 }
 
 func (f *InputFlag) Parse(cmd *cobra.Command) error {

internal/filter/integrationtype_flag.go

@@ -27,7 +27,7 @@ func (f *PackageNameFlag) Parse(cmd *cobra.Command) error {
 	}
 
 	patterns := splitAndTrim(packageNamePatterns, ",")
-	for patternString := range patterns {
+	for _, patternString := range patterns {
 		pattern, err := glob.Compile(patternString)
 		if err != nil {
 			return fmt.Errorf("invalid package name pattern: %s: %w", patternString, err)

internal/filter/packagename_flag.go renamed to internal/filter/packagename.go

@@ -0,0 +1,61 @@
+// Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+// or more contributor license agreements. Licensed under the Elastic License;
+// you may not use this file except in compliance with the Elastic License.
+
+package filter
+
+import (
+	"github.com/spf13/cobra"
+
+	"github.com/elastic/elastic-package/internal/cobraext"
+	"github.com/elastic/elastic-package/internal/packages"
+)
+
+type PackageTypeFlag struct {
+	FilterFlagBase
+
+	// flag specific fields
+	values []string
+}
+
+func (f *PackageTypeFlag) Parse(cmd *cobra.Command) error {
+	packageTypes, err := cmd.Flags().GetString(cobraext.FilterPackageTypeFlagName)
+	if err != nil {
+		return cobraext.FlagParsingError(err, cobraext.FilterPackageTypeFlagName)
+	}
+	if packageTypes == "" {
+		return nil
+	}
+	f.values = splitAndTrim(packageTypes, ",")
+	f.isApplied = true
+	return nil
+}
+
+func (f *PackageTypeFlag) Validate() error {
+	return nil
+}
+
+func (f *PackageTypeFlag) Matches(dirName string, manifest *packages.PackageManifest) bool {
+	return hasAnyMatch(f.values, []string{manifest.Type})
+}
+
+func (f *PackageTypeFlag) ApplyTo(pkgs []packages.PackageDirNameAndManifest) ([]packages.PackageDirNameAndManifest, error) {
+	filtered := make([]packages.PackageDirNameAndManifest, 0, len(pkgs))
+	for _, pkg := range pkgs {
+		if f.Matches(pkg.DirName, pkg.Manifest) {
+			filtered = append(filtered, pkg)
+		}
+	}
+	return filtered, nil
+}
+
+func initPackageTypeFlag() *PackageTypeFlag {
+	return &PackageTypeFlag{
+		FilterFlagBase: FilterFlagBase{
+			name:         cobraext.FilterPackageTypeFlagName,
+			description:  cobraext.FilterPackageTypeFlagDescription,
+			shorthand:    "",
+			defaultValue: "",
+		},
+	}
+}

internal/filter/packagetype.go

@@ -18,8 +18,8 @@ var registry = []Filter{
 	initCategoryFlag(),
 	initCodeOwnerFlag(),
 	initInputFlag(),
-	initIntegrationTypeFlag(),
 	initPackageNameFlag(),
+	initPackageTypeFlag(),
 	initSpecVersionFlag(),
 }
 
@@ -83,6 +83,7 @@ func (r *FilterRegistry) Execute() (filtered []packages.PackageDirNameAndManifes
 
 	filtered = pkgs
 	for _, filter := range r.filters {
+		logger.Infof("Applying for %d packages", len(filtered))
 		filtered, err = filter.ApplyTo(filtered)
 		if err != nil {
 			errors = append(errors, err)

internal/filter/registry.go

@@ -5,18 +5,16 @@
 package filter
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"github.com/elastic/elastic-package/internal/packages"
 )
 
 // FilterFlag defines the basic interface for filter flags.
 type FilterFlag interface {
-	Name() string
-	Description() string
-	Shorthand() string
-	DefaultValue() string
-
+	String() string
 	Register(cmd *cobra.Command)
 	IsApplied() bool
 }
@@ -44,24 +42,12 @@ type FilterFlagBase struct {
 	isApplied bool
 }
 
-func (f *FilterFlagBase) Name() string {
-	return f.name
-}
-
-func (f *FilterFlagBase) Description() string {
-	return f.description
-}
-
-func (f *FilterFlagBase) Shorthand() string {
-	return f.shorthand
-}
-
-func (f *FilterFlagBase) DefaultValue() string {
-	return f.defaultValue
+func (f *FilterFlagBase) String() string {
+	return fmt.Sprintf("name=%s defaultValue=%s applied=%v", f.name, f.defaultValue, f.isApplied)
 }
 
 func (f *FilterFlagBase) Register(cmd *cobra.Command) {
-	cmd.Flags().StringP(f.Name(), f.Shorthand(), f.DefaultValue(), f.Description())
+	cmd.Flags().StringP(f.name, f.shorthand, f.defaultValue, f.description)
 }
 
 func (f *FilterFlagBase) IsApplied() bool {