Skip to content
Open
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Fixed

- Reject unsupported `net-info --output` formats instead of falling back to text output [#3360](https://github.com/evstack/ev-node/pull/3360).

## v1.1.3

### Fixed
Expand Down
15 changes: 10 additions & 5 deletions pkg/cmd/p2p.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ var NetInfoCmd = &cobra.Command{
return fmt.Errorf("RPC address not found in node configuration")
}

outputFormat, err := cmd.Flags().GetString(flagOutput)
if err != nil {
return err
}
switch outputFormat {
case "text", "json":
default:
return fmt.Errorf("unsupported output format %q (supported: text, json)", outputFormat)
}

// Create HTTP client
httpClient := http.Client{
Transport: http.DefaultTransport,
Expand Down Expand Up @@ -75,11 +85,6 @@ var NetInfoCmd = &cobra.Command{
return fmt.Errorf("GetPeerInfo RPC: %w", err)
}

outputFormat, err := cmd.Flags().GetString(flagOutput)
if err != nil {
return err
}

if outputFormat == "json" {
return formatJson(cmd.OutOrStdout(), netInfo, peerResp)
}
Expand Down
30 changes: 30 additions & 0 deletions pkg/cmd/p2p_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -199,3 +199,33 @@ func TestNetInfoCmd_NoPeers(t *testing.T) {

mockP2P.AssertExpectations(t)
}

func TestNetInfoCmd_InvalidOutputFormat(t *testing.T) {
require := require.New(t)

tempDir, err := os.MkdirTemp("", "evolve-test-home-invalid-output-*")
require.NoError(err)
defer os.RemoveAll(tempDir)

rpcAddr := "127.0.0.1:1"
v := viper.New()
v.Set(config.FlagRPCAddress, rpcAddr)
v.Set(config.FlagRootDir, tempDir)

rootCmd := &cobra.Command{Use: "root"}
rootCmd.PersistentFlags().String(config.FlagRootDir, tempDir, "Root directory for config and data")
rootCmd.PersistentFlags().String(config.FlagRPCAddress, rpcAddr, "RPC listen address")

err = v.BindPFlag(config.FlagRootDir, rootCmd.PersistentFlags().Lookup(config.FlagRootDir))
require.NoError(err)
err = v.BindPFlag(config.FlagRPCAddress, rootCmd.PersistentFlags().Lookup(config.FlagRPCAddress))
require.NoError(err)

NetInfoCmd.SetContext(context.WithValue(context.Background(), viperKey, v))
rootCmd.AddCommand(NetInfoCmd)

output, err := executeCommandC(rootCmd, "net-info", "--evnode.rpc.address="+rpcAddr, "--output", "yaml")

require.Error(err, "Command should reject unsupported output format: %s", output)
require.Contains(err.Error(), `unsupported output format "yaml"`)
}