Skip to content

Commit 2ec150d

Browse files
committedApr 20, 2017
[FAB-3259] Make cryptogen output more flexible
This patch enhances the cryptogen tool by providing a more flexible configuration and output operation, based on a YAML config file and golang templates. Summary of changes: ------------------------- *) Tool now has two subcommands *) "generate" - This takes the role of the previous top-level command. It gets rid of almost all of the previous command-line switches and replaces them with: -output: specify the output directory. defaults to crypto-config -config: specify the input configuration file. defaults to a configuration similar to before (1 orderer, 2 peer orgs, 1 peer/org *) "showtemplate" - Prints the built-in default template to standard out, suitble for saving/editing for future "generate" sessions. *) CommonName outputs are now much more DNS friendly. For example: we now use "peer3.org1.com" in favor of "peerOrg1Peer3". Users also gain total control over the generation of the CommonNames with various templating facilities. See "cryptogen showtemplate" for more details. Change-Id: I5968a794d4469ada8d3b90e112bdfe93e77c9661 Signed-off-by: Gregory Haskins <gregory.haskins@gmail.com>
1 parent fed2efa commit 2ec150d

39 files changed

+10014
-98
lines changed
 

‎common/tools/cryptogen/main.go

+298-98
Large diffs are not rendered by default.

‎vendor/github.com/alecthomas/template/LICENSE

+27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/README.md

+25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/doc.go

+406
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/exec.go

+845
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/funcs.go

+598
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/helper.go

+108
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/parse/lex.go

+556
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/parse/node.go

+834
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/parse/parse.go

+700
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/template/template.go

+218
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/units/COPYING

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/units/README.md

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/units/bytes.go

+83
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/units/doc.go

+13
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/units/si.go

+26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/alecthomas/units/util.go

+138
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/COPYING

+19
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/README.md

+674
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/actions.go

+42
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/app.go

+685
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/args.go

+184
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/cmd.go

+274
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/completions.go

+33
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/doc.go

+68
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/envar.go

+45
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/flags.go

+308
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/global.go

+94
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/guesswidth.go

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/guesswidth_unix.go

+38
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/model.go

+227
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/parser.go

+384
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/parsers.go

+212
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/gopkg.in/alecthomas/kingpin.v2/templates.go

+262
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.