load bot config using environment variables

Author: bivas

README.md

@@ -48,6 +48,13 @@ config:
 - `provider` (optional) - which client to use for git connection - the bot tries to figure out which client to use automatically (currently only `github` is supported but others are on the way)
 - `secret` (optional) - webhook secret to be used for content validation (recommended)
 
+### Environment Variables
+
+You can set the values for `token` and `secret` via environment variables: 
+`RIVI_CONFIG_TOKEN` and `RIVI_CONFIG_SECRET` respectively.
+
+It is common to configure the bot by injecting environment variables via CI server.
+
 ## Roles Section
 
 List of roles for selecting (login) users for assignment. 

bot/config.go

@@ -19,10 +19,14 @@ type clientConfig struct {
 }
 
 func (c *clientConfig) GetOAuthToken() string {
+	c.internal.SetEnvPrefix("rivi_config")
+	c.internal.BindEnv("token")
 	return c.internal.GetString("token")
 }
 
 func (c *clientConfig) GetSecret() string {
+	c.internal.SetEnvPrefix("rivi_config")
+	c.internal.BindEnv("secret")
 	return c.internal.GetString("secret")
 }
 
@@ -80,7 +84,11 @@ func (c *config) GetRules() []Rule {
 }
 
 func (c *config) readConfigSection() error {
-	c.clientConfig = &clientConfig{c.internal["config"]}
+	internal := c.internal["config"]
+	if internal == nil {
+		internal = viper.New()
+	}
+	c.clientConfig = &clientConfig{internal}
 	return nil
 }
 

bot/config_test.go

@@ -2,6 +2,7 @@ package bot
 
 import (
 	"github.com/stretchr/testify/assert"
+	"os"
 	. "testing"
 )
 
@@ -59,3 +60,25 @@ func TestReadConfig(t *T) {
 	assertRoles(t, c)
 	assertRules(t, c)
 }
+
+func TestClientConfigFromEnv(t *T) {
+	os.Setenv("RIVI_CONFIG_TOKEN", "token-from-env")
+	os.Setenv("RIVI_CONFIG_SECRET", "secret-from-env")
+	c, err := newConfiguration("config_test.yml")
+	if err != nil {
+		t.Fatalf("Got error during config read. %s", err)
+	}
+	assert.Equal(t, "token-from-env", c.GetClientConfig().GetOAuthToken(), "token from env")
+	assert.Equal(t, "secret-from-env", c.GetClientConfig().GetSecret(), "secret from env")
+}
+
+func TestEmptyConfigTest(t *T) {
+	os.Setenv("RIVI_CONFIG_TOKEN", "token-from-env")
+	os.Setenv("RIVI_CONFIG_SECRET", "secret-from-env")
+	c, err := newConfiguration("empty_config_test.yml")
+	if err != nil {
+		t.Fatalf("Got error during config read. %s", err)
+	}
+	assert.Equal(t, "token-from-env", c.GetClientConfig().GetOAuthToken(), "token from env")
+	assert.Equal(t, "secret-from-env", c.GetClientConfig().GetSecret(), "secret from env")
+}

bot/empty_config_test.yml

@@ -0,0 +1,34 @@
+# test
+
+roles:
+  admins:
+      - user1
+      - user2
+  reviewers:
+      - user1
+      - user3
+  testers:
+      - user2
+
+rules:
+  rule1:
+      condition:
+        order: 5
+        if-labeled:
+          - label1
+  rule2:
+      condition:
+        order: 2
+        skip-if-labeled:
+          - pending-approval
+  rule3:
+      condition:
+        order: 1
+        filter:
+          extensions:
+            - ".go"
+  rule4:
+      condition:
+        filter:
+          patterns:
+            - ".*/docs/.*"