unit tests: fix linter error (gci)

Signed-off-by: matewolf <[email protected]>

cmd/root.go

@@ -19,9 +19,10 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"github.com/uwu-tools/gh-jira-issue-sync/internal/utils/issue"
 	"time"
 
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/utils/issue"
+
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/release-utils/log"
@@ -31,6 +32,7 @@ import (
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/jira"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/options"
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/utils/issue"
 )
 
 var opts = &options.Options{}

internal/clock/clockmock.go

@@ -4,8 +4,7 @@ import (
 	"time"
 )
 
-type clockMock struct {
-}
+type clockMock struct{}
 
 func NewClockMock() Clock {
 	return &clockMock{}

internal/clock/realclock.go

@@ -2,8 +2,7 @@ package clock
 
 import "time"
 
-type realClock struct {
-}
+type realClock struct{}
 
 func NewRealClock() Clock {
 	return &realClock{}

internal/config/config.go

@@ -21,7 +21,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/uwu-tools/gh-jira-issue-sync/internal/filesystem"
 	"io"
 	"net/url"
 	"os"
@@ -30,6 +29,10 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/filesystem"
+
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/filesystem"
+
 	"github.com/dghubble/oauth1"
 	"github.com/fsnotify/fsnotify"
 	log "github.com/sirupsen/logrus"
@@ -38,6 +41,7 @@ import (
 	jira "github.com/uwu-tools/go-jira/v2/cloud"
 	"golang.org/x/term"
 
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/filesystem"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/options"
 )
@@ -466,7 +470,7 @@ func (c *config) getFieldIDs(client *jira.Client) (*fields, error) {
 }
 
 func (c *config) parseFieldIDs(jFieldsPtr *[]jira.Field) (*fields, error) {
-	var fieldIDs = new(fields)
+	fieldIDs := new(fields)
 
 	jFields := *jFieldsPtr
 	for i := range jFields {

internal/config/config_test.go

@@ -2,20 +2,24 @@ package config
 
 import (
 	"errors"
+	"strings"
+	"testing"
+
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 	"github.com/stretchr/testify/assert"
+	jira "github.com/uwu-tools/go-jira/v2/cloud"
+
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/filesystem"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/options"
-	jira "github.com/uwu-tools/go-jira/v2/cloud"
-	"strings"
-	"testing"
 )
 
 var errMock = errors.New("mock error")
 
-var rCmd *cobra.Command
-var config2 *config
+var (
+	rCmd    *cobra.Command
+	config2 *config
+)
 
 func setup(t *testing.T) {
 	t.Helper()
@@ -50,7 +54,6 @@ func setupParseField(t *testing.T) {
 }
 
 func TestGetConfigPath(t *testing.T) {
-
 	tests := []struct { //nolint:govet
 		name         string
 		cmdArgs      []string

internal/config/interface.go

@@ -2,9 +2,10 @@ package config
 
 import (
 	"context"
+	"time"
+
 	"github.com/dghubble/oauth1"
 	jira "github.com/uwu-tools/go-jira/v2/cloud"
-	"time"
 )
 
 type IConfig interface {

internal/config/mock.go

@@ -2,10 +2,11 @@ package config
 
 import (
 	"context"
+	"time"
+
 	"github.com/dghubble/oauth1"
 	"github.com/stretchr/testify/mock"
 	jira "github.com/uwu-tools/go-jira/v2/cloud"
-	"time"
 )
 
 type ConfigMock struct {

internal/filesystem/fakefileinfo.go

@@ -5,8 +5,7 @@ import (
 	"time"
 )
 
-type FakeFileInfo struct {
-}
+type FakeFileInfo struct{}
 
 func (f *FakeFileInfo) Name() string {
 	return "filename.ext"

internal/filesystem/mockfs.go

@@ -1,8 +1,11 @@
 package filesystem
 
 import (
-	"github.com/stretchr/testify/mock"
 	"os"
+
+	"os"
+
+	"github.com/stretchr/testify/mock"
 )
 
 type MockFs struct {

internal/filesystem/osfs.go

@@ -5,8 +5,7 @@ import (
 	"os"
 )
 
-type OsFs struct {
-}
+type OsFs struct{}
 
 func (fs *OsFs) Stat(name string) (os.FileInfo, error) {
 	fileInfo, err := os.Stat(name)

internal/github/interface.go

@@ -1,8 +1,11 @@
 package github
 
 import (
-	gogh "github.com/google/go-github/v53/github"
 	"time"
+
+	"time"
+
+	gogh "github.com/google/go-github/v53/github"
 )
 
 // Client is a wrapper around the GitHub API Client library we

internal/github/mock.go

@@ -1,9 +1,10 @@
 package github
 
 import (
+	"time"
+
 	gogh "github.com/google/go-github/v53/github"
 	"github.com/stretchr/testify/mock"
-	"time"
 )
 
 type GhClientMock struct {

internal/jira/interface.go

@@ -2,8 +2,9 @@ package jira
 
 import (
 	gogh "github.com/google/go-github/v53/github"
-	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	jira "github.com/uwu-tools/go-jira/v2/cloud"
+
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 )
 
 // Client is a wrapper around the Jira API clients library we

internal/jira/mock.go

@@ -3,8 +3,9 @@ package jira
 import (
 	gogh "github.com/google/go-github/v53/github"
 	"github.com/stretchr/testify/mock"
-	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	jira "github.com/uwu-tools/go-jira/v2/cloud"
+
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 )
 
 type JiraClientMock struct {

internal/utils/comment/comment_test.go

@@ -18,26 +18,30 @@ package comment
 
 import (
 	"errors"
+	"testing"
+	"time"
+
 	gogh "github.com/google/go-github/v53/github"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
+	gojira "github.com/uwu-tools/go-jira/v2/cloud"
+
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/config"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/jira"
 	"github.com/uwu-tools/gh-jira-issue-sync/pkg"
-	gojira "github.com/uwu-tools/go-jira/v2/cloud"
-	"testing"
-	"time"
 )
 
 //nolint:lll
 const testComment = `Comment [(ID 484163403)|https://github.com] from GitHub user [bilbo-baggins|https://github.com/bilbo-baggins] (Bilbo Baggins) at 16:27 PM, April 17 2019:
 
 Bla blibidy bloo bla`
 
-var jiraClient *jira.JiraClientMock
-var cfg *config.ConfigMock
-var ghClient *github.GhClientMock
+var (
+	jiraClient *jira.JiraClientMock
+	cfg        *config.ConfigMock
+	ghClient   *github.GhClientMock
+)
 
 var ghComment1 = gogh.IssueComment{
 	ID:        pkg.NewInt64(1),
@@ -152,7 +156,8 @@ func TestCompare(t *testing.T) {
 						&ghComment2,
 						&jiraComment2,
 					},
-				}},
+				},
+			},
 		},
 	}
 

internal/utils/comment/mock.go

@@ -3,10 +3,11 @@ package comment
 import (
 	gogh "github.com/google/go-github/v53/github"
 	"github.com/stretchr/testify/mock"
+	gojira "github.com/uwu-tools/go-jira/v2/cloud"
+
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/config"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/jira"
-	gojira "github.com/uwu-tools/go-jira/v2/cloud"
 )
 
 type CommentFnMock struct {

internal/utils/issue/issue.go

@@ -18,17 +18,18 @@ package issue
 
 import (
 	"fmt"
+	"strings"
+
 	gogh "github.com/google/go-github/v53/github"
 	log "github.com/sirupsen/logrus"
 	"github.com/trivago/tgo/tcontainer"
-	"github.com/uwu-tools/gh-jira-issue-sync/internal/clock"
-	"github.com/uwu-tools/gh-jira-issue-sync/internal/utils/comment"
 	gojira "github.com/uwu-tools/go-jira/v2/cloud"
-	"strings"
 
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/clock"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/config"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/jira"
+	"github.com/uwu-tools/gh-jira-issue-sync/internal/utils/comment"
 )
 
 // dateFormat is the format used for the sync time field.

internal/utils/issue/issue_test.go

@@ -2,36 +2,42 @@ package issue
 
 import (
 	"errors"
+	"os"
+	"testing"
+
 	gogh "github.com/google/go-github/v53/github"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/trivago/tgo/tcontainer"
+	gojira "github.com/uwu-tools/go-jira/v2/cloud"
+
 	clockMock "github.com/uwu-tools/gh-jira-issue-sync/internal/clock"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/config"
 	ghmock "github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	jmock "github.com/uwu-tools/gh-jira-issue-sync/internal/jira"
 	commentMock "github.com/uwu-tools/gh-jira-issue-sync/internal/utils/comment"
 	"github.com/uwu-tools/gh-jira-issue-sync/pkg"
-	gojira "github.com/uwu-tools/go-jira/v2/cloud"
-	"os"
-	"testing"
 )
 
-const testGitHubIdFieldName = "customfield_1000"
-const testGitHubNumberFieldName = "customfield_2000"
-const testGitHubStatusFieldName = "customfield_3000"
-const testGitHubReporterFieldName = "customfield_4000"
-const testGitHubLabelsFieldName = "customfield_5000"
-const testGitHubLastSyncFieldName = "customfield_6000"
+const (
+	testGitHubIdFieldName       = "customfield_1000"
+	testGitHubNumberFieldName   = "customfield_2000"
+	testGitHubStatusFieldName   = "customfield_3000"
+	testGitHubReporterFieldName = "customfield_4000"
+	testGitHubLabelsFieldName   = "customfield_5000"
+	testGitHubLastSyncFieldName = "customfield_6000"
+)
 
 var errMock = errors.New("mock error")
 
 var project gojira.Project
 
-var jClient *jmock.JiraClientMock
-var ghClient *ghmock.GhClientMock
-var cfg *config.ConfigMock
-var commentFnMock *commentMock.CommentFnMock
+var (
+	jClient       *jmock.JiraClientMock
+	ghClient      *ghmock.GhClientMock
+	cfg           *config.ConfigMock
+	commentFnMock *commentMock.CommentFnMock
+)
 
 var ghIssue1 = gogh.Issue{
 	ID:     pkg.NewInt64(1),

internal/utils/issue/mock.go

@@ -3,10 +3,11 @@ package issue
 import (
 	gogh "github.com/google/go-github/v53/github"
 	"github.com/stretchr/testify/mock"
+	gojira "github.com/uwu-tools/go-jira/v2/cloud"
+
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/config"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/github"
 	"github.com/uwu-tools/gh-jira-issue-sync/internal/jira"
-	gojira "github.com/uwu-tools/go-jira/v2/cloud"
 )
 
 type IssueFnMock struct {