优化error输出
This commit is contained in:
@@ -4,7 +4,6 @@ import (
|
||||
"flag"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"os"
|
||||
|
||||
"git.algo.com.cn/public/saasapi"
|
||||
"git.algo.com.cn/public/saasapi/pkg/saashttp"
|
||||
@@ -26,8 +25,7 @@ func RunGrantDelete(args ...string) error {
|
||||
grantIndex := paramGrantIndex(fs)
|
||||
|
||||
if err := fs.Parse(args); err != nil {
|
||||
fmt.Fprintln(os.Stderr, "command line parse error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("Command line parse error: %w", err)
|
||||
}
|
||||
|
||||
if fs.NArg() > 0 {
|
||||
@@ -36,27 +34,23 @@ func RunGrantDelete(args ...string) error {
|
||||
}
|
||||
|
||||
if *dsid == 0 {
|
||||
fmt.Fprintln(os.Stderr, "Error: data space ID is required")
|
||||
fs.PrintDefaults()
|
||||
return fmt.Errorf("data space ID is required")
|
||||
return fmt.Errorf("data space ID is required.")
|
||||
}
|
||||
|
||||
if *srtaAccountId == 0 {
|
||||
fmt.Fprintln(os.Stderr, "Error: sRTA account ID is required")
|
||||
fs.PrintDefaults()
|
||||
return fmt.Errorf("sRTA account ID is required")
|
||||
return fmt.Errorf("sRTA account ID is required.")
|
||||
}
|
||||
|
||||
if *grantIndex == "" {
|
||||
fmt.Fprintln(os.Stderr, "Error: grant index is required")
|
||||
fs.PrintDefaults()
|
||||
return fmt.Errorf("grant index is required")
|
||||
return fmt.Errorf("grant index is required.")
|
||||
}
|
||||
|
||||
cfg, err := LoadConfigFile(*cfgFile)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "LoadConfigFile error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("LoadConfigFile error: %w", err)
|
||||
}
|
||||
|
||||
grantDeleteParams := grantDeleteParams{
|
||||
@@ -86,13 +80,11 @@ func doGrantDelete(params grantDeleteParams) error {
|
||||
|
||||
res, err := params.saasHttp.GrantDelete(saasReq)
|
||||
if err != nil {
|
||||
fmt.Fprintln(os.Stderr, "submit Grant Delete error", "err", err)
|
||||
return err
|
||||
return fmt.Errorf("Submit Command error: %w", err)
|
||||
}
|
||||
|
||||
if res.Code != saasapi.ErrorCode_SUCC {
|
||||
fmt.Fprintln(os.Stderr, "Grant delete failed", "code", res.Code, "status", res.Status)
|
||||
return nil
|
||||
return fmt.Errorf("Command failed. code:%v, status:%v", res.Code, res.Status)
|
||||
}
|
||||
|
||||
grantRes := res.GetGrantDeleteRes()
|
||||
|
||||
Reference in New Issue
Block a user