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.

Sign up for GitHub

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

Jump to bottom

bump github.com/alecthomas/kingpin/v2 to v2.4.0 #5023

Closed
wants to merge 1 commit into from
+1,084 −4,702
Closed

bump github.com/alecthomas/kingpin/v2 to v2.4.0 #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion cmd/common/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"os"
"path/filepath"

"github.com/alecthomas/kingpin/v2"
"github.com/hyperledger/fabric/cmd/common/comm"
"github.com/hyperledger/fabric/cmd/common/signer"
"gopkg.in/alecthomas/kingpin.v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/configtxlator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"os"
"reflect"

"github.com/alecthomas/kingpin/v2"
"github.com/gorilla/handlers"
"github.com/hyperledger/fabric-config/protolator"
"github.com/hyperledger/fabric-lib-go/common/flogging"
Expand All @@ -29,7 +30,6 @@ import (
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"
"gopkg.in/alecthomas/kingpin.v2"
)

// command line flags
Expand Down
3 changes: 1 addition & 2 deletions cmd/cryptogen/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@ import (
"path/filepath"
"text/template"

"github.com/alecthomas/kingpin/v2"
"github.com/hyperledger/fabric/internal/cryptogen/ca"
"github.com/hyperledger/fabric/internal/cryptogen/csp"
"github.com/hyperledger/fabric/internal/cryptogen/metadata"
"github.com/hyperledger/fabric/internal/cryptogen/msp"

"gopkg.in/alecthomas/kingpin.v2"
"gopkg.in/yaml.v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/ledgerutil/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"fmt"
"os"

"github.com/alecthomas/kingpin/v2"
"github.com/hyperledger/fabric/internal/ledgerutil/compare"
"github.com/hyperledger/fabric/internal/ledgerutil/identifytxs"
"github.com/hyperledger/fabric/internal/ledgerutil/verify"
"gopkg.in/alecthomas/kingpin.v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/osnadmin/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import (
"net/http"
"os"

"github.com/alecthomas/kingpin/v2"
"github.com/hyperledger/fabric-protos-go-apiv2/common"
"github.com/hyperledger/fabric/internal/osnadmin"
"github.com/hyperledger/fabric/protoutil"
"google.golang.org/protobuf/proto"
"gopkg.in/alecthomas/kingpin.v2"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion discovery/cmd/cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"os"
"time"

"github.com/alecthomas/kingpin/v2"
"github.com/hyperledger/fabric/cmd/common"
discovery "github.com/hyperledger/fabric/discovery/client"
"gopkg.in/alecthomas/kingpin.v2"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion discovery/cmd/cmd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ package discovery_test
import (
"testing"

"github.com/alecthomas/kingpin/v2"
discovery "github.com/hyperledger/fabric/discovery/cmd"
"github.com/hyperledger/fabric/discovery/cmd/mocks"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"gopkg.in/alecthomas/kingpin.v2"
)

func TestAddCommands(t *testing.T) {
Expand Down
4 changes: 1 addition & 3 deletions discovery/cmd/mocks/command_registrar.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 11 additions & 5 deletions docs/source/commands/configtxlator.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ usage: configtxlator start [<flags>]
Start the configtxlator REST server
Flags:
--help Show context-sensitive help (also try --help-long and
--[no-]help Show context-sensitive help (also try --help-long and
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is no-help?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know, after upgrading the library. this prompt is now generated

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image As I understand it, this is done to explicitly set some parameter to false

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alecthomas/kingpin@32660ac#diff-5150d3041d43020ac2b39e44af9b692972d5627a5777782e52a0e2094c420af9R80

modified here

--help-man).
--hostname="0.0.0.0" The hostname or IP on which the REST server will listen
--port=7059 The port on which the REST server will listen
Expand All @@ -42,8 +43,9 @@ usage: configtxlator proto_encode --type=TYPE [<flags>]
Converts a JSON document to protobuf.
Flags:
--help Show context-sensitive help (also try --help-long and
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).
--type=TYPE The type of protobuf structure to encode to. For
example, 'common.Config'.
Expand All @@ -58,8 +60,9 @@ usage: configtxlator proto_decode --type=TYPE [<flags>]
Converts a proto message to JSON.
Flags:
--help Show context-sensitive help (also try --help-long and
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).
--type=TYPE The type of protobuf structure to decode from. For
example, 'common.Config'.
Expand All @@ -75,8 +78,9 @@ usage: configtxlator compute_update --channel_id=CHANNEL_ID [<flags>]
Takes two marshaled common.Config messages and computes the config update which
transitions between the two.
Flags:
--help Show context-sensitive help (also try --help-long and
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).
--original=ORIGINAL The original config message.
--updated=UPDATED The updated config message.
Expand All @@ -91,8 +95,10 @@ usage: configtxlator version
Show version information
Flags:
--help Show context-sensitive help (also try --help-long and --help-man).
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).
```

## Examples
Expand Down
30 changes: 19 additions & 11 deletions docs/source/commands/cryptogen.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,27 +21,29 @@ The ``cryptogen`` command has five subcommands, as follows:

## cryptogen help
```
usage: cryptogen [<flags>] <command> [<args> ...]
usage: cryptogen <command> [<args> ...]

Utility for generating Hyperledger Fabric key material


Flags:
--help Show context-sensitive help (also try --help-long and --help-man).
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).

Commands:
help [<command>...]
help [<command>...]
Show help.

generate [<flags>]
generate [<flags>]
Generate key material

showtemplate
showtemplate
Show the default configuration template

version
version
Show version information

extend [<flags>]
extend [<flags>]
Extend existing network
```

Expand All @@ -52,8 +54,9 @@ usage: cryptogen generate [<flags>]

Generate key material


Flags:
--help Show context-sensitive help (also try --help-long
--[no-]help Show context-sensitive help (also try --help-long
and --help-man).
--output="crypto-config" The output directory in which to place artifacts
--config=CONFIG The configuration template to use
Expand All @@ -66,8 +69,10 @@ usage: cryptogen showtemplate

Show the default configuration template


Flags:
--help Show context-sensitive help (also try --help-long and --help-man).
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).
```


Expand All @@ -77,8 +82,9 @@ usage: cryptogen extend [<flags>]

Extend existing network


Flags:
--help Show context-sensitive help (also try --help-long and
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).
--input="crypto-config" The input directory in which existing network place
--config=CONFIG The configuration template to use
Expand All @@ -91,8 +97,10 @@ usage: cryptogen version

Show version information


Flags:
--help Show context-sensitive help (also try --help-long and --help-man).
--[no-]help Show context-sensitive help (also try --help-long and
--help-man).
```

## Usage
Expand Down
9 changes: 6 additions & 3 deletions docs/source/commands/ledgerutil.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,9 @@ usage: ledgerutil compare [<flags>] <snapshotPath1> <snapshotPath2>
Compare channel snapshots from two different peers.
Flags:
--help Show context-sensitive help (also try --help-long
--[no-]help Show context-sensitive help (also try --help-long
and --help-man).
-o, --outputDir=OUTPUTDIR Snapshot comparison json results output directory.
Default is the current directory.
Expand All @@ -184,8 +185,9 @@ usage: ledgerutil identifytxs [<flags>] <snapshotDiffsPath> [<blockStorePath>]
Identify potentially divergent transactions.
Flags:
--help Show context-sensitive help (also try --help-long
--[no-]help Show context-sensitive help (also try --help-long
and --help-man).
-o, --outputDir=OUTPUTDIR Location for identified transactions json results
output directory. Default is the current directory.
Expand All @@ -207,8 +209,9 @@ usage: ledgerutil verify [<flags>] [<blockStorePath>]
Verify the integrity of a ledger
Flags:
--help Show context-sensitive help (also try --help-long
--[no-]help Show context-sensitive help (also try --help-long
and --help-man).
-o, --outputDir=OUTPUTDIR Location for verification result output directory.
Default is the current directory.
Expand Down
26 changes: 15 additions & 11 deletions docs/source/commands/osnadminchannel.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ usage: osnadmin channel <command> [<args> ...]
Channel actions
Flags:
--help Show context-sensitive help (also try
--[no-]help Show context-sensitive help (also try
--help-long and --help-man).
-o, --orderer-address=ORDERER-ADDRESS
Admin endpoint of the OSN
Expand All @@ -38,20 +39,20 @@ Flags:
--client-key=CLIENT-KEY Path to file containing PEM-encoded private key
to use for mutual TLS communication with the
OSN
--no-status Remove the HTTP status message from the command
--[no-]no-status Remove the HTTP status message from the command
output
Subcommands:
channel join --channelID=CHANNELID --config-block=CONFIG-BLOCK
channel join --channelID=CHANNELID --config-block=CONFIG-BLOCK
Join an Ordering Service Node (OSN) to a channel. If the channel does not
yet exist, it will be created.
channel list [<flags>]
channel list [<flags>]
List channel information for an Ordering Service Node (OSN). If the
channelID flag is set, more detailed information will be provided for that
channel.
channel remove --channelID=CHANNELID
channel remove --channelID=CHANNELID
Remove a channel from an Ordering Service Node (OSN).
```

Expand All @@ -63,8 +64,9 @@ usage: osnadmin channel join --channelID=CHANNELID --config-block=CONFIG-BLOCK
Join an Ordering Service Node (OSN) to a channel. If the channel does not yet
exist, it will be created.
Flags:
--help Show context-sensitive help (also try
--[no-]help Show context-sensitive help (also try
--help-long and --help-man).
-o, --orderer-address=ORDERER-ADDRESS
Admin endpoint of the OSN
Expand All @@ -76,7 +78,7 @@ Flags:
--client-key=CLIENT-KEY Path to file containing PEM-encoded private key
to use for mutual TLS communication with the
OSN
--no-status Remove the HTTP status message from the command
--[no-]no-status Remove the HTTP status message from the command
output
-c, --channelID=CHANNELID Channel ID
-b, --config-block=CONFIG-BLOCK
Expand All @@ -92,8 +94,9 @@ usage: osnadmin channel list [<flags>]
List channel information for an Ordering Service Node (OSN). If the channelID
flag is set, more detailed information will be provided for that channel.
Flags:
--help Show context-sensitive help (also try
--[no-]help Show context-sensitive help (also try
--help-long and --help-man).
-o, --orderer-address=ORDERER-ADDRESS
Admin endpoint of the OSN
Expand All @@ -105,7 +108,7 @@ Flags:
--client-key=CLIENT-KEY Path to file containing PEM-encoded private key
to use for mutual TLS communication with the
OSN
--no-status Remove the HTTP status message from the command
--[no-]no-status Remove the HTTP status message from the command
output
-c, --channelID=CHANNELID Channel ID
```
Expand All @@ -117,8 +120,9 @@ usage: osnadmin channel remove --channelID=CHANNELID
Remove a channel from an Ordering Service Node (OSN).
Flags:
--help Show context-sensitive help (also try
--[no-]help Show context-sensitive help (also try
--help-long and --help-man).
-o, --orderer-address=ORDERER-ADDRESS
Admin endpoint of the OSN
Expand All @@ -130,7 +134,7 @@ Flags:
--client-key=CLIENT-KEY Path to file containing PEM-encoded private key
to use for mutual TLS communication with the
OSN
--no-status Remove the HTTP status message from the command
--[no-]no-status Remove the HTTP status message from the command
output
-c, --channelID=CHANNELID Channel ID
```
Expand Down
Loading