From f88783dfa1421e01e85cd6d3e353a2aefc3fa0da Mon Sep 17 00:00:00 2001 From: Priyansu Rout Date: Fri, 14 Jun 2024 00:41:10 +0530 Subject: [PATCH] Implement 'osnadmin channel info' subcommand and update tests Signed-off-by: Priyansu Rout --- cmd/osnadmin/main.go | 2 +- cmd/osnadmin/main_test.go | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/cmd/osnadmin/main.go b/cmd/osnadmin/main.go index 54a2730392e..b93e98c49c7 100644 --- a/cmd/osnadmin/main.go +++ b/cmd/osnadmin/main.go @@ -58,7 +58,7 @@ func executeForArgs(args []string) (output string, exit int, err error) { infoChannelID := info.Flag("channelID", "Channel ID").Short('c').Required().String() remove := channel.Command("remove", "Remove a channel from an Ordering Service Node (OSN).") - removeChannelID := remove.Flag("channelID", "Channel ID").Short('c').String() + removeChannelID := remove.Flag("channelID", "Channel ID").Short('c').Required().String() command, err := app.Parse(args) if err != nil { diff --git a/cmd/osnadmin/main_test.go b/cmd/osnadmin/main_test.go index f11a66d4da5..f24f90cb7f2 100644 --- a/cmd/osnadmin/main_test.go +++ b/cmd/osnadmin/main_test.go @@ -209,6 +209,20 @@ var _ = Describe("osnadmin", func() { }, nil) }) + It("returns an error when channelID flag is not provided", func() { + args := []string{ + "channel", + "info", + "--orderer-address", ordererURL, + "--ca-file", ordererCACert, + "--client-cert", clientCert, + "--client-key", clientKey, + } + output, exit, err := executeForArgs(args) + expectedErrorMessage := "required flag(s) \"channelID\" not set" + checkCLIError(output, exit, err, expectedErrorMessage) + }) + It("uses the channel participation API to list the details of a single channel", func() { args := []string{ "channel",