Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2

1 files changed, 46 insertions, 0 deletions

diff --git a/cmd/mattermost/commands/init.go b/cmd/mattermost/commands/init.go
new file mode 100644
index 000000000..aea2b1230
--- /dev/null
+++ b/cmd/mattermost/commands/init.go
@@ -0,0 +1,46 @@
+// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package commands
+
+import (
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
+	"github.com/spf13/cobra"
+)
+
+func InitDBCommandContextCobra(command *cobra.Command) (*app.App, error) {
+	config, err := command.Flags().GetString("config")
+	if err != nil {
+		return nil, err
+	}
+
+	a, err := InitDBCommandContext(config)
+	if err != nil {
+		// Returning an error just prints the usage message, so actually panic
+		panic(err)
+	}
+
+	a.DoAdvancedPermissionsMigration()
+
+	return a, nil
+}
+
+func InitDBCommandContext(configFileLocation string) (*app.App, error) {
+	if err := utils.TranslationsPreInit(); err != nil {
+		return nil, err
+	}
+	model.AppErrorInit(utils.T)
+
+	a, err := app.New(app.ConfigFile(configFileLocation))
+	if err != nil {
+		return nil, err
+	}
+
+	if model.BuildEnterpriseReady == "true" {
+		a.LoadLicense()
+	}
+
+	return a, nil
+}