From 9f1796f98b20a12a7f62dbd0aba7515bace49c6b Mon Sep 17 00:00:00 2001 From: Agniva De Sarker Date: Fri, 5 May 2023 19:44:02 +0530 Subject: [PATCH] Remove unnecessary blank imports (round 2) (#23310) I mistakenly assumed that those packages are naturally imported. And also atleast one test would have broken. None of them are true. :) So we just import it again at a better place This reverts commit 30a053314b9611cc5dbe2d47a5d31bc7828165fc. ```release-note NONE ``` --- server/channels/imports/boards_imports.go | 9 --------- server/channels/imports/playbooks_imports.go | 9 --------- server/cmd/mattermost/main.go | 4 ++++ 3 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 server/channels/imports/boards_imports.go delete mode 100644 server/channels/imports/playbooks_imports.go diff --git a/server/channels/imports/boards_imports.go b/server/channels/imports/boards_imports.go deleted file mode 100644 index ca7aa36124..0000000000 --- a/server/channels/imports/boards_imports.go +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -package imports - -import ( - // Needed to ensure the init() method in the FocalBoard product is run. - _ "github.com/mattermost/mattermost-server/server/v8/boards/product" -) diff --git a/server/channels/imports/playbooks_imports.go b/server/channels/imports/playbooks_imports.go deleted file mode 100644 index 260e41af12..0000000000 --- a/server/channels/imports/playbooks_imports.go +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -package imports - -import ( - // Needed to ensure the init() method in the Playbooks product is run. - _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" -) diff --git a/server/cmd/mattermost/main.go b/server/cmd/mattermost/main.go index c47df425ac..a0b31a2dc2 100644 --- a/server/cmd/mattermost/main.go +++ b/server/cmd/mattermost/main.go @@ -14,6 +14,10 @@ import ( // Enterprise Imports _ "github.com/mattermost/mattermost-server/server/v8/channels/imports" + + // Blank imports for each product to register themselves + _ "github.com/mattermost/mattermost-server/server/v8/boards/product" + _ "github.com/mattermost/mattermost-server/server/v8/playbooks/product" ) func main() {