Merge branch 'master' into poc

mattermost · Oct 27, 2020 · cbdf852 · cbdf852
2 parents c65a669 + 60b3a44
commit cbdf852
Show file tree

Hide file tree

Showing 442 changed files with 21,399 additions and 12,389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,7 @@ build
 
 # Editor files
 .vscode
+.idea
 
 coverage.txt
 mmctl.md5.txt

diff --git a/client/client.go b/client/client.go
@@ -112,5 +112,5 @@ type Client interface {
 	MigrateAuthToLdap(fromAuthService string, matchField string, force bool) (bool, *model.Response)
 	MigrateAuthToSaml(fromAuthService string, usersMap map[string]string, auto bool) (bool, *model.Response)
 	GetPing() (string, *model.Response)
-	GetPingWithServerStatus() (string, *model.Response)
+	GetPingWithFullServerStatus() (map[string]string, *model.Response)
 }
diff --git a/commands/bot.go b/commands/bot.go
@@ -158,7 +158,7 @@ func botListCmdF(c client.Client, cmd *cobra.Command, args []string) error {
 	for {
 		var bots []*model.Bot
 		var res *model.Response
-		if all { //nolint:ifElseChain
+		if all { //nolint:gocritic
 			bots, res = c.GetBotsIncludeDeleted(page, perPage, "")
 		} else if orphaned {
 			bots, res = c.GetBotsOrphaned(page, perPage, "")