From bf6bb9bce9723799991478e5aea745686045ad65 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Thu, 16 Nov 2017 08:40:26 -0600
Subject: fix config cli option (#7850)

---
 cmd/platform/config_test.go   | 29 +++++++++++++++++++++++++++++
 cmd/platform/init.go          |  2 +-
 cmd/platform/platform_test.go |  2 +-
 cmd/platform/server.go        |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 cmd/platform/config_test.go

(limited to 'cmd/platform')

diff --git a/cmd/platform/config_test.go b/cmd/platform/config_test.go
new file mode 100644
index 000000000..781e40de8
--- /dev/null
+++ b/cmd/platform/config_test.go
@@ -0,0 +1,29 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package main
+
+import (
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
+	"github.com/mattermost/mattermost-server/model"
+)
+
+func TestConfigValidate(t *testing.T) {
+	dir, err := ioutil.TempDir("", "")
+	require.NoError(t, err)
+	defer os.RemoveAll(dir)
+
+	path := filepath.Join(dir, "config.json")
+	config := &model.Config{}
+	config.SetDefaults()
+	require.NoError(t, ioutil.WriteFile(path, []byte(config.ToJson()), 0600))
+
+	assert.Contains(t, checkCommand(t, "--config", path, "config", "validate"), "The document is valid")
+}
diff --git a/cmd/platform/init.go b/cmd/platform/init.go
index a5db40a57..a25b39383 100644
--- a/cmd/platform/init.go
+++ b/cmd/platform/init.go
@@ -32,7 +32,7 @@ func initDBCommandContext(configFileLocation string) (*app.App, error) {
 
 	utils.ConfigureCmdLineLog()
 
-	a := app.New()
+	a := app.New(app.ConfigFile(configFileLocation))
 	if model.BuildEnterpriseReady == "true" {
 		a.LoadLicense()
 	}
diff --git a/cmd/platform/platform_test.go b/cmd/platform/platform_test.go
index 8a2839c7e..9ee68a7aa 100644
--- a/cmd/platform/platform_test.go
+++ b/cmd/platform/platform_test.go
@@ -35,7 +35,7 @@ func checkCommand(t *testing.T, args ...string) string {
 	require.NoError(t, err)
 	output, err := exec.Command(path, execArgs(t, args)...).CombinedOutput()
 	require.NoError(t, err, string(output))
-	return string(output)
+	return strings.TrimSpace(strings.TrimSuffix(strings.TrimSpace(string(output)), "PASS"))
 }
 
 func runCommand(t *testing.T, args ...string) error {
diff --git a/cmd/platform/server.go b/cmd/platform/server.go
index 01f5a0da1..36118d007 100644
--- a/cmd/platform/server.go
+++ b/cmd/platform/server.go
@@ -64,7 +64,7 @@ func runServer(configFileLocation string) {
 		l4g.Error("Problem with file storage settings: " + err.Error())
 	}
 
-	a := app.New()
+	a := app.New(app.ConfigFile(configFileLocation))
 	defer a.Shutdown()
 
 	if model.BuildEnterpriseReady == "true" {
-- 
cgit v1.2.3-1-g7c22