Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(commands): remove deprecated options #1270

Merged
merged 1 commit into from
Oct 4, 2021
Merged

feat(commands): remove deprecated options #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 1 addition & 21 deletions pkg/commands/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,25 +312,6 @@ var (
stringSliceFlag(skipFiles),
stringSliceFlag(skipDirs),
}

// deprecated options
deprecatedFlags = []cli.Flag{
&cli.StringFlag{
Name: "only-update",
Usage: "deprecated",
EnvVars: []string{"TRIVY_ONLY_UPDATE"},
},
&cli.BoolFlag{
Name: "refresh",
Usage: "deprecated",
EnvVars: []string{"TRIVY_REFRESH"},
},
&cli.BoolFlag{
Name: "auto-refresh",
Usage: "deprecated",
EnvVars: []string{"TRIVY_AUTO_REFRESH"},
},
}
)

// NewApp is the factory method to return Trivy CLI
Expand All @@ -346,8 +327,7 @@ func NewApp(version string) *cli.App {
app.Usage = "A simple and comprehensive vulnerability scanner for containers"
app.EnableBashCompletion = true

flags := append(globalFlags, setHidden(deprecatedFlags, true)...)
flags = append(flags, setHidden(imageFlags, true)...)
flags := append(globalFlags, setHidden(imageFlags, true)...)

app.Flags = flags
app.Commands = []*cli.Command{
Expand Down
15 changes: 0 additions & 15 deletions pkg/commands/artifact/option.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ type Option struct {
option.ReportOption
option.CacheOption
option.ConfigOption

// deprecated
onlyUpdate string
// deprecated
refresh bool
// deprecated
autoRefresh bool
}

// NewOption is the factory method to return options
Expand All @@ -40,19 +33,11 @@ func NewOption(c *cli.Context) (Option, error) {
ReportOption: option.NewReportOption(c),
CacheOption: option.NewCacheOption(c),
ConfigOption: option.NewConfigOption(c),

onlyUpdate: c.String("only-update"),
refresh: c.Bool("refresh"),
autoRefresh: c.Bool("auto-refresh"),
}, nil
}

// Init initializes the artifact options
func (c *Option) Init() error {
if c.onlyUpdate != "" || c.refresh || c.autoRefresh {
c.Logger.Warn("--only-update, --refresh and --auto-refresh are unnecessary and ignored now. These commands will be removed in the next version.")
}

if err := c.initPreScanOptions(); err != nil {
return err
}
Expand Down
21 changes: 0 additions & 21 deletions pkg/commands/artifact/option_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,25 +93,6 @@ func TestOption_Init(t *testing.T) {
},
},
},
{
name: "deprecated options",
args: []string{"--only-update", "alpine", "--severity", "LOW", "debian:buster"},
logs: []string{
"--only-update, --refresh and --auto-refresh are unnecessary and ignored now. These commands will be removed in the next version.",
},
want: Option{
ReportOption: option.ReportOption{
Severities: []dbTypes.Severity{dbTypes.SeverityLow},
Output: os.Stdout,
VulnType: []string{types.VulnTypeOS, types.VulnTypeLibrary},
SecurityChecks: []string{types.SecurityCheckVulnerability},
},
ArtifactOption: option.ArtifactOption{
Target: "debian:buster",
},
onlyUpdate: "alpine",
},
},
{
name: "invalid option combination: --template enabled without --format",
args: []string{"--template", "@contrib/gitlab.tpl", "gitlab/gitlab-ce:12.7.2-ce.0"},
Expand Down Expand Up @@ -196,11 +177,9 @@ func TestOption_Init(t *testing.T) {
set.Bool("reset", false, "")
set.Bool("skip-db-update", false, "")
set.Bool("download-db-only", false, "")
set.Bool("auto-refresh", false, "")
set.String("severity", "CRITICAL", "")
set.String("vuln-type", "os,library", "")
set.String("security-checks", "vuln", "")
set.String("only-update", "", "")
set.String("template", "", "")
set.String("format", "", "")

Expand Down