PLTCONN-4069: Refactoring

This commit is contained in:
Megan Tran
2023-11-07 14:47:27 -06:00
parent 0193e1e329
commit 78fad111cd
2 changed files with 8 additions and 19 deletions

View File

@@ -48,14 +48,9 @@ func newConnValidateCmd(apiClient client.Client) *cobra.Command {
check := cmd.Flags().Lookup("check").Value.String() check := cmd.Flags().Lookup("check").Value.String()
isReadOnly, _ := strconv.ParseBool(cmd.Flags().Lookup("read-only").Value.String()) isReadOnly, _ := strconv.ParseBool(cmd.Flags().Lookup("read-only").Value.String())
readLimit := cmd.Flags().Lookup("read-limit").Value.String() readLimitVal, err := getReadLimitVal(cmd)
readLimitVal := int64(accountReadLimit) if err != nil {
return fmt.Errorf("invalid value of readLimit: %v", err)
if readLimit != "" {
readLimitVal, err = getReadLimitVal(readLimit)
if err != nil {
return fmt.Errorf("invalid value of readLimit: %v", err)
}
} }
valid := connvalidate.NewValidator(connvalidate.Config{ valid := connvalidate.NewValidator(connvalidate.Config{
@@ -115,8 +110,8 @@ func newConnValidateCmd(apiClient client.Client) *cobra.Command {
return cmd return cmd
} }
func getReadLimitVal(readLimit string) (int64, error) { func getReadLimitVal(cmd *cobra.Command) (int64, error) {
readLimitVal, err := strconv.ParseInt(readLimit, 10, 64) readLimitVal, err := cmd.Flags().GetInt64("read-limit")
if err != nil { if err != nil {
return 0, err return 0, err
} }

View File

@@ -69,15 +69,9 @@ func newConnValidateSourcesCmd(apiClient client.Client) *cobra.Command {
ctx := cmd.Context() ctx := cmd.Context()
endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String() endpoint := cmd.Flags().Lookup("conn-endpoint").Value.String()
readLimit := cmd.Flags().Lookup("read-limit").Value.String() readLimitVal, err := getReadLimitVal(cmd)
readLimitVal := int64(accountReadLimit) if err != nil {
var err error return fmt.Errorf("invalid value of readLimit: %v", err)
if readLimit != "" {
readLimitVal, err = getReadLimitVal(readLimit)
if err != nil {
return fmt.Errorf("invalid value of readLimit: %v", err)
}
} }
listOfSources, err := getSourceFromFile(sourceFile) listOfSources, err := getSourceFromFile(sourceFile)