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

Minor updates related to documentation for commands and more osnadmin updates (release-2.3) #2322

Merged
merged 3 commits into from
Jan 28, 2021

Conversation

sykesm
Copy link
Contributor

@sykesm sykesm commented Jan 28, 2021

Cherry pick of #2318 and an update to peer_lifecycle_chaincode_postscript.md to fix the /Channel/Application/Endorsement policy reference.

This change returns an error from `executeForArgs` when the command line
cannot be parsed. Without this change, tests that use the function
quietly exit without a clear indication as to why.

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
- Change the generateHelpDocs script to remove trailing spaces from the
  generated help text. This prevents linting failures from
  check_trailingspaces.sh
- Remove trailing space from osnadmin_channel_postscript.md
- Regenerate the help docs with `make help-docs`

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
@sykesm sykesm requested review from a team as code owners January 28, 2021 14:39
@sykesm sykesm changed the title Fixup osnadmin 2.3 Minor updates related to documentation for commands and more osnadmin updates (release-2.3) Jan 28, 2021
Copy link
Contributor

@wlahti wlahti left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks, Matt!

@@ -595,7 +595,7 @@ also outputs which organizations have approved the chaincode definition. If an
organization has approved the chaincode definition specified in the command, the
command will return a value of true. You can use this command to learn whether enough
channel members have approved a chaincode definition to meet the
`Application/Channel/Endorsement` policy (a majority by default) before the
`/Channel/Application/Endorsement` policy (a majority by default) before the
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure how we never noticed this before. Good catch!

@wlahti wlahti merged commit 8dc9930 into hyperledger:release-2.3 Jan 28, 2021
@sykesm sykesm deleted the fixup-osnadmin-2.3 branch February 20, 2021 02:26
joshua-roberts pushed a commit to usnistgov/redledger-fabric that referenced this pull request Nov 4, 2022
… updates (release-2.3) (hyperledger#2322)

* Avoid os.Exit behavior when an osnadmin test fails

This change returns an error from `executeForArgs` when the command line
cannot be parsed. Without this change, tests that use the function
quietly exit without a clear indication as to why.

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

* generateHelpDocs filters trailing space from text

- Change the generateHelpDocs script to remove trailing spaces from the
  generated help text. This prevents linting failures from
  check_trailingspaces.sh
- Remove trailing space from osnadmin_channel_postscript.md
- Regenerate the help docs with `make help-docs`

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>

* Fix channelID flag reference in osnadmin help

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants