feat(cli)!: delete deprecated SBOM flags (#7266)

Signed-off-by: knqyf263 <[email protected]>
aquasecurity · Jul 31, 2024 · 7024572 · 7024572
1 parent 45b3f34
commit 7024572
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 62 deletions.
diff --git a/pkg/commands/app.go b/pkg/commands/app.go
@@ -1146,7 +1146,6 @@ func NewSBOMCommand(globalFlags *flag.GlobalFlagGroup) *cobra.Command {
 		RemoteFlagGroup:        flag.NewClientFlags(), // for client/server mode
 		ReportFlagGroup:        reportFlagGroup,
 		ScanFlagGroup:          scanFlagGroup,
-		SBOMFlagGroup:          flag.NewSBOMFlagGroup(),
 		VulnerabilityFlagGroup: flag.NewVulnerabilityFlagGroup(),
 		LicenseFlagGroup:       licenseFlagGroup,
 	}

diff --git a/pkg/flag/options.go b/pkg/flag/options.go
@@ -326,7 +326,6 @@ type Flags struct {
 	RegoFlagGroup          *RegoFlagGroup
 	RepoFlagGroup          *RepoFlagGroup
 	ReportFlagGroup        *ReportFlagGroup
-	SBOMFlagGroup          *SBOMFlagGroup
 	ScanFlagGroup          *ScanFlagGroup
 	SecretFlagGroup        *SecretFlagGroup
 	VulnerabilityFlagGroup *VulnerabilityFlagGroup
@@ -350,7 +349,6 @@ type Options struct {
 	RemoteOptions
 	RepoOptions
 	ReportOptions
-	SBOMOptions
 	ScanOptions
 	SecretOptions
 	VulnerabilityOptions
@@ -549,9 +547,6 @@ func (f *Flags) groups() []FlagGroup {
 	if f.ImageFlagGroup != nil {
 		groups = append(groups, f.ImageFlagGroup)
 	}
-	if f.SBOMFlagGroup != nil {
-		groups = append(groups, f.SBOMFlagGroup)
-	}
 	if f.VulnerabilityFlagGroup != nil {
 		groups = append(groups, f.VulnerabilityFlagGroup)
 	}
@@ -760,13 +755,6 @@ func (f *Flags) ToOptions(args []string) (Options, error) {
 		}
 	}
 
-	if f.SBOMFlagGroup != nil {
-		opts.SBOMOptions, err = f.SBOMFlagGroup.ToOptions()
-		if err != nil {
-			return Options{}, xerrors.Errorf("sbom flag error: %w", err)
-		}
-	}
-
 	if f.ScanFlagGroup != nil {
 		opts.ScanOptions, err = f.ScanFlagGroup.ToOptions(args)
 		if err != nil {

diff --git a/pkg/flag/sbom_flags.go b/pkg/flag/sbom_flags.go