Merge branch 'master' into MM-51858-fix-workspace-deletion-telemetry

server/channels/api4/command.go

@@ -329,13 +329,6 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// For compatibility reasons, PermissionCreatePost is also checked.
-	// TODO: Remove in 8.0: https://mattermost.atlassian.net/browse/MM-51274
-	if !c.App.SessionHasPermissionToChannel(c.AppContext, *c.AppContext.Session(), commandArgs.ChannelId, model.PermissionUseSlashCommands) {
-		c.SetPermissionError(model.PermissionUseSlashCommands)
-		return
-	}
-
 	channel, err := c.App.GetChannel(c.AppContext, commandArgs.ChannelId)
 	if err != nil {
 		c.Err = err
@@ -354,13 +347,6 @@ func executeCommand(c *Context, w http.ResponseWriter, r *http.Request) {
 				c.SetPermissionError(model.PermissionCreatePost)
 				return
 			}
-
-			// For compatibility reasons, PermissionCreatePost is also checked.
-			// TODO: Remove in 8.0: https://mattermost.atlassian.net/browse/MM-51274
-			if !c.App.SessionHasPermissionTo(*c.AppContext.Session(), model.PermissionUseSlashCommands) {
-				c.SetPermissionError(model.PermissionUseSlashCommands)
-				return
-			}
 		}
 	}
 

server/channels/api4/plugin_test.go

@@ -1722,14 +1722,26 @@ func TestInstallMarketplacePluginPrepackagedDisabled(t *testing.T) {
 			appErr := th.App.AddPublicKey("pub_key", key)
 			require.Nil(t, appErr)
 
+			t.Cleanup(func() {
+				appErr = th.App.DeletePublicKey("pub_key")
+				require.Nil(t, appErr)
+			})
+
 			testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) {
 				serverVersion := req.URL.Query().Get("server_version")
 				require.NotEmpty(t, serverVersion)
 				require.Equal(t, model.CurrentVersion, serverVersion)
 				res.WriteHeader(http.StatusOK)
+
 				var out []byte
-				out, err = json.Marshal([]*model.MarketplacePlugin{samplePlugins[1]})
-				require.NoError(t, err)
+
+				// Return something if testplugin2 or no specific plugin is requested
+				pluginID := req.URL.Query().Get("plugin_id")
+				if pluginID == "" || pluginID == samplePlugins[1].Manifest.Id {
+					out, err = json.Marshal([]*model.MarketplacePlugin{samplePlugins[1]})
+					require.NoError(t, err)
+				}
+
 				res.Write(out)
 			}))
 			defer testServer.Close()
