lint: sort imports (#17131)

* lint: add goimports

Signed-off-by: Loong Dai <loong.dai@intel.com>

src/.golangci.yaml

@@ -5,6 +5,8 @@ linters-settings:
     simplify: false
   misspell:
     locale: US,UK
+  goimports:
+    local-prefixes: github.com/goharbor/harbor
 
 linters:
   disable-all: true
@@ -32,6 +34,7 @@ linters:
     - errcheck
     # - gosec
     - gosimple
+    - goimports
     - govet
     # - noctx
     # - rowserrcheck
@@ -54,3 +57,17 @@ run:
 issue:
   max-same-issues: 0
   max-per-linter: 0
+
+issues:
+  # Excluding configuration per-path, per-linter, per-text and per-source
+  exclude-rules:
+    # Exclude some linters from running on tests files.
+    - path: _test\.go
+      linters:
+        - goimports
+    - path: src/testing/*.go
+      linters:
+        - goimports
+    - path: src/jobservice/mgt/mock_manager.go
+      linters:
+        - goimports

src/chartserver/cache.go

@@ -7,10 +7,10 @@ import (
 	"time"
 
 	beego_cache "github.com/beego/beego/cache"
-	hlog "github.com/goharbor/harbor/src/lib/log"
-
 	// Enable redis cache adaptor
 	_ "github.com/beego/beego/cache/redis"
+
+	hlog "github.com/goharbor/harbor/src/lib/log"
 )
 
 const (

src/chartserver/chart_operator.go

@@ -10,13 +10,13 @@ import (
 	"time"
 
 	"github.com/Masterminds/semver"
-	"github.com/goharbor/harbor/src/pkg/label/model"
-
-	hlog "github.com/goharbor/harbor/src/lib/log"
 	"helm.sh/helm/v3/pkg/chart"
 	"helm.sh/helm/v3/pkg/chart/loader"
 	"helm.sh/helm/v3/pkg/chartutil"
 	helm_repo "helm.sh/helm/v3/pkg/repo"
+
+	hlog "github.com/goharbor/harbor/src/lib/log"
+	"github.com/goharbor/harbor/src/pkg/label/model"
 )
 
 const (

src/chartserver/handler_manipulation.go

@@ -9,13 +9,14 @@ import (
 	"strings"
 
 	"github.com/ghodss/yaml"
+	helm_repo "helm.sh/helm/v3/pkg/repo"
+
 	commonhttp "github.com/goharbor/harbor/src/common/http"
 	rep_event "github.com/goharbor/harbor/src/controller/event/handler/replication/event"
 	"github.com/goharbor/harbor/src/lib/errors"
 	"github.com/goharbor/harbor/src/lib/log"
 	"github.com/goharbor/harbor/src/lib/orm"
 	"github.com/goharbor/harbor/src/pkg/reg/model"
-	helm_repo "helm.sh/helm/v3/pkg/repo"
 )
 
 // ListCharts gets the chart list under the namespace

src/chartserver/handler_proxy_traffic_test.go

@@ -10,8 +10,9 @@ import (
 	"testing"
 
 	"github.com/ghodss/yaml"
-	htesting "github.com/goharbor/harbor/src/testing"
 	helm_repo "helm.sh/helm/v3/pkg/repo"
+
+	htesting "github.com/goharbor/harbor/src/testing"
 )
 
 // The frontend server

src/chartserver/handler_utility.go

@@ -2,14 +2,14 @@ package chartserver
 
 import (
 	"fmt"
-	"github.com/goharbor/harbor/src/lib/config"
 	"path"
 	"strings"
 	"sync"
 
-	"github.com/goharbor/harbor/src/lib/errors"
 	"helm.sh/helm/v3/cmd/helm/search"
 
+	"github.com/goharbor/harbor/src/lib/config"
+	"github.com/goharbor/harbor/src/lib/errors"
 	hlog "github.com/goharbor/harbor/src/lib/log"
 )
 

src/chartserver/redis_sentinel.go

@@ -5,15 +5,12 @@ import (
 	"errors"
 	"fmt"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/FZambia/sentinel"
-
-	"github.com/gomodule/redigo/redis"
-
-	"strings"
-
 	"github.com/beego/beego/cache"
+	"github.com/gomodule/redigo/redis"
 )
 
 var (

src/cmd/exporter/main.go

@@ -5,14 +5,15 @@ import (
 	"os"
 	"strings"
 
+	_ "github.com/jackc/pgx/v4/stdlib" // registry pgx driver
+	"github.com/prometheus/client_golang/prometheus"
+	"github.com/spf13/viper"
+
 	"github.com/goharbor/harbor/src/common/dao"
 	commonthttp "github.com/goharbor/harbor/src/common/http"
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/lib/log"
 	"github.com/goharbor/harbor/src/pkg/exporter"
-	_ "github.com/jackc/pgx/v4/stdlib" // registry pgx driver
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/spf13/viper"
 )
 
 func main() {

src/cmd/standalone-db-migrator/main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"github.com/goharbor/harbor/src/common/models"
 	"os"
 	"strconv"
 
 	"github.com/goharbor/harbor/src/common/dao"
+	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/lib/log"
 	"github.com/goharbor/harbor/src/migration"
 )

src/cmd/swagger/genyaml.go

@@ -15,9 +15,10 @@
 package main
 
 import (
-	"github.com/goharbor/harbor/src/lib/config/metadata"
 	"os"
 	"text/template"
+
+	"github.com/goharbor/harbor/src/lib/config/metadata"
 )
 
 const cfgTemplate = `  Configurations:

src/common/api/base.go

@@ -24,6 +24,7 @@ import (
 
 	"github.com/beego/beego"
 	"github.com/beego/beego/validation"
+
 	commonhttp "github.com/goharbor/harbor/src/common/http"
 	lib_http "github.com/goharbor/harbor/src/lib/http"
 	"github.com/goharbor/harbor/src/lib/log"

src/common/dao/base.go

@@ -20,12 +20,12 @@ import (
 	"strconv"
 	"sync"
 
-	proModels "github.com/goharbor/harbor/src/pkg/project/models"
-	userModels "github.com/goharbor/harbor/src/pkg/user/models"
-
 	"github.com/beego/beego/orm"
+
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/lib/log"
+	proModels "github.com/goharbor/harbor/src/pkg/project/models"
+	userModels "github.com/goharbor/harbor/src/pkg/user/models"
 )
 
 const (

src/common/dao/base_test.go

@@ -3,8 +3,9 @@ package dao
 import (
 	"testing"
 
-	"github.com/goharbor/harbor/src/lib/log"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/goharbor/harbor/src/lib/log"
 )
 
 func TestMLogger_Verbose(t *testing.T) {

src/common/dao/dao_test.go

@@ -20,6 +20,7 @@ import (
 	"testing"
 
 	"github.com/beego/beego/orm"
+
 	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/lib/log"
 	libOrm "github.com/goharbor/harbor/src/lib/orm"

src/common/dao/mysql.go

@@ -20,6 +20,7 @@ import (
 
 	"github.com/beego/beego/orm"
 	_ "github.com/go-sql-driver/mysql" // register mysql driver
+
 	"github.com/goharbor/harbor/src/common/utils"
 )
 

src/common/dao/pgsql.go

@@ -23,13 +23,14 @@ import (
 	"time"
 
 	"github.com/beego/beego/orm"
-	"github.com/goharbor/harbor/src/common/models"
-	"github.com/goharbor/harbor/src/common/utils"
-	"github.com/goharbor/harbor/src/lib/log"
 	migrate "github.com/golang-migrate/migrate/v4"
 	_ "github.com/golang-migrate/migrate/v4/database/pgx" // import pgx driver for migrator
 	_ "github.com/golang-migrate/migrate/v4/source/file"  // import local file driver for migrator
 	_ "github.com/jackc/pgx/v4/stdlib"                    // registry pgx driver
+
+	"github.com/goharbor/harbor/src/common/models"
+	"github.com/goharbor/harbor/src/common/utils"
+	"github.com/goharbor/harbor/src/lib/log"
 )
 
 const defaultMigrationPath = "migrations/postgresql/"

src/common/dao/resource_label.go

@@ -17,9 +17,9 @@ package dao
 import (
 	"time"
 
-	"github.com/goharbor/harbor/src/common/models"
-
 	"github.com/beego/beego/orm"
+
+	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/pkg/label/model"
 )
 

src/common/dao/resource_label_test.go

@@ -15,15 +15,16 @@
 package dao
 
 import (
-	"github.com/goharbor/harbor/src/lib/orm"
-	"github.com/goharbor/harbor/src/pkg/label/dao"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+
 	"github.com/goharbor/harbor/src/common"
 	"github.com/goharbor/harbor/src/common/models"
+	"github.com/goharbor/harbor/src/lib/orm"
+	"github.com/goharbor/harbor/src/pkg/label/dao"
 	"github.com/goharbor/harbor/src/pkg/label/model"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 func TestMethodsOfResourceLabel(t *testing.T) {

src/common/dao/testutils.go

@@ -16,10 +16,10 @@ package dao
 
 import (
 	"fmt"
-	"github.com/goharbor/harbor/src/common/models"
 	"os"
 	"strconv"
 
+	"github.com/goharbor/harbor/src/common/models"
 	"github.com/goharbor/harbor/src/lib/log"
 )
 

src/common/http/error_test.go

@@ -1,8 +1,9 @@
 package http
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 // Test case for error wrapping function.

src/common/http/modifier/auth/auth_test.go

@@ -17,9 +17,10 @@ import (
 	"net/http"
 	"testing"
 
-	commonsecret "github.com/goharbor/harbor/src/common/secret"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	commonsecret "github.com/goharbor/harbor/src/common/secret"
 )
 
 func TestAuthorizeOfSecretAuthorizer(t *testing.T) {

src/common/http/transport.go

@@ -16,12 +16,13 @@ package http
 
 import (
 	"crypto/tls"
-	"github.com/goharbor/harbor/src/lib/trace"
 	"net"
 	"net/http"
 	"time"
 
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+
+	"github.com/goharbor/harbor/src/lib/trace"
 )
 
 const (

src/common/job/client.go

@@ -10,12 +10,11 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/goharbor/harbor/src/lib/config"
-
 	commonhttp "github.com/goharbor/harbor/src/common/http"
 	"github.com/goharbor/harbor/src/common/http/modifier/auth"
 	"github.com/goharbor/harbor/src/common/job/models"
 	"github.com/goharbor/harbor/src/jobservice/job"
+	"github.com/goharbor/harbor/src/lib/config"
 )
 
 var (

src/common/job/client_test.go

@@ -5,9 +5,10 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/goharbor/harbor/src/common/job/models"
 	"github.com/goharbor/harbor/src/common/job/test"
-	"github.com/stretchr/testify/assert"
 )
 
 var (

src/common/job/test/server.go

@@ -13,7 +13,6 @@ import (
 
 	"github.com/goharbor/harbor/src/common/job/models"
 	"github.com/goharbor/harbor/src/jobservice/job"
-	job_models "github.com/goharbor/harbor/src/jobservice/job"
 	"github.com/goharbor/harbor/src/lib/log"
 )
 
@@ -55,8 +54,8 @@ func NewJobServiceServer() *httptest.Server {
 				return
 			}
 			var stats []job.Stats
-			stat := job_models.Stats{
-				Info: &job_models.StatsInfo{
+			stat := job.Stats{
+				Info: &job.StatsInfo{
 					JobID:    jobUUID + "@123123",
 					Status:   "Pending",
 					RunAt:    time.Now().Unix(),

src/common/models/label_test.go

@@ -17,8 +17,9 @@ package models
 import (
 	"testing"
 
-	"github.com/goharbor/harbor/src/pkg/label/model"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/goharbor/harbor/src/pkg/label/model"
 )
 
 func TestValidOfLabel(t *testing.T) {

src/common/rbac/project/evaluator_test.go

@@ -16,15 +16,16 @@ package project
 
 import (
 	"context"
-	"github.com/goharbor/harbor/src/common/rbac"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/goharbor/harbor/src/common"
 	"github.com/goharbor/harbor/src/common/models"
+	"github.com/goharbor/harbor/src/common/rbac"
 	proModels "github.com/goharbor/harbor/src/pkg/project/models"
 	projecttesting "github.com/goharbor/harbor/src/testing/controller/project"
 	"github.com/goharbor/harbor/src/testing/mock"
-	"github.com/stretchr/testify/assert"
 )
 
 var (