Skip to content
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.

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

fix: default flag parser for apps #4483

Merged
merged 6 commits into from
Feb 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
- [#4402](https://github.com/ignite/cli/pull/4402) Fix gentx parser into the cosmosutil package
- [#4474](https://github.com/ignite/cli/pull/4474) Fix issue in `build --release` command
- [#4479](https://github.com/ignite/cli/pull/4479) Scaffold an `uint64 type crashs Ignite
- [#4483](https://github.com/ignite/cli/pull/4483) Fix default flag parser for apps

## [`v28.7.0`](https://github.com/ignite/cli/releases/tag/v28.7.0)

Expand Down
12 changes: 1 addition & 11 deletions ignite/services/plugin/flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,5 @@ func flagValue(flag *Flag) string {
if flag.Value != "" {
return flag.Value
}
if flag.DefaultValue != "" {
return flag.DefaultValue
}
if flag.Type == FlagTypeBool ||
flag.Type == FlagTypeInt ||
flag.Type == FlagTypeInt64 ||
flag.Type == FlagTypeUint ||
flag.Type == FlagTypeUint64 {
return "0"
}
return ""
return flag.DefaultValue
}
14 changes: 7 additions & 7 deletions ignite/services/plugin/flag_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func TestFlags_GetBool(t *testing.T) {
name: "flag without value and default value",
key: flagBool3,
f: testFlags,
want: false,
err: errors.New("strconv.ParseBool: parsing \"\": invalid syntax"),
},
{
name: "invalid flag type",
Expand Down Expand Up @@ -159,7 +159,7 @@ func TestFlags_GetInt(t *testing.T) {
name: "flag without value and default value",
key: flagInt3,
f: testFlags,
want: 0,
err: errors.New("strconv.Atoi: parsing \"\": invalid syntax"),
},
{
name: "invalid flag type",
Expand All @@ -183,7 +183,7 @@ func TestFlags_GetInt(t *testing.T) {
name: "wrong flag value without default or value",
key: flagWrongType3,
f: testFlags,
want: 0,
err: errors.New("strconv.Atoi: parsing \"\": invalid syntax"),
},
}
for _, tt := range tests {
Expand Down Expand Up @@ -224,7 +224,7 @@ func TestFlags_GetInt64(t *testing.T) {
name: "flag without value and default value",
key: flagInt643,
f: testFlags,
want: 0,
err: errors.New("strconv.ParseInt: parsing \"\": invalid syntax"),
},
{
name: "invalid flag type",
Expand Down Expand Up @@ -401,7 +401,7 @@ func TestFlags_GetUint(t *testing.T) {
name: "flag without value and default value",
key: flagUint3,
f: testFlags,
want: 0,
err: errors.New("strconv.ParseUint: parsing \"\": invalid syntax"),
},
{
name: "invalid flag type",
Expand Down Expand Up @@ -460,7 +460,7 @@ func TestFlags_GetUint64(t *testing.T) {
name: "flag without value and default value",
key: flagUint643,
f: testFlags,
want: 0,
err: errors.New("strconv.ParseUint: parsing \"\": invalid syntax"),
},
{
name: "invalid flag type",
Expand Down Expand Up @@ -582,7 +582,7 @@ func Test_flagValue(t *testing.T) {
{
name: "number without value and default value",
flag: &Flag{Name: flagUint642, Type: FlagTypeUint64},
want: "0",
want: "",
},
}
for _, tt := range tests {
Expand Down
47 changes: 29 additions & 18 deletions ignite/services/plugin/grpc/v1/interface_flag.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ func (f *Flag) ExportToFlagSet(fs *pflag.FlagSet) error {
if f.DefaultValue == "" {
f.DefaultValue = "0"
}
if f.Value == "" {
f.Value = "0"
}
}

switch f.Type {
Expand All @@ -56,8 +53,10 @@ func (f *Flag) ExportToFlagSet(fs *pflag.FlagSet) error {
}

fs.BoolP(f.Name, f.Shorthand, v, f.Usage)
if err := fs.Set(f.Name, f.Value); err != nil {
return err
if f.Value != "" {
if err := fs.Set(f.Name, f.Value); err != nil {
return newDefaultFlagValueError(cobraFlagTypeBool, f.Value)
}
}
case Flag_TYPE_FLAG_INT:
v, err := strconv.Atoi(f.DefaultValue)
Expand All @@ -66,8 +65,10 @@ func (f *Flag) ExportToFlagSet(fs *pflag.FlagSet) error {
}

fs.IntP(f.Name, f.Shorthand, v, f.Usage)
if err := fs.Set(f.Name, f.Value); err != nil {
return err
if f.Value != "" {
if err := fs.Set(f.Name, f.Value); err != nil {
return newDefaultFlagValueError(cobraFlagTypeInt, f.Value)
}
}
case Flag_TYPE_FLAG_UINT:
v, err := strconv.ParseUint(f.DefaultValue, 10, 64)
Expand All @@ -76,8 +77,10 @@ func (f *Flag) ExportToFlagSet(fs *pflag.FlagSet) error {
}

fs.UintP(f.Name, f.Shorthand, uint(v), f.Usage)
if err := fs.Set(f.Name, f.Value); err != nil {
return err
if f.Value != "" {
if err := fs.Set(f.Name, f.Value); err != nil {
return newDefaultFlagValueError(cobraFlagTypeUint, f.Value)
}
}
case Flag_TYPE_FLAG_INT64:
v, err := strconv.ParseInt(f.DefaultValue, 10, 64)
Expand All @@ -86,29 +89,37 @@ func (f *Flag) ExportToFlagSet(fs *pflag.FlagSet) error {
}

fs.Int64P(f.Name, f.Shorthand, v, f.Usage)
if err := fs.Set(f.Name, f.Value); err != nil {
return err
if f.Value != "" {
if err := fs.Set(f.Name, f.Value); err != nil {
return newDefaultFlagValueError(cobraFlagTypeInt64, f.Value)
}
}
case Flag_TYPE_FLAG_UINT64:
v, err := strconv.ParseUint(f.DefaultValue, 10, 64)
if err != nil {
return newDefaultFlagValueError(cobraFlagTypeInt64, f.DefaultValue)
return newDefaultFlagValueError(cobraFlagTypeUint64, f.DefaultValue)
}

fs.Uint64P(f.Name, f.Shorthand, v, f.Usage)
if err := fs.Set(f.Name, f.Value); err != nil {
return err
if f.Value != "" {
if err := fs.Set(f.Name, f.Value); err != nil {
return newDefaultFlagValueError(cobraFlagTypeUint64, f.Value)
}
}
case Flag_TYPE_FLAG_STRING_SLICE:
s := strings.Trim(f.DefaultValue, "[]")
fs.StringSliceP(f.Name, f.Shorthand, strings.Fields(s), f.Usage)
if err := fs.Set(f.Name, strings.Trim(f.Value, "[]")); err != nil {
return err
if f.Value != "" {
if err := fs.Set(f.Name, strings.Trim(f.Value, "[]")); err != nil {
return newDefaultFlagValueError(cobraFlagTypeStringSlice, f.Value)
}
}
case Flag_TYPE_FLAG_STRING_UNSPECIFIED:
fs.StringP(f.Name, f.Shorthand, f.DefaultValue, f.Usage)
if err := fs.Set(f.Name, f.Value); err != nil {
return err
if f.Value != "" {
if err := fs.Set(f.Name, f.Value); err != nil {
return newDefaultFlagValueError(cobraFlagTypeString, f.Value)
}
}
}
return nil
Expand Down
Loading