From f388c3125997d4b7411f62e5d2bd24830d160a83 Mon Sep 17 00:00:00 2001
From: Adphi <philippe.adrien.nousse@gmail.com>
Date: Tue, 16 Oct 2018 11:52:34 +0200
Subject: [PATCH] Moved sensitive data to env vars: TODO: Remove config.yml
 from git history

---
 .gitlab-ci.yml      |  5 +++--
 gonextcloud_test.go | 18 +++++++++++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6489cd5..95c9b85 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,8 +9,9 @@ before_script:
 - mkdir -p /go/src/gitlab.adphi.fr/partitio/Nextcloud-Partitio
 - cp -r $CI_PROJECT_DIR /go/src/gitlab.adphi.fr/partitio/Nextcloud-Partitio
 - cd /go/src/gitlab.adphi.fr/partitio/Nextcloud-Partitio/gonextcloud
-- sed -i -e 's/$NEXTCLOUD_URL/'${NEXTCLOUD_URL//\//\\/}'/g' config.yml
-- sed -i -e 's/$NEXTCLOUD_PASSWORD/'${NEXTCLOUD_PASSWORD}'/g' config.yml
+#- sed -i -e 's/$NEXTCLOUD_URL/'${NEXTCLOUD_URL//\//\\/}'/g' config.yml
+#- sed -i -e 's/$NEXTCLOUD_PASSWORD/'${NEXTCLOUD_PASSWORD}'/g' config.yml
+#- sed -i -e 's/$NEXTCLOUD_EMAIL/'${NEXTCLOUD_EMAIL}'/g' config.yml
 - make dep
 
 unit_tests:
diff --git a/gonextcloud_test.go b/gonextcloud_test.go
index 45d9cdd..15f01e2 100644
--- a/gonextcloud_test.go
+++ b/gonextcloud_test.go
@@ -587,7 +587,23 @@ func LoadConfig() error {
 	if err != nil {
 		return err
 	}
-	return yaml.Unmarshal(b, &config)
+	if err := yaml.Unmarshal(b, &config); err != nil {
+		return err
+	}
+	// Override with env variables
+	u := os.Getenv("NEXTCLOUD_URL")
+	if u != "" {
+		config.URL = u
+	}
+	p := os.Getenv("NEXTCLOUD_PASSWORD")
+	if p != "" {
+		config.Password = p
+	}
+	e := os.Getenv("NEXTCLOUD_EMAIL")
+	if e != "" {
+		config.Email = e
+	}
+	return nil
 }
 
 func initClient() error {