From ff0811e4a4f5189293b54a1d195eaec30b3e530f Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Wed, 9 Aug 2017 15:35:49 -0500
Subject: lint all the things (#7154)

* lint all the things

* remove extra echo
---
 Makefile              | 53 ++++++++++++++++-----------------------------------
 app/admin.go          |  2 +-
 app/elasticsearch.go  |  2 +-
 app/job.go            |  2 +-
 jobs/jobs_watcher.go  |  4 ++--
 jobs/testscheduler.go |  2 +-
 6 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/Makefile b/Makefile
index 2af45e5f6..97faa0e74 100644
--- a/Makefile
+++ b/Makefile
@@ -209,14 +209,20 @@ check-client-style:
 
 check-server-style: govet
 	@echo Running GOFMT
-	$(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ einterfaces/ cmd/platform/ 2>&1))
-	@echo "$(GOFMT_OUTPUT)"
-	@if [ ! "$(GOFMT_OUTPUT)" ]; then \
-		echo "gofmt success"; \
-	else \
-		echo "gofmt failure"; \
-		exit 1; \
-	fi
+
+	@for package in $(TE_PACKAGES) $(EE_PACKAGES); do \
+		echo "Checking "$$package; \
+		files=$$(go list -f '{{range .GoFiles}}{{$$.Dir}}/{{.}} {{end}}' $$package); \
+		if [ "$$files" ]; then \
+			gofmt_output=$$(gofmt -d -s $$files 2>&1); \
+			if [ "$$gofmt_output" ]; then \
+				echo "$$gofmt_output"; \
+				echo "gofmt failure"; \
+				exit 1; \
+			fi; \
+		fi; \
+	done
+	@echo "gofmt success"; \
 
 check-style: check-client-style check-server-style
 
@@ -535,37 +541,10 @@ setup-mac:
 
 govet:
 	@echo Running GOVET
-
-	$(GO) vet $(GOFLAGS) ./api || exit 1
-	$(GO) vet $(GOFLAGS) ./api4 || exit 1
-	$(GO) vet $(GOFLAGS) ./app || exit 1
-	$(GO) vet $(GOFLAGS) ./app/plugin || exit 1
-	$(GO) vet $(GOFLAGS) ./app/plugin/jira || exit 1
-	$(GO) vet $(GOFLAGS) ./cmd/platform || exit 1
-	$(GO) vet $(GOFLAGS) ./einterfaces || exit 1
-	$(GO) vet $(GOFLAGS) ./jobs || exit 1
-	$(GO) vet $(GOFLAGS) ./manualtesting || exit 1
-	$(GO) vet $(GOFLAGS) ./model || exit 1
-	$(GO) vet $(GOFLAGS) ./model/gitlab || exit 1
-	$(GO) vet $(GOFLAGS) ./store || exit 1
-	$(GO) vet $(GOFLAGS) ./utils || exit 1
-	$(GO) vet $(GOFLAGS) ./web || exit 1
+	$(GO) vet $(GOFLAGS) $(TE_PACKAGES) || exit 1
 
 ifeq ($(BUILD_ENTERPRISE_READY),true)
-	$(GO) vet $(GOFLAGS) ./enterprise/account_migration || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/brand || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/cluster || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/compliance || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/data_retention || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/elasticsearch || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/emoji || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/imports || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/ldap || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/metrics || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/mfa || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/oauth/google || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/oauth/office365 || exit 1
-	$(GO) vet $(GOFLAGS) ./enterprise/saml || exit 1
+	$(GO) vet $(GOFLAGS) $(EE_PACKAGES) || exit 1
 endif
 
 todo:
diff --git a/app/admin.go b/app/admin.go
index 6fbe150c4..50ed769b6 100644
--- a/app/admin.go
+++ b/app/admin.go
@@ -13,10 +13,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/platform/jobs"
 	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/store"
 	"github.com/mattermost/platform/utils"
-	"github.com/mattermost/platform/jobs"
 )
 
 func GetLogs(page, perPage int) ([]string, *model.AppError) {
diff --git a/app/elasticsearch.go b/app/elasticsearch.go
index 740042ba5..6f3a4e38b 100644
--- a/app/elasticsearch.go
+++ b/app/elasticsearch.go
@@ -6,8 +6,8 @@ package app
 import (
 	"net/http"
 
-	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/einterfaces"
+	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/utils"
 )
 
diff --git a/app/job.go b/app/job.go
index 36c0b1992..005324999 100644
--- a/app/job.go
+++ b/app/job.go
@@ -4,8 +4,8 @@
 package app
 
 import (
-	"github.com/mattermost/platform/model"
 	"github.com/mattermost/platform/jobs"
+	"github.com/mattermost/platform/model"
 )
 
 func GetJob(id string) (*model.Job, *model.AppError) {
diff --git a/jobs/jobs_watcher.go b/jobs/jobs_watcher.go
index 5892e3b1c..9ba68e85e 100644
--- a/jobs/jobs_watcher.go
+++ b/jobs/jobs_watcher.go
@@ -38,7 +38,7 @@ func (watcher *Watcher) Start() {
 	rand.Seed(time.Now().UTC().UnixNano())
 	_ = <-time.After(time.Duration(rand.Intn(WATCHER_POLLING_INTERVAL)) * time.Millisecond)
 
-	defer func(){
+	defer func() {
 		l4g.Debug("Watcher Finished")
 		watcher.stopped <- true
 	}()
@@ -69,7 +69,7 @@ func (watcher *Watcher) PollAndNotify() {
 		for _, js := range jobStatuses {
 			j := model.Job{
 				Type: js.Type,
-				Id: js.Id,
+				Id:   js.Id,
 			}
 
 			if js.Type == model.JOB_TYPE_DATA_RETENTION {
diff --git a/jobs/testscheduler.go b/jobs/testscheduler.go
index 31b5d144c..d7345f67f 100644
--- a/jobs/testscheduler.go
+++ b/jobs/testscheduler.go
@@ -28,7 +28,7 @@ func MakeTestScheduler(name string, jobType string) *TestScheduler {
 func (scheduler *TestScheduler) Run() {
 	l4g.Debug("Scheduler %v: Started", scheduler.name)
 
-	defer func(){
+	defer func() {
 		l4g.Debug("Scheduler %v: Finished", scheduler.name)
 		scheduler.stopped <- true
 	}()
-- 
cgit v1.2.3-1-g7c22