Reject mysql for enterprise advanced (#31164)
* reject MySQL with the enterprise advanced license If a user attempts to set an Enterprise Advanced License while configured with MySQL, reject the license. This SKU is not compatible with MYSQL. * fix trial typo * suppress trial banner if MySQL * Update server/channels/app/platform/license_test.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix types * suppress mysql from show start trial modal * Skip MySQL-incompatible tests for access control and channel banner features Skip the following tests when running with MySQL database: - Access control policy tests (create, get, delete, check/test expressions, search, assign/unassign, get channels) - Channel banner tests in TestPatchChannel and TestCanEditChannelBanner These features are not supported on MySQL and the tests would fail. Tests will continue to run normally on PostgreSQL. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Skip TestSearchChannelsForAccessControlPolicy subtest for MySQL Add MySQL skip logic to the "SearchChannelsForAccessControlPolicy with regular user" subtest as this access control feature is not supported on MySQL. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * reject trial license requests for MySQL * return false on sku + mysql match, even if logger is nil * Fix MySQL trial license tests to skip appropriately based on database driver 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
f2bb82bc01
Коммит
70a42ffd5f
@@ -810,6 +810,10 @@ func TestPatchChannel(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("Should be able to configure channel banner on a channel", func(t *testing.T) {
|
||||
if *mainHelper.GetSQLSettings().DriverName == model.DatabaseDriverMysql {
|
||||
t.Skip("Channel banner tests are not supported on MySQL")
|
||||
}
|
||||
|
||||
client.Logout(context.Background())
|
||||
th.LoginBasic()
|
||||
th.App.Srv().SetLicense(model.NewTestLicenseSKU(model.LicenseShortSkuEnterpriseAdvanced))
|
||||
@@ -866,6 +870,10 @@ func TestPatchChannel(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("Should be able to configure channel banner as a team admin", func(t *testing.T) {
|
||||
if *mainHelper.GetSQLSettings().DriverName == model.DatabaseDriverMysql {
|
||||
t.Skip("Channel banner tests are not supported on MySQL")
|
||||
}
|
||||
|
||||
client.Logout(context.Background())
|
||||
th.LoginTeamAdmin()
|
||||
th.App.Srv().SetLicense(model.NewTestLicenseSKU(model.LicenseShortSkuEnterpriseAdvanced))
|
||||
@@ -891,6 +899,10 @@ func TestPatchChannel(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("Cannot enable channel banner without configuring it", func(t *testing.T) {
|
||||
if *mainHelper.GetSQLSettings().DriverName == model.DatabaseDriverMysql {
|
||||
t.Skip("Channel banner tests are not supported on MySQL")
|
||||
}
|
||||
|
||||
client.Logout(context.Background())
|
||||
th.LoginBasic()
|
||||
th.App.Srv().SetLicense(model.NewTestLicenseSKU(model.LicenseShortSkuEnterpriseAdvanced))
|
||||
@@ -1010,6 +1022,10 @@ func TestCanEditChannelBanner(t *testing.T) {
|
||||
th := Setup(t).InitBasic()
|
||||
defer th.TearDown()
|
||||
|
||||
if *mainHelper.GetSQLSettings().DriverName == model.DatabaseDriverMysql {
|
||||
t.Skip("Channel banner tests are not supported on MySQL")
|
||||
}
|
||||
|
||||
t.Run("when license is nil", func(t *testing.T) {
|
||||
channel := &model.Channel{
|
||||
Type: model.ChannelTypeOpen,
|
||||
|
||||
Ссылка в новой задаче
Block a user