apply new lint rule to not separate aliased imports

api/repo/repair.go

@@ -10,7 +10,6 @@ import (
 	"github.com/sirupsen/logrus"
 
 	wh "github.com/go-vela/server/api/webhook"
-
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/router/middleware/org"
 	"github.com/go-vela/server/router/middleware/repo"

compiler/native/compile.go

@@ -12,11 +12,10 @@ import (
 	"strings"
 	"time"
 
+	yml "github.com/buildkite/yaml"
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/go-retryablehttp"
 
-	yml "github.com/buildkite/yaml"
-
 	"github.com/go-vela/types/constants"
 	"github.com/go-vela/types/library"
 	"github.com/go-vela/types/pipeline"

compiler/native/compile_test.go

@@ -12,13 +12,12 @@ import (
 	"testing"
 	"time"
 
+	yml "github.com/buildkite/yaml"
 	"github.com/gin-gonic/gin"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-github/v59/github"
 	"github.com/urfave/cli/v2"
 
-	yml "github.com/buildkite/yaml"
-
 	"github.com/go-vela/types"
 	"github.com/go-vela/types/constants"
 	"github.com/go-vela/types/library"

compiler/native/parse.go

@@ -9,11 +9,10 @@ import (
 
 	"github.com/buildkite/yaml"
 
-	types "github.com/go-vela/types/yaml"
-
 	"github.com/go-vela/server/compiler/template/native"
 	"github.com/go-vela/server/compiler/template/starlark"
 	"github.com/go-vela/types/constants"
+	types "github.com/go-vela/types/yaml"
 )
 
 // ParseRaw converts an object to a string.

compiler/template/native/render.go

@@ -10,9 +10,8 @@ import (
 	"github.com/Masterminds/sprig/v3"
 	"github.com/buildkite/yaml"
 
-	types "github.com/go-vela/types/yaml"
-
 	"github.com/go-vela/types/raw"
+	types "github.com/go-vela/types/yaml"
 )
 
 // Render combines the template with the step in the yaml pipeline.

compiler/template/native/render_test.go

@@ -6,9 +6,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-
 	goyaml "github.com/buildkite/yaml"
+	"github.com/google/go-cmp/cmp"
 
 	"github.com/go-vela/types/raw"
 	"github.com/go-vela/types/yaml"

compiler/template/starlark/render.go

@@ -7,13 +7,12 @@ import (
 	"errors"
 	"fmt"
 
+	yaml "github.com/buildkite/yaml"
 	"go.starlark.net/starlark"
 	"go.starlark.net/starlarkstruct"
 
-	yaml "github.com/buildkite/yaml"
-	types "github.com/go-vela/types/yaml"
-
 	"github.com/go-vela/types/raw"
+	types "github.com/go-vela/types/yaml"
 )
 
 var (

compiler/template/starlark/render_test.go

@@ -6,9 +6,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/google/go-cmp/cmp"
-
 	goyaml "github.com/buildkite/yaml"
+	"github.com/google/go-cmp/cmp"
 
 	"github.com/go-vela/types/raw"
 	"github.com/go-vela/types/yaml"

internal/token/compose_test.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	jwt "github.com/golang-jwt/jwt/v5"
 
 	"github.com/go-vela/types"

internal/token/parse_test.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	jwt "github.com/golang-jwt/jwt/v5"
 
 	"github.com/go-vela/types/constants"

mock/server/pipeline.go

@@ -8,9 +8,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/gin-gonic/gin"
-
 	yml "github.com/buildkite/yaml"
+	"github.com/gin-gonic/gin"
 
 	"github.com/go-vela/types"
 	"github.com/go-vela/types/library"

router/build.go

@@ -5,11 +5,10 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 
-	bmiddleware "github.com/go-vela/server/router/middleware/build"
-
 	"github.com/go-vela/server/api/build"
 	"github.com/go-vela/server/api/log"
 	"github.com/go-vela/server/router/middleware"
+	bmiddleware "github.com/go-vela/server/router/middleware/build"
 	"github.com/go-vela/server/router/middleware/executors"
 	"github.com/go-vela/server/router/middleware/perm"
 )

router/middleware/claims/claims_test.go

@@ -3,6 +3,7 @@
 package claims
 
 import (
+	_context "context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -14,8 +15,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt/v5"
 
-	_context "context"
-
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/types/constants"

router/middleware/perm/perm_test.go

@@ -3,6 +3,7 @@
 package perm
 
 import (
+	_context "context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -12,8 +13,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt/v5"
 
-	_context "context"
-
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/router/middleware/build"

router/middleware/user/user_test.go

@@ -3,6 +3,7 @@
 package user
 
 import (
+	_context "context"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
@@ -13,8 +14,6 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/golang-jwt/jwt/v5"
 
-	_context "context"
-
 	"github.com/go-vela/server/database"
 	"github.com/go-vela/server/internal/token"
 	"github.com/go-vela/server/router/middleware/claims"

router/pipeline.go

@@ -5,11 +5,10 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 
-	pmiddleware "github.com/go-vela/server/router/middleware/pipeline"
-
 	"github.com/go-vela/server/api/pipeline"
 	"github.com/go-vela/server/router/middleware/org"
 	"github.com/go-vela/server/router/middleware/perm"
+	pmiddleware "github.com/go-vela/server/router/middleware/pipeline"
 	"github.com/go-vela/server/router/middleware/repo"
 )
 

router/repo.go

@@ -5,13 +5,12 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 
-	rmiddleware "github.com/go-vela/server/router/middleware/repo"
-
 	"github.com/go-vela/server/api/build"
 	"github.com/go-vela/server/api/repo"
 	"github.com/go-vela/server/router/middleware"
 	"github.com/go-vela/server/router/middleware/org"
 	"github.com/go-vela/server/router/middleware/perm"
+	rmiddleware "github.com/go-vela/server/router/middleware/repo"
 )
 
 // RepoHandlers is a function that extends the provided base router group

router/schedule.go

@@ -5,13 +5,12 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 
-	sMiddleware "github.com/go-vela/server/router/middleware/schedule"
-
 	"github.com/go-vela/server/api/schedule"
 	"github.com/go-vela/server/router/middleware"
 	"github.com/go-vela/server/router/middleware/org"
 	"github.com/go-vela/server/router/middleware/perm"
 	"github.com/go-vela/server/router/middleware/repo"
+	sMiddleware "github.com/go-vela/server/router/middleware/schedule"
 )
 
 // ScheduleHandler is a function that extends the provided base router group

router/service.go

@@ -6,11 +6,10 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 
-	smiddleware "github.com/go-vela/server/router/middleware/service"
-
 	"github.com/go-vela/server/api/service"
 	"github.com/go-vela/server/router/middleware"
 	"github.com/go-vela/server/router/middleware/perm"
+	smiddleware "github.com/go-vela/server/router/middleware/service"
 )
 
 // ServiceHandlers is a function that extends the provided base router group

router/step.go

@@ -6,11 +6,10 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 
-	smiddleware "github.com/go-vela/server/router/middleware/step"
-
 	"github.com/go-vela/server/api/step"
 	"github.com/go-vela/server/router/middleware"
 	"github.com/go-vela/server/router/middleware/perm"
+	smiddleware "github.com/go-vela/server/router/middleware/step"
 )
 
 // StepHandlers is a function that extends the provided base router group

router/worker.go

@@ -5,11 +5,10 @@ package router
 import (
 	"github.com/gin-gonic/gin"
 
-	wmiddleware "github.com/go-vela/server/router/middleware/worker"
-
 	"github.com/go-vela/server/api/worker"
 	"github.com/go-vela/server/router/middleware"
 	"github.com/go-vela/server/router/middleware/perm"
+	wmiddleware "github.com/go-vela/server/router/middleware/worker"
 )
 
 // WorkerHandlers is a function that extends the provided base router group

scm/github/authentication_test.go

@@ -3,15 +3,14 @@
 package github
 
 import (
+	_context "context"
 	"net/http"
 	"net/http/httptest"
 	"reflect"
 	"testing"
 
 	"github.com/gin-gonic/gin"
 
-	_context "context"
-
 	"github.com/go-vela/types/library"
 )