From 70245721372720027b7089bd61c693df48add865 Mon Sep 17 00:00:00 2001
From: Teppei Fukuda <knqyf263@gmail.com>
Date: Wed, 31 Jul 2024 12:07:28 +0400
Subject: [PATCH] feat(cli)!: delete deprecated SBOM flags (#7266)

Signed-off-by: knqyf263 <knqyf263@gmail.com>
---
 pkg/commands/app.go    |  1 -
 pkg/flag/options.go    | 12 -----------
 pkg/flag/sbom_flags.go | 49 ------------------------------------------
 3 files changed, 62 deletions(-)
 delete mode 100644 pkg/flag/sbom_flags.go

diff --git a/pkg/commands/app.go b/pkg/commands/app.go
index a3bd7b78e6f1..a3fb6df353d9 100644
--- 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
index 3f48b75ac9b4..e5c46c81c64f 100644
--- 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
deleted file mode 100644
index 9af8414ed546..000000000000
--- a/pkg/flag/sbom_flags.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package flag
-
-var (
-	ArtifactTypeFlag = Flag[string]{
-		Name:       "artifact-type",
-		ConfigName: "sbom.artifact-type",
-		Usage:      "deprecated",
-		Removed:    `Use 'trivy image' or other subcommands. See also https://github.com/aquasecurity/trivy/discussions/2407`,
-	}
-	SBOMFormatFlag = Flag[string]{
-		Name:       "sbom-format",
-		ConfigName: "sbom.format",
-		Usage:      "deprecated",
-		Removed:    `Use 'trivy image' or other subcommands. See also https://github.com/aquasecurity/trivy/discussions/2407`,
-	}
-)
-
-type SBOMFlagGroup struct {
-	ArtifactType *Flag[string] // deprecated
-	SBOMFormat   *Flag[string] // deprecated
-}
-
-type SBOMOptions struct{}
-
-func NewSBOMFlagGroup() *SBOMFlagGroup {
-	return &SBOMFlagGroup{
-		ArtifactType: ArtifactTypeFlag.Clone(),
-		SBOMFormat:   SBOMFormatFlag.Clone(),
-	}
-}
-
-func (f *SBOMFlagGroup) Name() string {
-	return "SBOM"
-}
-
-func (f *SBOMFlagGroup) Flags() []Flagger {
-	return []Flagger{
-		f.ArtifactType,
-		f.SBOMFormat,
-	}
-}
-
-func (f *SBOMFlagGroup) ToOptions() (SBOMOptions, error) {
-	if err := parseFlags(f); err != nil {
-		return SBOMOptions{}, err
-	}
-
-	return SBOMOptions{}, nil
-}