SystemStore migration to return plain errors (#14835)

* SystemStore migration to return plain errors

* Fix nilness

* Fix translations

* Fix merge

* Fix layers

* Fix merge errors

* Lint: remove unnecessary use of sprint

* Fix merge errors

* Fix i18n

Co-authored-by: Agniva De Sarker <agnivade@yahoo.co.in>

migrations/migrations_test.go

@@ -34,16 +34,16 @@ func TestGetMigrationState(t *testing.T) {
 		Name:  migrationKey,
 		Value: "true",
 	}
-	err = th.App.Srv().Store.System().Save(&system)
-	assert.Nil(t, err)
+	nErr := th.App.Srv().Store.System().Save(&system)
+	assert.Nil(t, nErr)
 
 	state, job, err = GetMigrationState(migrationKey, th.App.Srv().Store)
 	assert.Nil(t, err)
 	assert.Nil(t, job)
 	assert.Equal(t, "completed", state)
 
-	_, err = th.App.Srv().Store.System().PermanentDeleteByName(migrationKey)
-	assert.Nil(t, err)
+	_, nErr = th.App.Srv().Store.System().PermanentDeleteByName(migrationKey)
+	assert.Nil(t, nErr)
 
 	// Test with a job scheduled in "pending" state.
 	j1 := &model.Job{

migrations/worker.go

@@ -157,8 +157,8 @@ func (worker *Worker) runMigration(key string, lastDone string) (bool, string, *
 	}
 
 	if done {
-		if saveErr := worker.srv.Store.System().Save(&model.System{Name: key, Value: "true"}); saveErr != nil {
-			return false, "", saveErr
+		if nErr := worker.srv.Store.System().Save(&model.System{Name: key, Value: "true"}); nErr != nil {
+			return false, "", model.NewAppError("runMigration", "migrations.system.save.app_error", nil, nErr.Error(), http.StatusInternalServerError)
 		}
 	}