Merge branch 'master' of github.com:mattermost/mattermost-server into MM-50966-in-product-expansion-backend

server/channels/api4/apitestlib.go

@@ -71,10 +71,8 @@ type TestHelper struct {
 
 	IncludeCacheLayer bool
 
-	LogBuffer                *mlog.Buffer
-	TestLogger               *mlog.Logger
-	boardsProductEnvValue    string
-	playbooksDisableEnvValue string
+	LogBuffer  *mlog.Buffer
+	TestLogger *mlog.Logger
 }
 
 var mainHelper *testlib.MainHelper
@@ -104,17 +102,6 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent
 	*memoryConfig.AnnouncementSettings.AdminNoticesEnabled = false
 	*memoryConfig.AnnouncementSettings.UserNoticesEnabled = false
 	*memoryConfig.PluginSettings.AutomaticPrepackagedPlugins = false
-
-	// disable Boards through the feature flag
-	boardsProductEnvValue := os.Getenv("MM_FEATUREFLAGS_BoardsProduct")
-	os.Unsetenv("MM_FEATUREFLAGS_BoardsProduct")
-	memoryConfig.FeatureFlags.BoardsProduct = false
-
-	// disable Playbooks (temporarily) as it causes many more mocked methods to get
-	// called, and cannot receieve a mocked database.
-	playbooksDisableEnvValue := os.Getenv("MM_DISABLE_PLAYBOOKS")
-	os.Setenv("MM_DISABLE_PLAYBOOKS", "true")
-
 	if updateConfig != nil {
 		updateConfig(memoryConfig)
 	}
@@ -153,15 +140,13 @@ func setupTestHelper(dbStore store.Store, searchEngine *searchengine.Broker, ent
 	}
 
 	th := &TestHelper{
-		App:                      app.New(app.ServerConnector(s.Channels())),
-		Server:                   s,
-		ConfigStore:              configStore,
-		IncludeCacheLayer:        includeCache,
-		Context:                  request.EmptyContext(testLogger),
-		TestLogger:               testLogger,
-		LogBuffer:                buffer,
-		boardsProductEnvValue:    boardsProductEnvValue,
-		playbooksDisableEnvValue: playbooksDisableEnvValue,
+		App:               app.New(app.ServerConnector(s.Channels())),
+		Server:            s,
+		ConfigStore:       configStore,
+		IncludeCacheLayer: includeCache,
+		Context:           request.EmptyContext(testLogger),
+		TestLogger:        testLogger,
+		LogBuffer:         buffer,
 	}
 	th.Context.SetLogger(testLogger)
 
@@ -386,17 +371,6 @@ func (th *TestHelper) ShutdownApp() {
 }
 
 func (th *TestHelper) TearDown() {
-	// reset board and playbooks product setting to original
-	if th.boardsProductEnvValue != "" {
-		os.Setenv("MM_FEATUREFLAGS_BoardsProduct", th.boardsProductEnvValue)
-	}
-
-	if th.playbooksDisableEnvValue != "" {
-		os.Setenv("MM_DISABLE_PLAYBOOKS", th.playbooksDisableEnvValue)
-	} else {
-		os.Unsetenv("MM_DISABLE_PLAYBOOKS")
-	}
-
 	if th.IncludeCacheLayer {
 		// Clean all the caches
 		th.App.Srv().InvalidateAllCaches()

server/channels/api4/hosted_customer.go

@@ -13,6 +13,8 @@ import (
 	"reflect"
 	"time"
 
+	"github.com/pkg/errors"
+
 	"github.com/mattermost/mattermost-server/v6/model"
 	"github.com/mattermost/mattermost-server/v6/server/channels/utils"
 	"github.com/mattermost/mattermost-server/v6/server/platform/shared/mlog"
@@ -274,6 +276,10 @@ func selfHostedInvoices(c *Context, w http.ResponseWriter, r *http.Request) {
 	invoices, err := c.App.Cloud().GetSelfHostedInvoices()
 
 	if err != nil {
+		if err.Error() == "404" {
+			c.Err = model.NewAppError(where, "api.cloud.app_error", nil, "", http.StatusNotFound).Wrap(errors.New("invoices for license not found"))
+			return
+		}
 		c.Err = model.NewAppError(where, "api.cloud.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
 		return
 	}