@@ -1748,43 +1760,52 @@ func TestInstallMarketplacePluginPrepackagedDisabled(t *testing.T) {
 			require.Len(t, pluginsResp.Active, 0)
 			require.Len(t, pluginsResp.Inactive, 0)
 
-			// Should fail to install unknown prepackaged plugin
-			pRequest := &model.InstallMarketplacePluginRequest{Id: "testpluginXX"}
-			manifest, resp, err := client.InstallMarketplacePlugin(pRequest)
-			require.Error(t, err)
-			CheckInternalErrorStatus(t, resp)
-			require.Nil(t, manifest)
+			t.Run("Should fail to install unknown prepackaged plugin", func(t *testing.T) {
+				pRequest := &model.InstallMarketplacePluginRequest{Id: "testpluginXX"}
+				manifest, resp, err := client.InstallMarketplacePlugin(pRequest)
+				require.Error(t, err)
+				CheckInternalErrorStatus(t, resp)
+				require.Nil(t, manifest)
 
-			plugins := env.PrepackagedPlugins()
-			require.Len(t, plugins, 1)
-			require.Equal(t, "testplugin", plugins[0].Manifest.Id)
-			require.Equal(t, pluginSignatureData, plugins[0].Signature)
+				plugins := env.PrepackagedPlugins()
+				require.Len(t, plugins, 1)
+				require.Equal(t, "testplugin", plugins[0].Manifest.Id)
+				require.Equal(t, pluginSignatureData, plugins[0].Signature)
 
-			pluginsResp, _, err = client.GetPlugins()
-			require.NoError(t, err)
-			require.Len(t, pluginsResp.Active, 0)
-			require.Len(t, pluginsResp.Inactive, 0)
+				pluginsResp, _, err = client.GetPlugins()
+				require.NoError(t, err)
+				require.Len(t, pluginsResp.Active, 0)
+				require.Len(t, pluginsResp.Inactive, 0)
+			})
 
-			pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin"}
-			manifest1, _, err := client.InstallMarketplacePlugin(pRequest)
-			require.NoError(t, err)
-			require.NotNil(t, manifest1)
-			require.Equal(t, "testplugin", manifest1.Id)
-			require.Equal(t, "0.0.1", manifest1.Version)
+			t.Run("Install prepackaged plugin with Marketplace disabled", func(t *testing.T) {
+				pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin"}
+				manifest, _, err := client.InstallMarketplacePlugin(pRequest)
+				require.NoError(t, err)
+				require.NotNil(t, manifest)
+				require.Equal(t, "testplugin", manifest.Id)
+				require.Equal(t, "0.0.1", manifest.Version)
 
-			pluginsResp, _, err = client.GetPlugins()
-			require.NoError(t, err)
-			require.Len(t, pluginsResp.Active, 0)
-			require.Equal(t, pluginsResp.Inactive, []*model.PluginInfo{{
-				Manifest: *manifest1,
-			}})
+				t.Cleanup(func() {
+					_, err = client.RemovePlugin(manifest.Id)
+					require.NoError(t, err)
+				})
 
-			// Try to install remote marketplace plugin
-			pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin2"}
-			manifest, resp, err = client.InstallMarketplacePlugin(pRequest)
-			require.Error(t, err)
-			CheckInternalErrorStatus(t, resp)
-			require.Nil(t, manifest)
+				pluginsResp, _, err = client.GetPlugins()
+				require.NoError(t, err)
+				require.Len(t, pluginsResp.Active, 0)
+				require.Equal(t, pluginsResp.Inactive, []*model.PluginInfo{{
+					Manifest: *manifest,
+				}})
+			})
+
+			t.Run("Try to install remote marketplace plugin while Marketplace is disabled", func(t *testing.T) {
+				pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin2"}
+				manifest, resp, err := client.InstallMarketplacePlugin(pRequest)
+				require.Error(t, err)
+				CheckInternalErrorStatus(t, resp)
+				require.Nil(t, manifest)
+			})
 
 			// Enable remote marketplace
 			th.App.UpdateConfig(func(cfg *model.Config) {
@@ -1794,31 +1815,58 @@ func TestInstallMarketplacePluginPrepackagedDisabled(t *testing.T) {
 				*cfg.PluginSettings.AllowInsecureDownloadURL = true
 			})
 
-			pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin2"}
-			manifest2, _, err := client.InstallMarketplacePlugin(pRequest)
-			require.NoError(t, err)
-			require.NotNil(t, manifest2)
-			require.Equal(t, "testplugin2", manifest2.Id)
-			require.Equal(t, "1.2.3", manifest2.Version)
+			t.Run("Install prepackaged, not listed plugin with Marketplace enabled", func(t *testing.T) {
+				pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin"}
+				manifest, _, err := client.InstallMarketplacePlugin(pRequest)
+				require.NoError(t, err)
 
-			pluginsResp, _, err = client.GetPlugins()
-			require.NoError(t, err)
-			require.Len(t, pluginsResp.Active, 0)
-			require.ElementsMatch(t, pluginsResp.Inactive, []*model.PluginInfo{
-				{
-					Manifest: *manifest1,
-				},
-				{
-					Manifest: *manifest2,
-				},
+				t.Cleanup(func() {
+					_, err = client.RemovePlugin(manifest.Id)
+					require.NoError(t, err)
+				})
+
+				require.NotNil(t, manifest)
+				assert.Equal(t, "testplugin", manifest.Id)
+				assert.Equal(t, "0.0.1", manifest.Version)
 			})
 
-			// Clean up
-			_, err = client.RemovePlugin(manifest1.Id)
-			require.NoError(t, err)
+			t.Run("Install both a prepacked and a Marketplace plugin", func(t *testing.T) {
+				pRequest := &model.InstallMarketplacePluginRequest{Id: "testplugin"}
+				manifest1, _, err := client.InstallMarketplacePlugin(pRequest)
+				require.NoError(t, err)
+				require.NotNil(t, manifest1)
+				assert.Equal(t, "testplugin", manifest1.Id)
+				assert.Equal(t, "0.0.1", manifest1.Version)
 
-			_, err = client.RemovePlugin(manifest2.Id)
-			require.NoError(t, err)
+				t.Cleanup(func() {
+					_, err = client.RemovePlugin(manifest1.Id)
+					require.NoError(t, err)
+				})
+
+				pRequest = &model.InstallMarketplacePluginRequest{Id: "testplugin2"}
+				manifest2, _, err := client.InstallMarketplacePlugin(pRequest)
+				require.NoError(t, err)
+				require.NotNil(t, manifest2)
+				require.Equal(t, "testplugin2", manifest2.Id)
+				require.Equal(t, "1.2.3", manifest2.Version)
+
+				t.Cleanup(func() {
+					_, err = client.RemovePlugin(manifest2.Id)
+					require.NoError(t, err)
+				})
+
+				pluginsResp, _, err = client.GetPlugins()
+				require.NoError(t, err)
+				require.Len(t, pluginsResp.Active, 0)
+				require.ElementsMatch(t, pluginsResp.Inactive, []*model.PluginInfo{
+					{
+						Manifest: *manifest1,
+					},
+					{
+						Manifest: *manifest2,
+					},
+				})
+			})
 
 			appErr = th.App.DeletePublicKey("pub_key")
 			require.Nil(t, appErr)

server/channels/app/app_test.go

@@ -119,7 +119,6 @@ func TestDoAdvancedPermissionsMigration(t *testing.T) {
 			model.PermissionGetPublicLink.Id,
 			model.PermissionCreatePost.Id,
 			model.PermissionUseChannelMentions.Id,
-			model.PermissionUseSlashCommands.Id,
 			model.PermissionManagePublicChannelProperties.Id,
 			model.PermissionDeletePublicChannel.Id,
 			model.PermissionManagePrivateChannelProperties.Id,

server/channels/app/import_functions_test.go

@@ -459,7 +459,7 @@ func TestImportImportRole(t *testing.T) {
 	// Try changing all the params and reimporting.
 	data.DisplayName = ptrStr("new display name")
 	data.Description = ptrStr("description")
-	data.Permissions = &[]string{"use_slash_commands"}
+	data.Permissions = &[]string{"manage_slash_commands"}
 
 	err = th.App.importRole(th.Context, &data, false, true)
 	require.Nil(t, err, "Should have succeeded. %v", err)

server/channels/app/permissions_test.go

@@ -114,7 +114,7 @@ func TestImportPermissions(t *testing.T) {
 		}
 		beforeCount = len(results)
 
-		json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
+		json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
 		r := strings.NewReader(json)
 
 		err := th.App.ImportPermissions(r)
@@ -183,7 +183,7 @@ func TestImportPermissions_idempotentScheme(t *testing.T) {
 	roleName1 := model.NewId()
 	roleName2 := model.NewId()
 
-	json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
+	json := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
 	jsonl := strings.Repeat(json+"\n", 4)
 	r := strings.NewReader(jsonl)
 
@@ -226,7 +226,7 @@ func TestImportPermissions_schemeDeletedOnRoleFailure(t *testing.T) {
 	roleName1 := model.NewId()
 	roleName2 := model.NewId()
 
-	jsonl := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","use_slash_commands","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
+	jsonl := fmt.Sprintf(`{"display_name":"%v","name":"%v","description":"%v","scope":"%v","default_team_admin_role":"","default_team_user_role":"","default_channel_admin_role":"%v","default_channel_user_role":"%v","roles":[{"id":"yzfx3g9xjjfw8cqo6bpn33xr7o","name":"%v","display_name":"Channel Admin Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589687,"update_at":1526475589687,"delete_at":0,"permissions":["manage_channel_roles"],"scheme_managed":true,"built_in":false},{"id":"a7s3cp4n33dfxbsrmyh9djao3a","name":"%v","display_name":"Channel User Role for Scheme my_scheme_1526475590","description":"","create_at":1526475589688,"update_at":1526475589688,"delete_at":0,"permissions":["read_channel","add_reaction","remove_reaction","manage_public_channel_members","upload_file","get_public_link","create_post","manage_private_channel_members","delete_post","edit_post"],"scheme_managed":true,"built_in":false}]}`, displayName, name, description, scope, roleName1, roleName2, roleName1, roleName2)
 	r := strings.NewReader(jsonl)
 
 	var results []*model.Scheme

server/channels/app/plugin_install.go

@@ -203,35 +203,38 @@ func (ch *Channels) InstallMarketplacePlugin(request *model.InstallMarketplacePl
 	if *ch.cfgSvc.Config().PluginSettings.EnableRemoteMarketplace {
 		var plugin *model.BaseMarketplacePlugin
 		plugin, appErr = ch.getRemoteMarketplacePlugin(request.Id, request.Version)
-		if appErr != nil {
-			return nil, appErr
+		// The plugin might only be prepackaged and not on the Marketplace.
+		if appErr != nil && appErr.Id != "app.plugin.marketplace_plugins.not_found.app_error" {
+			mlog.Warn("Failed to reach Marketplace to install plugin", mlog.String("plugin_id", request.Id), mlog.Err(appErr))
 		}
 
-		var prepackagedVersion semver.Version
-		if prepackagedPlugin != nil {
-			var err error
-			prepackagedVersion, err = semver.Parse(prepackagedPlugin.Manifest.Version)
-			if err != nil {
-				return nil, model.NewAppError("InstallMarketplacePlugin", "app.plugin.invalid_version.app_error", nil, "", http.StatusBadRequest).Wrap(err)
+		if plugin != nil {
+			var prepackagedVersion semver.Version
+			if prepackagedPlugin != nil {
+				var err error
+				prepackagedVersion, err = semver.Parse(prepackagedPlugin.Manifest.Version)
+				if err != nil {
+					return nil, model.NewAppError("InstallMarketplacePlugin", "app.plugin.invalid_version.app_error", nil, "", http.StatusBadRequest).Wrap(err)
+				}
 			}
-		}
 
-		marketplaceVersion, err := semver.Parse(plugin.Manifest.Version)
-		if err != nil {
-			return nil, model.NewAppError("InstallMarketplacePlugin", "app.prepackged-plugin.invalid_version.app_error", nil, "", http.StatusBadRequest).Wrap(err)
-		}
+			marketplaceVersion, err := semver.Parse(plugin.Manifest.Version)
+			if err != nil {
+				return nil, model.NewAppError("InstallMarketplacePlugin", "app.prepackged-plugin.invalid_version.app_error", nil, "", http.StatusBadRequest).Wrap(err)
+			}
 
-		if prepackagedVersion.LT(marketplaceVersion) { // Always true if no prepackaged plugin was found
-			downloadedPluginBytes, err := ch.srv.downloadFromURL(plugin.DownloadURL)
-			if err != nil {
-				return nil, model.NewAppError("InstallMarketplacePlugin", "app.plugin.install_marketplace_plugin.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
+			if prepackagedVersion.LT(marketplaceVersion) { // Always true if no prepackaged plugin was found
+				downloadedPluginBytes, err := ch.srv.downloadFromURL(plugin.DownloadURL)
+				if err != nil {
+					return nil, model.NewAppError("InstallMarketplacePlugin", "app.plugin.install_marketplace_plugin.app_error", nil, "", http.StatusInternalServerError).Wrap(err)
+				}
+				signature, err := plugin.DecodeSignature()
+				if err != nil {
+					return nil, model.NewAppError("InstallMarketplacePlugin", "app.plugin.signature_decode.app_error", nil, "", http.StatusNotImplemented).Wrap(err)
+				}
+				pluginFile = bytes.NewReader(downloadedPluginBytes)
+				signatureFile = signature
 			}
-			signature, err := plugin.DecodeSignature()
-			if err != nil {
-				return nil, model.NewAppError("InstallMarketplacePlugin", "app.plugin.signature_decode.app_error", nil, "", http.StatusNotImplemented).Wrap(err)
-			}
-			pluginFile = bytes.NewReader(downloadedPluginBytes)
-			signatureFile = signature
 		}
 	}
 

server/channels/app/worktemplates/generator/worktemplate.tmpl

@@ -93,6 +93,7 @@ var wt{{.MD5}} = &WorkTemplate{
 				Illustration: "{{.Playbook.Illustration}}",
 			},{{end}}{{if .Integration}}Integration: &Integration{
 				ID: "{{.Integration.ID}}",
+				Recommended: {{.Integration.Recommended}},
 			},{{end}}
 		},
 		{{end}}

server/channels/app/worktemplates/templates.yaml

@@ -45,8 +45,10 @@ content:
       illustration: "/static/worktemplates/playbooks/product_release.png"
   - integration:
       id: jira
+      recommended: true
   - integration:
       id: github
+      recommended: true
 ---
 id: 'product_teams/goals_and_okrs:v1'
 category: product_teams
@@ -86,7 +88,7 @@ content:
       channel: channel-1674845108569
   - integration:
       id: zoom
-
+      recommended: true
 ---
 id: 'product_teams/bug_bash:v1'
 category: product_teams
@@ -120,6 +122,7 @@ content:
       playbook: playbook-1674844017943
   - integration:
       id: jira
+      recommended: true
 ---
 id: 'product_teams/sprint_planning:v1'
 category: product_teams
@@ -153,6 +156,7 @@ content:
       channel: channel-1674850783500
   - integration:
       id: zoom
+      recommended: true
 ---
 id: 'product_teams/product_roadmap:v1'
 category: product_teams
@@ -282,6 +286,7 @@ content:
       channel: channel-1674845108569
   - integration:
       id: zoom
+      recommended: true
 ---
 id: 'companywide/create_project:v1'
 category: companywide
@@ -316,10 +321,13 @@ content:
       channel: channel-1674851940114
   - integration:
       id: jira
+      recommended: true
   - integration:
       id: github
+      recommended: true
   - integration:
       id: zoom
+      recommended: true
 ---
 ######################
 # Leadership
@@ -356,4 +364,4 @@ content:
       channel: channel-1674845108569
   - integration:
       id: zoom
-
+      recommended: true

server/channels/app/worktemplates/types.go

@@ -108,7 +108,8 @@ func (wt WorkTemplate) ToModelWorkTemplate(t i18n.TranslateFunc) *model.WorkTemp
 		if content.Integration != nil {
 			mwt.Content = append(mwt.Content, model.WorkTemplateContent{
 				Integration: &model.WorkTemplateIntegration{
-					ID: content.Integration.ID,
+					ID:          content.Integration.ID,
+					Recommended: content.Integration.Recommended,
 				},
 			})
 		}
@@ -320,7 +321,8 @@ func (p *Playbook) Validate() error {
 }
 
 type Integration struct {
-	ID string `yaml:"id"`
+	ID          string `yaml:"id"`
+	Recommended bool   `yaml:"recommended"`
 }
 
 func (i *Integration) Validate() error {

server/channels/app/worktemplates/worktemplate_generated.go

@@ -148,12 +148,14 @@ var wt00a1b44a5831c0a3acb14787b3fdd352 = &WorkTemplate{
 		},
 		{
 			Integration: &Integration{
-				ID: "jira",
+				ID:          "jira",
+				Recommended: true,
 			},
 		},
 		{
 			Integration: &Integration{
-				ID: "github",
+				ID:          "github",
+				Recommended: true,
 			},
 		},
 	},
@@ -214,7 +216,8 @@ var wt5baa68055bf9ea423273662e01ccc575 = &WorkTemplate{
 		},
 		{
 			Integration: &Integration{
-				ID: "zoom",
+				ID:          "zoom",
+				Recommended: true,
 			},
 		},
 	},
@@ -265,7 +268,8 @@ var wtfeb56bc6a8f277c47b503bd1c92d830e = &WorkTemplate{
 		},
 		{
 			Integration: &Integration{
-				ID: "jira",
+				ID:          "jira",
+				Recommended: true,
 			},
 		},
 	},
@@ -317,7 +321,8 @@ var wt8d2ef53deac5517eb349dc5de6150196 = &WorkTemplate{
 		},
 		{
 			Integration: &Integration{
-				ID: "zoom",
+				ID:          "zoom",
+				Recommended: true,
 			},
 		},
 	},
@@ -518,7 +523,8 @@ var wtf7b846d35810f8272eeb9a1a562025b5 = &WorkTemplate{
 		},
 		{
 			Integration: &Integration{
-				ID: "zoom",
+				ID:          "zoom",
+				Recommended: true,
 			},
 		},
 	},
@@ -570,17 +576,20 @@ var wtb9ab412890c2410c7b49eec8f12e7edc = &WorkTemplate{
 		},
 		{
 			Integration: &Integration{
-				ID: "jira",
+				ID:          "jira",
+				Recommended: true,
 			},
 		},
 		{
 			Integration: &Integration{
-				ID: "github",
+				ID:          "github",
+				Recommended: true,
 			},
 		},
 		{
 			Integration: &Integration{
-				ID: "zoom",
+				ID:          "zoom",
+				Recommended: true,
 			},
 		},
 	},
@@ -632,7 +641,8 @@ var wt32ab773bfe021e3d4913931041552559 = &WorkTemplate{
 		},
 		{
 			Integration: &Integration{
-				ID: "zoom",
+				ID:          "zoom",
+				Recommended: true,
 			},
 		},
 	},

server/channels/store/sqlstore/channel_store.go

@@ -3035,7 +3035,8 @@ func (s SqlChannelStore) Autocomplete(userID, term string, includeDeleted, isGue
 			sq.Expr("t.id = tm.TeamId"),
 			sq.Eq{"tm.UserId": userID},
 		}).
-		OrderBy("c.DisplayName")
+		OrderBy("c.DisplayName").
+		Limit(model.ChannelSearchDefaultLimit)
 
 	if !includeDeleted {
 		query = query.Where(sq.And{
@@ -3073,7 +3074,7 @@ func (s SqlChannelStore) Autocomplete(userID, term string, includeDeleted, isGue
 	channels := model.ChannelListWithTeamData{}
 	err = s.GetReplicaX().Select(&channels, sql, args...)
 	if err != nil {
-		return nil, errors.Wrapf(err, "could not find channel with term=%s", term)
+		return nil, errors.Wrapf(err, "could not find channel with term=%s", trimInput(term))
 	}
 	return channels, nil
 }
@@ -3186,7 +3187,7 @@ func (s SqlChannelStore) AutocompleteInTeamForSearch(teamID string, userID strin
 	// query the database
 	err = s.GetReplicaX().Select(&channels, sql, args...)
 	if err != nil {
-		return nil, errors.Wrapf(err, "failed to find Channels with term='%s'", term)
+		return nil, errors.Wrapf(err, "failed to find Channels with term='%s'", trimInput(term))
 	}
 
 	directChannels, err := s.autocompleteInTeamForSearchDirectMessages(userID, term)
@@ -3242,7 +3243,7 @@ func (s SqlChannelStore) autocompleteInTeamForSearchDirectMessages(userID string
 	// query the channel list from the database using SQLX
 	channels := model.ChannelList{}
 	if err := s.GetReplicaX().Select(&channels, sql, args...); err != nil {
-		return nil, errors.Wrapf(err, "failed to find Channels with term='%s' (%s %% %v)", term, sql, args)
+		return nil, errors.Wrapf(err, "failed to find Channels with term='%s'", trimInput(term))
 	}
 
 	return channels, nil
@@ -3461,7 +3462,7 @@ func (s SqlChannelStore) SearchAllChannels(term string, opts store.ChannelSearch
 	}
 	channels := model.ChannelListWithTeamData{}
 	if err2 := s.GetReplicaX().Select(&channels, queryString, args...); err2 != nil {
-		return nil, 0, errors.Wrapf(err2, "failed to find Channels with term='%s'", term)
+		return nil, 0, errors.Wrapf(err2, "failed to find Channels with term='%s'", trimInput(term))
 	}
 
 	var totalCount int64
@@ -3474,7 +3475,7 @@ func (s SqlChannelStore) SearchAllChannels(term string, opts store.ChannelSearch
 			return nil, 0, errors.Wrap(err, "channel_tosql")
 		}
 		if err2 := s.GetReplicaX().Get(&totalCount, queryString, args...); err2 != nil {
-			return nil, 0, errors.Wrapf(err2, "failed to find Channels with term='%s'", term)
+			return nil, 0, errors.Wrapf(err2, "failed to find Channels with term='%s'", trimInput(term))
 		}
 	} else {
 		totalCount = int64(len(channels))
@@ -3651,7 +3652,7 @@ func (s SqlChannelStore) performSearch(searchQuery sq.SelectBuilder, term string
 	channels := model.ChannelList{}
 	err = s.GetReplicaX().Select(&channels, sql, args...)
 	if err != nil {
-		return channels, errors.Wrapf(err, "failed to find Channels with term='%s'", term)
+		return channels, errors.Wrapf(err, "failed to find Channels with term='%s'", trimInput(term))
 	}
 
 	return channels, nil
@@ -3744,7 +3745,7 @@ func (s SqlChannelStore) SearchGroupChannels(userId, term string) (model.Channel
 
 	groupChannels := model.ChannelList{}
 	if err := s.GetReplicaX().Select(&groupChannels, sql, params...); err != nil {
-		return nil, errors.Wrapf(err, "failed to find Channels with term='%s' and userId=%s", term, userId)
+		return nil, errors.Wrapf(err, "failed to find Channels with term='%s' and userId=%s", trimInput(term), userId)
 	}
 	return groupChannels, nil
 }

server/channels/store/sqlstore/file_info_store.go

@@ -681,7 +681,7 @@ func (fs SqlFileInfoStore) Search(paramsList []*model.SearchParams, userId, team
 	items := []fileInfoWithChannelID{}
 	err = fs.GetSearchReplicaX().Select(&items, queryString, args...)
 	if err != nil {
-		mlog.Warn("Query error searching files.", mlog.Err(err))
+		mlog.Warn("Query error searching files.", mlog.String("error", trimInput(err.Error())))
 		// Don't return the error to the caller as it is of no use to the user. Instead return an empty set of search results.
 	} else {
 		for _, item := range items {

server/channels/store/sqlstore/post_store.go

@@ -2075,7 +2075,7 @@ func (s *SqlPostStore) search(teamId string, userId string, params *model.Search
 	var posts []*model.Post
 
 	if err := s.GetSearchReplicaX().Select(&posts, searchQuery, searchQueryArgs...); err != nil {
-		mlog.Warn("Query error searching posts.", mlog.Err(err))
+		mlog.Warn("Query error searching posts.", mlog.String("error", trimInput(err.Error())))
 		// Don't return the error to the caller as it is of no use to the user. Instead return an empty set of search results.
 	} else {
 		for _, p := range posts {

server/channels/store/sqlstore/utils.go

@@ -233,3 +233,14 @@ func SanitizeDataSource(driverName, dataSource string) (string, error) {
 		return "", errors.New("invalid drivername. Not postgres or mysql.")
 	}
 }
+
+const maxTokenSize = 50
+
+// trimInput limits the string to a max size to prevent clogging up disk space
+// while logging
+func trimInput(input string) string {
+	if len(input) > maxTokenSize {
+		input = input[:maxTokenSize] + "..."
+	}
+	return input
+}

server/channels/store/storetest/channel_store.go

@@ -115,7 +115,7 @@ func TestChannelStore(t *testing.T, ss store.Store, s SqlStore) {
 	t.Run("GetGuestCount", func(t *testing.T) { testGetGuestCount(t, ss) })
 	t.Run("SearchMore", func(t *testing.T) { testChannelStoreSearchMore(t, ss) })
 	t.Run("SearchInTeam", func(t *testing.T) { testChannelStoreSearchInTeam(t, ss) })
-	t.Run("Autocomplete", func(t *testing.T) { testAutocomplete(t, ss) })
+	t.Run("Autocomplete", func(t *testing.T) { testAutocomplete(t, ss, s) })
 	t.Run("SearchArchivedInTeam", func(t *testing.T) { testChannelStoreSearchArchivedInTeam(t, ss, s) })
 	t.Run("SearchForUserInTeam", func(t *testing.T) { testChannelStoreSearchForUserInTeam(t, ss) })
 	t.Run("SearchAllChannels", func(t *testing.T) { testChannelStoreSearchAllChannels(t, ss) })
@@ -5986,7 +5986,7 @@ func testChannelStoreSearchInTeam(t *testing.T, ss store.Store) {
 	}
 }
 
-func testAutocomplete(t *testing.T, ss store.Store) {
+func testAutocomplete(t *testing.T, ss store.Store, s SqlStore) {
 	t1 := &model.Team{
 		DisplayName: "t1",
 		Name:        NewTestId(),
@@ -6165,9 +6165,9 @@ func testAutocomplete(t *testing.T, ss store.Store) {
 	}
 
 	for _, testCase := range testCases {
-		t.Run("Autocomplete/"+testCase.Description, func(t *testing.T) {
-			channels, err := ss.Channel().Autocomplete(testCase.UserID, testCase.Term, testCase.IncludeDeleted, testCase.IsGuest)
-			require.NoError(t, err)
+		t.Run(testCase.Description, func(t *testing.T) {
+			channels, err2 := ss.Channel().Autocomplete(testCase.UserID, testCase.Term, testCase.IncludeDeleted, testCase.IsGuest)
+			require.NoError(t, err2)
 			var gotChannelIds []string
 			var gotTeamNames []string
 			for _, ch := range channels {
@@ -6178,6 +6178,24 @@ func testAutocomplete(t *testing.T, ss store.Store) {
 			require.ElementsMatch(t, testCase.ExpectedTeamNames, gotTeamNames, "team names are not as expected")
 		})
 	}
+
+	t.Run("Limit", func(t *testing.T) {
+		for i := 0; i < model.ChannelSearchDefaultLimit+10; i++ {
+			_, err = ss.Channel().Save(&model.Channel{
+				TeamId:      teamID,
+				DisplayName: "Channel " + strconv.Itoa(i),
+				Name:        NewTestId(),
+				Type:        model.ChannelTypeOpen,
+			}, -1)
+			require.NoError(t, err)
+		}
+		channels, err := ss.Channel().Autocomplete(m1.UserId, "Chann", false, false)
+		require.NoError(t, err)
+		assert.Len(t, channels, model.ChannelSearchDefaultLimit)
+	})
+
+	// Manually truncate Channels table until testlib can handle cleanups
+	s.GetMasterX().Exec("TRUNCATE Channels")
 }
 
 func testChannelStoreSearchForUserInTeam(t *testing.T, ss store.Store) {