Skip to content

Commit 0fe3bc4

Browse files
knqyf263fhielpos
authored andcommitted
feat(cli)!: delete deprecated SBOM flags (aquasecurity#7266)
Signed-off-by: knqyf263 <[email protected]>
1 parent 1497185 commit 0fe3bc4

File tree

3 files changed

+0
-62
lines changed

3 files changed

+0
-62
lines changed

pkg/commands/app.go

-1
Original file line numberDiff line numberDiff line change
@@ -1146,7 +1146,6 @@ func NewSBOMCommand(globalFlags *flag.GlobalFlagGroup) *cobra.Command {
11461146
RemoteFlagGroup: flag.NewClientFlags(), // for client/server mode
11471147
ReportFlagGroup: reportFlagGroup,
11481148
ScanFlagGroup: scanFlagGroup,
1149-
SBOMFlagGroup: flag.NewSBOMFlagGroup(),
11501149
VulnerabilityFlagGroup: flag.NewVulnerabilityFlagGroup(),
11511150
LicenseFlagGroup: licenseFlagGroup,
11521151
}

pkg/flag/options.go

-12
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ type Flags struct {
326326
RegoFlagGroup *RegoFlagGroup
327327
RepoFlagGroup *RepoFlagGroup
328328
ReportFlagGroup *ReportFlagGroup
329-
SBOMFlagGroup *SBOMFlagGroup
330329
ScanFlagGroup *ScanFlagGroup
331330
SecretFlagGroup *SecretFlagGroup
332331
VulnerabilityFlagGroup *VulnerabilityFlagGroup
@@ -350,7 +349,6 @@ type Options struct {
350349
RemoteOptions
351350
RepoOptions
352351
ReportOptions
353-
SBOMOptions
354352
ScanOptions
355353
SecretOptions
356354
VulnerabilityOptions
@@ -549,9 +547,6 @@ func (f *Flags) groups() []FlagGroup {
549547
if f.ImageFlagGroup != nil {
550548
groups = append(groups, f.ImageFlagGroup)
551549
}
552-
if f.SBOMFlagGroup != nil {
553-
groups = append(groups, f.SBOMFlagGroup)
554-
}
555550
if f.VulnerabilityFlagGroup != nil {
556551
groups = append(groups, f.VulnerabilityFlagGroup)
557552
}
@@ -760,13 +755,6 @@ func (f *Flags) ToOptions(args []string) (Options, error) {
760755
}
761756
}
762757

763-
if f.SBOMFlagGroup != nil {
764-
opts.SBOMOptions, err = f.SBOMFlagGroup.ToOptions()
765-
if err != nil {
766-
return Options{}, xerrors.Errorf("sbom flag error: %w", err)
767-
}
768-
}
769-
770758
if f.ScanFlagGroup != nil {
771759
opts.ScanOptions, err = f.ScanFlagGroup.ToOptions(args)
772760
if err != nil {

pkg/flag/sbom_flags.go

-49
This file was deleted.

0 commit comments

Comments
 (0)