Skip to content

Commit

Permalink
Fixed the command line parsing
Browse files Browse the repository at this point in the history
Signed-off-by: naveensrinivasan <172697+naveensrinivasan@users.noreply.github.com>
  • Loading branch information
naveensrinivasan committed Jun 6, 2024
1 parent 66d50c8 commit d70650e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 125 deletions.
31 changes: 4 additions & 27 deletions src/cmd/vendored.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,33 +78,11 @@ var scanCmd = &cobra.Command{
Use: "scan",
Short: "[ALPHA] Scan a zarf package for vulnerabilities and generate a report.",
Long: "[ALPHA] Scan a zarf package for vulnerabilities and generate a report.",
Run: func(cmd *cobra.Command, _ []string) {
org, _ := cmd.Flags().GetString("org")
packageName, _ := cmd.Flags().GetString("package-name")
tag, _ := cmd.Flags().GetString("tag")
dockerUsername, _ := cmd.Flags().GetString("docker-username")
dockerPassword, _ := cmd.Flags().GetString("docker-password")
outputFile, _ := cmd.Flags().GetString("output-file")

securityHub.Execute([]string{
fmt.Sprintf("--org=%s", org),
fmt.Sprintf("--package-name=%s", packageName),
fmt.Sprintf("--tag=%s", tag),
fmt.Sprintf("--docker-username=%s", dockerUsername),
fmt.Sprintf("--docker-password=%s", dockerPassword),
fmt.Sprintf("--output-file=%s", outputFile),
})
Run: func(_ *cobra.Command, _ []string) {
os.Args = os.Args[1:] // grab 'scan' and onward from the CLI args
securityHub.Execute(os.Args)
},
}

// addScanCmdFlags adds the scan command flags
func addScanCmdFlags(cmd *cobra.Command) {
cmd.PersistentFlags().StringP("docker-username", "u", "", "Optional: Docker username for registry access, accepts CSV values")
cmd.PersistentFlags().StringP("docker-password", "p", "", "Optional: Docker password for registry access, accepts CSV values")
cmd.PersistentFlags().StringP("org", "o", "defenseunicorns", "Organization name")
cmd.PersistentFlags().StringP("package-name", "n", "", "Package Name: packages/uds/gitlab-runner")
cmd.PersistentFlags().StringP("tag", "g", "", "Tag name (e.g. 16.10.0-uds.0-upstream)")
cmd.PersistentFlags().StringP("output-file", "f", "", "Output file for CSV results")
DisableFlagParsing: true,
}

func init() {
Expand All @@ -126,6 +104,5 @@ func init() {
initViper()
rootCmd.AddCommand(runnerCmd)
rootCmd.AddCommand(zarfCmd)
addScanCmdFlags(scanCmd)
rootCmd.AddCommand(scanCmd) // uds-security-hub CLI command
}
98 changes: 0 additions & 98 deletions src/cmd/vendored_test.go

This file was deleted.

0 comments on commit d70650e

Please sign in to comment.