Merge pull request #2951 from oasislabs/kostko/fix/signer-cfg

go/oasis-node: Signer configuration fixes

.changelog/2949.bugfix.md

@@ -0,0 +1,6 @@
+go/oasis-node: Fix signer configuration via YAML
+
+The `--signer` argument has been renamed to `--signer.backend` to allow
+signer configuration to be passed via a YAML config. Previously, this would
+be impossible as `signer` would need to be both a string and a map at the
+same time when set via a YAML config.

.changelog/2950.bugfix.md

@@ -0,0 +1 @@
+go/oasis-node: Fix parsing of signer configuration

go/oasis-node/cmd/common/signer/signer.go

@@ -20,7 +20,7 @@ import (
 
 const (
 	// CfgSigner is the flag used to specify the backend of the signer.
-	CfgSigner = "signer"
+	CfgSigner = "signer.backend"
 
 	// CfgCLISignerDir is the flag used to specify the directory with the
 	// entity files, for the purpose of some of the node sub-command's

go/oasis-node/cmd/node/node.go

@@ -798,6 +798,7 @@ func init() {
 		metrics.Flags,
 		tracing.Flags,
 		cmdGrpc.ServerLocalFlags,
+		cmdSigner.Flags,
 		pprof.Flags,
 		storage.Flags,
 		supplementarysanity.Flags,

go/oasis-test-runner/oasis/entity.go

@@ -70,7 +70,7 @@ func (ent *Entity) Signer() signature.Signer {
 
 func (ent *Entity) toGenesisArgs() []string {
 	if ent.dir != nil {
-		return []string{"--signer", fileSigner.SignerName, "--signer.dir", ent.dir.String()}
+		return []string{"--" + cmdSigner.CfgSigner, fileSigner.SignerName, "--" + cmdSigner.CfgCLISignerDir, ent.dir.String()}
 	} else if ent.isDebugTestEntity {
 		return entityArgsDebugTest
 	}
@@ -99,7 +99,7 @@ func (ent *Entity) update() error {
 		"--" + cmdSigner.CfgCLISignerDir, ent.dir.String(),
 	}
 	for _, n := range ent.nodes {
-		args = append(args, "--entity.node.id", n.String())
+		args = append(args, "--"+cmdEntity.CfgNodeID, n.String())
 	}
 
 	w, err := ent.dir.NewLogWriter("update.log")