From bd81b073d1d7b964382eeedb7cc8a556967d91a1 Mon Sep 17 00:00:00 2001
From: David Zhao <david@davidzhao.com>
Date: Mon, 25 Jan 2021 21:34:16 -0800
Subject: [PATCH] allow keys to be passed in from env (again), cli to use
 LIVEKIT prefix

---
 cmd/cli/commands/utils.go | 4 ++--
 cmd/server/main.go        | 5 +++++
 pkg/config/config.go      | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/cmd/cli/commands/utils.go b/cmd/cli/commands/utils.go
index f646a8c45..5e48e2ad6 100644
--- a/cmd/cli/commands/utils.go
+++ b/cmd/cli/commands/utils.go
@@ -28,12 +28,12 @@ var (
 	}
 	apiKeyFlag = &cli.StringFlag{
 		Name:     "api-key",
-		EnvVars:  []string{"LK_API_KEY"},
+		EnvVars:  []string{"LIVEKIT_API_KEY"},
 		Required: true,
 	}
 	secretFlag = &cli.StringFlag{
 		Name:     "api-secret",
-		EnvVars:  []string{"LK_API_SECRET"},
+		EnvVars:  []string{"LIVEKIT_API_SECRET"},
 		Required: true,
 	}
 	devFlag = &cli.BoolFlag{
diff --git a/cmd/server/main.go b/cmd/server/main.go
index 9a9788365..444be014e 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -42,6 +42,11 @@ func main() {
 				Name:  "key-file",
 				Usage: "path to file that contains API keys/secrets",
 			},
+			&cli.StringFlag{
+				Name:    "keys",
+				Usage:   "api keys (key: secret\\n)",
+				EnvVars: []string{"LIVEKIT_KEYS"},
+			},
 			&cli.StringFlag{
 				Name:    "redis-host",
 				Usage:   "host (incl. port) to redis server",
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 98d01c3e1..88e3ff66e 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -64,6 +64,12 @@ func (conf *Config) UpdateFromCLI(c *cli.Context) error {
 	if c.IsSet("key-file") {
 		conf.KeyFile = c.String("key-file")
 	}
+	if c.IsSet("keys") {
+		keys := []byte(c.String("keys"))
+		if err := yaml.Unmarshal(keys, &conf.Keys); err != nil {
+			return err
+		}
+	}
 	if c.IsSet("redis-host") {
 		conf.Redis.Address = c.String("redis-host")
 	}