Use goimports

Author: eikendev

Makefile

@@ -1,5 +1,6 @@
 OUT_DIR := ./out
 GO_FILES := $(shell find . -type f \( -iname '*.go' \))
+GO_MODULE := github.com/eikendev/hackenv
 
 SCRIPT_FILES := $(wildcard ./bin/*)
 
@@ -14,17 +15,18 @@ clean:
 
 .PHONY: test
 test: lint_scripts
-	stdout=$$(gofumpt -l . 2>&1); if [ "$$stdout" ]; then exit 1; fi
+	if [ -n "$$(gofumpt -l $(GO_FILES))" ]; then echo "Code is not properly formatted"; exit 1; fi
+	if [ -n "$$(goimports -l -local $(GO_MODULE) $(GO_FILES))" ]; then echo "Imports are not properly formatted"; exit 1; fi
 	go vet ./...
 	misspell -error $(GO_FILES)
 	gocyclo -over 10 $(GO_FILES)
 	staticcheck ./...
-	errcheck ./...
+	errcheck -ignoregenerated ./...
 	gocritic check -disable='#experimental,#opinionated' -@ifElseChain.minThreshold 3 ./...
 	revive -set_exit_status ./...
 	nilaway ./...
 	go test -v -cover ./...
-	gosec -exclude-dir=tests ./...
+	gosec -exclude-generated ./...
 	govulncheck ./...
 	@printf '\n%s\n' "> Test successful"
 
@@ -37,6 +39,7 @@ setup:
 	go install github.com/mgechev/revive@latest
 	go install github.com/securego/gosec/v2/cmd/gosec@latest
 	go install go.uber.org/nilaway/cmd/nilaway@latest
+	go install golang.org/x/tools/cmd/goimports@latest
 	go install golang.org/x/vuln/cmd/govulncheck@latest
 	go install honnef.co/go/tools/cmd/staticcheck@latest
 	go install mvdan.cc/gofumpt@latest

internal/buildconfig/buildconfig.go

@@ -5,9 +5,10 @@ import (
 	"os/exec"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
+
 	"github.com/eikendev/hackenv/internal/options"
 	"github.com/eikendev/hackenv/internal/scripts"
-	log "github.com/sirupsen/logrus"
 )
 
 // FixCommand represents the options specific to the fix command.

internal/commands/fix.go

@@ -7,11 +7,11 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/adrg/xdg"
 	log "github.com/sirupsen/logrus"
+	rawLibvirt "libvirt.org/go/libvirt"
 
-	"github.com/adrg/xdg"
 	"github.com/eikendev/hackenv/internal/constants"
-	rawLibvirt "libvirt.org/go/libvirt"
 )
 
 type infoRetriever func(string, *regexp.Regexp) (*DownloadInfo, error)

internal/images/images.go

@@ -5,10 +5,10 @@ import (
 	"errors"
 
 	log "github.com/sirupsen/logrus"
+	"libvirt.org/go/libvirt"
 
 	"github.com/eikendev/hackenv/internal/constants"
 	"github.com/eikendev/hackenv/internal/images"
-	"libvirt.org/go/libvirt"
 )
 
 var domainStates = map[libvirt.DomainState]string{

internal/libvirt/libvirt.go

@@ -7,9 +7,9 @@ import (
 	"os/exec"
 	"path/filepath"
 
+	"github.com/adrg/xdg"
 	log "github.com/sirupsen/logrus"
 
-	"github.com/adrg/xdg"
 	"github.com/eikendev/hackenv/internal/constants"
 )