Fix some linter issues

conf/configuration.go

@@ -1,13 +1,14 @@
 package conf
 
 import (
-	"github.com/opsgenie/oec/git"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/opsgenie/oec/git"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -101,9 +102,9 @@ func ReadConfFile() (*Configuration, error) {
 	if err != nil {
 		return nil, err
 	}
-	
+
 	if os.Getenv("OEC_API_KEY") != "" {
-	conf.ApiKey = os.Getenv("OEC_API_KEY")
+		conf.ApiKey = os.Getenv("OEC_API_KEY")
 	}
 
 	err = validateConfiguration(conf)
@@ -194,7 +195,7 @@ func readConfFileFromSource(confSourceType string) (*Configuration, error) {
 	case LocalSourceType:
 		confFilepath := os.Getenv("OEC_CONF_LOCAL_FILEPATH")
 
-		if len(confFilepath) <= 0 {
+		if len(confFilepath) == 0 {
 			confFilepath = addHomeDirPrefix(defaultConfFilepath)
 		} else {
 			confFilepath = addHomeDirPrefix(confFilepath)

conf/configuration_test.go

@@ -1,12 +1,13 @@
 package conf
 
 import (
+	"os"
+	"testing"
+
 	"github.com/opsgenie/oec/git"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
-	"os"
-	"testing"
 )
 
 var readConfigurationFromGitCalled = false
@@ -46,7 +47,7 @@ func expectedConf() *Configuration {
 		"-apiKey", expectedConf.ApiKey,
 		"-opsgenieUrl", expectedConf.BaseUrl,
 		"-logLevel", "INFO"},
-		expectedConf.GlobalArgs...
+		expectedConf.GlobalArgs...,
 	)
 
 	if expectedConf.LogrusLevel == 0 {
@@ -107,19 +108,19 @@ const testLocalConfFilePath = "/path/to/test/conf/file.json"
 func mockReadConfigurationFromGit(owner, repo, filepath, token string) (*Configuration, error) {
 	readConfigurationFromGitCalled = true
 
-	if len(owner) <= 0 {
+	if len(owner) == 0 {
 		return nil, errors.New("Owner was empty.")
 	}
 
-	if len(repo) <= 0 {
+	if len(repo) == 0 {
 		return nil, errors.New("Repo was empty.")
 	}
 
-	if len(filepath) <= 0 {
+	if len(filepath) == 0 {
 		return nil, errors.New("Filepath was empty.")
 	}
 
-	if len(token) <= 0 {
+	if len(token) == 0 {
 		return nil, errors.New("Token was empty.")
 	}
 

conf/from_git.go

@@ -1,9 +1,10 @@
 package conf
 
 import (
-	"github.com/opsgenie/oec/git"
 	"os"
 	"path/filepath"
+
+	"github.com/opsgenie/oec/git"
 )
 
 var cloneMasterFunc = git.CloneMaster

conf/from_git_test.go

@@ -1,10 +1,11 @@
 package conf
 
 import (
+	"testing"
+
 	"github.com/opsgenie/oec/git"
 	"github.com/opsgenie/oec/util"
 	"github.com/stretchr/testify/assert"
-	"testing"
 )
 
 func TestReadConfigurationFromGit(t *testing.T) {

conf/from_local_test.go

@@ -1,10 +1,11 @@
 package conf
 
 import (
-	"github.com/opsgenie/oec/util"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	"github.com/opsgenie/oec/util"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestReadConfigurationFromLocal(t *testing.T) {

conf/util.go

@@ -2,16 +2,17 @@ package conf
 
 import (
 	"encoding/json"
-	"github.com/opsgenie/oec/git"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
 	"io/ioutil"
 	"os"
 	fpath "path/filepath"
 	"runtime"
 	"strings"
 	"time"
+
+	"github.com/opsgenie/oec/git"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v2"
 )
 
 const unknownFileExtErrMessage = "Unknown configuration file extension[%s]. Only \".json\" and \".yml(.yaml)\" types are allowed."

conf/util_test.go

@@ -2,10 +2,11 @@ package conf
 
 import (
 	"fmt"
-	"github.com/opsgenie/oec/util"
-	"github.com/stretchr/testify/assert"
 	"os"
 	"testing"
+
+	"github.com/opsgenie/oec/util"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestReadConfigurationFromJsonFile(t *testing.T) {

git/clone.go

@@ -1,11 +1,12 @@
 package git
 
 import (
+	"io/ioutil"
+	"os"
+
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
-	"io/ioutil"
-	"os"
 )
 
 var gitCloneMasterFunc = gitCloneMaster

git/repository.go

@@ -1,12 +1,13 @@
 package git
 
 import (
+	"os"
+	"sync"
+
 	"github.com/opsgenie/oec/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/src-d/go-git.v4"
-	"os"
-	"sync"
 )
 
 type GitOptions struct {

main/main.go

@@ -3,12 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"github.com/opsgenie/oec/conf"
-	"github.com/opsgenie/oec/queue"
-	"github.com/opsgenie/oec/util"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"github.com/sirupsen/logrus"
-	"gopkg.in/natefinch/lumberjack.v2"
 	"io"
 	"net/http"
 	"os"
@@ -18,6 +12,13 @@ import (
 	"strconv"
 	"syscall"
 	"time"
+
+	"github.com/opsgenie/oec/conf"
+	"github.com/opsgenie/oec/queue"
+	"github.com/opsgenie/oec/util"
+	"github.com/prometheus/client_golang/prometheus/promhttp"
+	"github.com/sirupsen/logrus"
+	"gopkg.in/natefinch/lumberjack.v2"
 )
 
 var metricAddr = flag.String("oec-metrics", "7070", "The address to listen on for HTTP requests.")
@@ -79,14 +80,11 @@ func main() {
 	signals := make(chan os.Signal, 1)
 	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
 
-	select {
-	case <-signals:
-		logrus.Infof("OEC will be stopped gracefully.")
-		err := queueProcessor.StopProcessing()
-		if err != nil {
-			logrus.Fatalln(err)
-		}
+	<-signals
+	logrus.Infof("OEC will be stopped gracefully.")
+	err = queueProcessor.StopProcessing()
+	if err != nil {
+		logrus.Fatalln(err)
 	}
-
 	os.Exit(0)
 }

queue/job.go

@@ -1,12 +1,13 @@
 package queue
 
 import (
+	"sync"
+	"time"
+
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"github.com/opsgenie/oec/runbook"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"sync"
-	"time"
 )
 
 const (

queue/job_test.go

@@ -2,15 +2,16 @@ package queue
 
 import (
 	"encoding/json"
-	"github.com/aws/aws-sdk-go/service/sqs"
-	"github.com/opsgenie/oec/runbook"
-	"github.com/pkg/errors"
-	"github.com/stretchr/testify/assert"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
 	"sync"
 	"testing"
+
+	"github.com/aws/aws-sdk-go/service/sqs"
+	"github.com/opsgenie/oec/runbook"
+	"github.com/pkg/errors"
+	"github.com/stretchr/testify/assert"
 )
 
 var mockActionResultPayload = &runbook.ActionResultPayload{Action: "MockAction"}

queue/poller.go

@@ -1,19 +1,20 @@
 package queue
 
 import (
+	"io"
+	"os"
+	"path/filepath"
+	"strconv"
+	"sync"
+	"time"
+
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"github.com/opsgenie/oec/conf"
 	"github.com/opsgenie/oec/git"
 	"github.com/opsgenie/oec/util"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"gopkg.in/natefinch/lumberjack.v2"
-	"io"
-	"os"
-	"path/filepath"
-	"strconv"
-	"sync"
-	"time"
 )
 
 type Poller interface {

queue/poller_test.go

@@ -1,15 +1,16 @@
 package queue
 
 import (
+	"io"
+	"sync"
+	"testing"
+
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"github.com/opsgenie/oec/conf"
 	"github.com/opsgenie/oec/git"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
-	"io"
-	"sync"
-	"testing"
 )
 
 var mockPollerConf = &conf.PollerConf{

queue/queue_message.go

@@ -3,14 +3,15 @@ package queue
 import (
 	"encoding/json"
 	"fmt"
+	"io"
+	"time"
+
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"github.com/opsgenie/oec/conf"
 	"github.com/opsgenie/oec/git"
 	"github.com/opsgenie/oec/runbook"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"io"
-	"time"
 )
 
 type QueueMessage interface {

queue/queue_message_test.go

@@ -2,16 +2,17 @@ package queue
 
 import (
 	"bytes"
+	"io"
+	"math/rand"
+	"testing"
+	"time"
+
 	"github.com/aws/aws-sdk-go/service/sqs"
 	"github.com/opsgenie/oec/conf"
 	"github.com/opsgenie/oec/git"
 	"github.com/opsgenie/oec/runbook"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
-	"io"
-	"math/rand"
-	"testing"
-	"time"
 )
 
 var (

queue/queue_processor.go

@@ -3,18 +3,19 @@ package queue
 import (
 	"bytes"
 	"encoding/json"
-	"github.com/opsgenie/oec/conf"
-	"github.com/opsgenie/oec/git"
-	"github.com/opsgenie/oec/retryer"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"gopkg.in/natefinch/lumberjack.v2"
 	"io"
 	"io/ioutil"
 	"net/http"
 	"strconv"
 	"sync"
 	"time"
+
+	"github.com/opsgenie/oec/conf"
+	"github.com/opsgenie/oec/git"
+	"github.com/opsgenie/oec/retryer"
+	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
+	"gopkg.in/natefinch/lumberjack.v2"
 )
 
 var UserAgentHeader string