mirror of
https://github.com/project-zot/zot.git
synced 2026-06-17 04:48:26 +08:00
refactor(cli): added equivalent subcommands for each flag combination under every command (#1674)
- image command is now deprecated in favor of 'images' - cve command is now deprecated in favor of 'cves' Signed-off-by: Laurentiu Niculae <niculae.laurentiu1@gmail.com>
This commit is contained in:
@@ -0,0 +1,128 @@
|
||||
//go:build search
|
||||
// +build search
|
||||
|
||||
package cli
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/spf13/cobra"
|
||||
|
||||
zerr "zotregistry.io/zot/errors"
|
||||
"zotregistry.io/zot/pkg/cli/cmdflags"
|
||||
zcommon "zotregistry.io/zot/pkg/common"
|
||||
)
|
||||
|
||||
const (
|
||||
maxRetries = 20
|
||||
)
|
||||
|
||||
func NewCveForImageCommand(searchService SearchService) *cobra.Command {
|
||||
var searchedCVEID string
|
||||
|
||||
cveForImageCmd := &cobra.Command{
|
||||
Use: "image [repo:tag]|[repo@digest]",
|
||||
Short: "List CVEs by REPO:TAG or REPO@DIGEST",
|
||||
Long: `List CVEs by REPO:TAG or REPO@DIGEST`,
|
||||
Args: OneImageWithRefArg,
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
searchConfig, err := GetSearchConfigFromFlags(cmd, searchService)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = CheckExtEndPointQuery(searchConfig, CVEListForImageQuery())
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: '%s'", err, CVEListForImageQuery().Name)
|
||||
}
|
||||
|
||||
image := args[0]
|
||||
|
||||
return SearchCVEForImageGQL(searchConfig, image, searchedCVEID)
|
||||
},
|
||||
}
|
||||
|
||||
cveForImageCmd.Flags().StringVar(&searchedCVEID, cmdflags.SearchedCVEID, "", "Search for a specific CVE by name/id")
|
||||
|
||||
return cveForImageCmd
|
||||
}
|
||||
|
||||
func NewImagesByCVEIDCommand(searchService SearchService) *cobra.Command {
|
||||
var repo string
|
||||
|
||||
imagesByCVEIDCmd := &cobra.Command{
|
||||
Use: "cveid [cveId]",
|
||||
Short: "List images affected by a CVE",
|
||||
Long: `List images affected by a CVE`,
|
||||
Args: func(cmd *cobra.Command, args []string) error {
|
||||
if err := cobra.ExactArgs(1)(cmd, args); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !strings.HasPrefix(args[0], "CVE") {
|
||||
return fmt.Errorf("%w: expected a cveid 'CVE-...' got '%s'", zerr.ErrInvalidCLIParameter, args[0])
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
searchConfig, err := GetSearchConfigFromFlags(cmd, searchService)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = CheckExtEndPointQuery(searchConfig, ImageListForCVEQuery())
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: '%s'", err, ImageListForCVEQuery().Name)
|
||||
}
|
||||
|
||||
searchedCVEID := args[0]
|
||||
|
||||
return SearchImagesByCVEIDGQL(searchConfig, repo, searchedCVEID)
|
||||
},
|
||||
}
|
||||
|
||||
imagesByCVEIDCmd.Flags().StringVar(&repo, "repo", "", "Search for a specific CVE by name/id")
|
||||
|
||||
return imagesByCVEIDCmd
|
||||
}
|
||||
|
||||
func NewFixedTagsCommand(searchService SearchService) *cobra.Command {
|
||||
fixedTagsCmd := &cobra.Command{
|
||||
Use: "fixed [repo] [cveId]",
|
||||
Short: "List tags where a CVE is fixedRetryWithContext",
|
||||
Long: `List tags where a CVE is fixedRetryWithContext`,
|
||||
Args: func(cmd *cobra.Command, args []string) error {
|
||||
const argCount = 2
|
||||
|
||||
if err := cobra.ExactArgs(argCount)(cmd, args); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if !zcommon.CheckIsCorrectRepoNameFormat(args[0]) {
|
||||
return fmt.Errorf("%w: expected a valid repo name for first argument '%s'", zerr.ErrInvalidCLIParameter, args[0])
|
||||
}
|
||||
|
||||
return nil
|
||||
},
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
searchConfig, err := GetSearchConfigFromFlags(cmd, searchService)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = CheckExtEndPointQuery(searchConfig, ImageListWithCVEFixedQuery())
|
||||
if err != nil {
|
||||
return fmt.Errorf("%w: '%s'", err, ImageListWithCVEFixedQuery().Name)
|
||||
}
|
||||
|
||||
repo := args[0]
|
||||
searchedCVEID := args[1]
|
||||
|
||||
return SearchFixedTagsGQL(searchConfig, repo, searchedCVEID)
|
||||
},
|
||||
}
|
||||
|
||||
return fixedTagsCmd
|
||||
}
|
||||
Reference in New Issue
Block a user