Extend LUCI_CONTEXT["local_auth"] protocol to understand accounts.

client/authcli/authcli.go

Index: client/authcli/authcli.go
diff --git a/client/authcli/authcli.go b/client/authcli/authcli.go
index 456a91296dd3dd74cf6a4ba63f1e91425e533775..4786c844d262fb0d36304217bbcfb215b034f6ca 100644
--- a/client/authcli/authcli.go
+++ b/client/authcli/authcli.go
@@ -503,8 +503,18 @@ func (c *contextRun) Run(a subcommands.Application, args []string, env subcomman
 		return ExitCodeNoValidToken
 	}
 
+	// We currently always setup a context with one account (which is also

[Vadim Sh., 2017/06/19 20:16:28]

it will be possible to extend authutil to selective replace some accounts, but
leave other accounts intact

but I'm not sure it is needed.... So I did minimal change for now.

+	// default). To avoid confusion where it comes from, we name it 'authutil'.
+	// Most tools should not care how it is named, as long as it is specified as
+	// 'default_account_id' in LUCI_CONTEXT["local_auth"].
+	srv := &localauth.Server{
+		TokenGenerators: map[string]localauth.TokenGenerator{
+			"authutil": gen,
+		},
+		DefaultAccountID: "authutil",

[iannucci, 2017/06/19 20:31:28]

should we document these names somewhere maybe?

[Vadim Sh., 2017/06/19 20:41:36]

Maybe.. This particular name shouldn't be hardcoded anywhere though. I think
most of our code should not rely on any particular account names (it should just
use "default_account_id"). The only place where account names matter is when
switching default account to be something else. I believe we'll need to do it
only in Swarming, Kitchen and, maybe, some recipe guts.

We'll see how it goes.

+	}
+
 	// Enter the environment with the local auth server.
-	srv := &localauth.Server{TokenGenerator: gen}
 	err = localauth.WithLocalAuth(ctx, srv, func(ctx context.Context) error {
 		// Put the new LUCI_CONTEXT file, prepare cmd environ.
 		exported, err := lucictx.Export(ctx, "")