Skip to content

Remove unnecessary checks for flags #129

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

Merged
lbroudoux merged 1 commit into from
Mar 18, 2025
Merged

Remove unnecessary checks for flags #129

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
24 changes: 8 additions & 16 deletions cmd/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,26 +41,12 @@ func NewImportCommand() *cobra.Command {
Long: `import API artifacts on Microcks server`,
Run: func(cmd *cobra.Command, args []string) {
// Parse subcommand args first.
if len(os.Args) < 2 {
if len(args) == 0 {
fmt.Println("import command require <specificationFile1[:primary],specificationFile2[:primary]> args")
os.Exit(1)
}

specificationFiles := os.Args[2]

// Validate presence and values of flags.
if len(microcksURL) == 0 {
fmt.Println("--microcksURL flag is mandatory. Check Usage.")
os.Exit(1)
}
if len(keycloakClientID) == 0 {
fmt.Println("--keycloakClientId flag is mandatory. Check Usage.")
os.Exit(1)
}
if len(keycloakClientSecret) == 0 {
fmt.Println("--keycloakClientSecret flag is mandatory. Check Usage.")
os.Exit(1)
}
specificationFiles := args[0]

// Collect optional HTTPS transport flags.
if insecureTLS {
Expand Down Expand Up @@ -128,5 +114,11 @@ func NewImportCommand() *cobra.Command {
importCmd.Flags().BoolVar(&insecureTLS, "insecure", false, "Whether to accept insecure HTTPS connection")
importCmd.Flags().StringVar(&caCertPaths, "caCerts", "", "Comma separated paths of CRT files to add to Root CAs")
importCmd.Flags().BoolVar(&verbose, "verbose", false, "Produce dumps of HTTP exchanges")

//Marking flags 'required'
importCmd.MarkFlagRequired("microcksURL")
importCmd.MarkFlagRequired("keycloakClientId")
importCmd.MarkFlagRequired("keycloakClientSecret")

return importCmd
}
35 changes: 6 additions & 29 deletions cmd/importURL.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,6 @@ import (
"github.com/spf13/cobra"
)

// import (
// "flag"
// "fmt"
// "os"
// "strconv"
// "strings"

// "github.com/microcks/microcks-cli/pkg/config"
// "github.com/microcks/microcks-cli/pkg/connectors"
// )

// type importURLCommand struct {
// }

func NewImportURLCommand() *cobra.Command {
var (
microcksURL string
Expand All @@ -56,27 +42,13 @@ func NewImportURLCommand() *cobra.Command {
Long: `import API artifacts from URL on Microcks server`,
Run: func(cmd *cobra.Command, args []string) {
// Parse subcommand args first.
if len(os.Args) < 2 {
if len(args) == 0 {
fmt.Println("import-url command require <specificationFile1URL[:primary],specificationFile2URL[:primary]> args")
os.Exit(1)
}

specificationFiles := os.Args[2]

// Validate presence and values of flags.
if len(microcksURL) == 0 {
fmt.Println("--microcksURL flag is mandatory. Check Usage.")
os.Exit(1)
}
if len(keycloakClientID) == 0 {
fmt.Println("--keycloakClientId flag is mandatory. Check Usage.")
os.Exit(1)
}
if len(keycloakClientSecret) == 0 {
fmt.Println("--keycloakClientSecret flag is mandatory. Check Usage.")
os.Exit(1)
}

// Collect optional HTTPS transport flags.
if insecureTLS {
config.InsecureTLS = true
Expand Down Expand Up @@ -151,5 +123,10 @@ func NewImportURLCommand() *cobra.Command {
importURLCmd.Flags().StringVar(&caCertPaths, "caCerts", "", "Comma separated paths of CRT files to add to Root CAs")
importURLCmd.Flags().BoolVar(&verbose, "verbose", false, "Produce dumps of HTTP exchanges")

//Marking flags 'required'
importURLCmd.MarkFlagRequired("microcksURL")
importURLCmd.MarkFlagRequired("keycloakClientId")
importURLCmd.MarkFlagRequired("keycloakClientSecret")

return importURLCmd
}
17 changes: 5 additions & 12 deletions cmd/test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,6 @@ func NewTestCommand() *cobra.Command {
}

// Validate presence and values of flags.
if len(microcksURL) == 0 {
fmt.Println("--microcksURL flag is mandatory. Check Usage.")
os.Exit(1)
}
if len(keycloakClientID) == 0 {
fmt.Println("--keycloakClientId flag is mandatory. Check Usage.")
os.Exit(1)
}
if len(keycloakClientSecret) == 0 {
fmt.Println("--keycloakClientSecret flag is mandatory. Check Usage.")
os.Exit(1)
}
if &waitFor == nil || (!strings.HasSuffix(waitFor, "milli") && !strings.HasSuffix(waitFor, "sec") && !strings.HasSuffix(waitFor, "min")) {
fmt.Println("--waitFor format is wrong. Applying default 5sec")
waitFor = "5sec"
Expand Down Expand Up @@ -200,6 +188,11 @@ func NewTestCommand() *cobra.Command {
testCmd.Flags().StringVar(&caCertPaths, "caCerts", "", "Comma separated paths of CRT files to add to Root CAs")
testCmd.Flags().BoolVar(&verbose, "verbose", false, "Produce dumps of HTTP exchanges")

//Marking flags 'required'
testCmd.MarkFlagRequired("microcksURL")
testCmd.MarkFlagRequired("keycloakClientId")
testCmd.MarkFlagRequired("keycloakClientSecret")

return testCmd
}

Expand Down