Keep setting MM_SQLSETTINGS_DATASOURCE, but unset for tests

Boards requires something to connect to when starting up, even for tests that mock the store. So keep setting this, but unset as necessary when pointing at a generated database.
grommunio · Mar 15, 2023 · 724ad8e · 724ad8e
1 parent affc64d
commit 724ad8e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -41,6 +41,7 @@ jobs:
             --ulimit nofile=8096:8096 \
             --env-file=dotenv/test.env \
             --env MM_SQLSETTINGS_DRIVERNAME="${{ inputs.drivername }}" \
+            --env MM_SQLSETTINGS_DATASOURCE="${{ inputs.datasource }}" \
             --env TEST_DATABASE_MYSQL_DSN="${{ inputs.datasource }}" \
             --env TEST_DATABASE_POSTGRESQL_DSN="${{ inputs.datasource }}" \
             -v ~/work/mattermost-server:/mattermost-server \

diff --git a/server/channels/store/storetest/settings.go b/server/channels/store/storetest/settings.go
@@ -55,7 +55,15 @@ func MySQLSettings(withReplica bool) *model.SqlSettings {
 	if dsn == "" {
 		dsn = defaultMysqlDSN
 		mlog.Info("No TEST_DATABASE_MYSQL_DSN override, using default", mlog.String("default_dsn", dsn))
+	} else {
+		mlog.Info("Using TEST_DATABASE_MYSQL_DSN override", mlog.String("dsn", dsn))
 	}
+
+	if os.Getenv("MM_SQLSETTINGS_DATASOURCE") != "" {
+		os.Unsetenv("MM_SQLSETTINGS_DATASOURCE")
+		mlog.Info("Clearing MM_SQLSETTINGS_DATASOURCE to use test dsn exclusively")
+	}
+
 	cfg, err := mysql.ParseDSN(dsn)
 	if err != nil {
 		panic("failed to parse dsn " + dsn + ": " + err.Error())
@@ -79,6 +87,13 @@ func PostgreSQLSettings() *model.SqlSettings {
 	if dsn == "" {
 		dsn = defaultPostgresqlDSN
 		mlog.Info("No TEST_DATABASE_POSTGRESQL_DSN override, using default", mlog.String("default_dsn", dsn))
+	} else {
+		mlog.Info("Using TEST_DATABASE_POSTGRESQL_DSN override", mlog.String("dsn", dsn))
+	}
+
+	if os.Getenv("MM_SQLSETTINGS_DATASOURCE") != "" {
+		os.Unsetenv("MM_SQLSETTINGS_DATASOURCE")
+		mlog.Info("Clearing MM_SQLSETTINGS_DATASOURCE to use test dsn exclusively")
 	}
 
 	dsnURL, err := url.Parse(dsn)