ordering imports linter and writer (#85)

.golangci.yml

@@ -158,6 +158,27 @@ linters-settings:
     # Useful if you need to load the template from a specific file.
     # Default: ""
     # template-path: /path/to/my/template.tmpl
+  gci:
+    # DEPRECATED: use `sections` and `prefix(github.com/org/project)` instead.
+    # local-prefixes: github.com/harness/gitness
+    # Section configuration to compare against.
+    # Section names are case-insensitive and may contain parameters in ().
+    # The default order of sections is `standard > default > custom > blank > dot`,
+    # If `custom-order` is `true`, it follows the order of `sections` option.
+    # Default: ["standard", "default"]
+    sections:
+      - standard # Standard section: captures all standard packages.
+      - prefix(github.com/harness/gitness) # Custom section: groups all imports with the specified Prefix.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
+      - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
+    # Skip generated files.
+    # Default: true
+    skip-generated: false
+    # Enable custom order of sections.
+    # If `true`, make the section order the same as the order of `sections`.
+    # Default: false
+    custom-order: true
 
 
 linters:
@@ -229,7 +250,7 @@ linters:
     ## you may want to enable
     #- decorder # checks declaration order and count of types, constants, variables and functions
     #- exhaustruct # checks if all structure fields are initialized
-    #- gci # controls golang package import order and makes it always deterministic
+    - gci # controls golang package import order and makes it always deterministic
     #- godox # detects FIXME, TODO and other comment keywords
     - goheader # checks is file header matches to pattern
     #- interfacebloat # checks the number of methods inside an interface

Makefile

@@ -8,7 +8,7 @@ ifndef DOCKER_BUILD_OPTS
 	DOCKER_BUILD_OPTS :=
 endif
 
-tools = $(addprefix $(GOBIN)/, golangci-lint goimports govulncheck protoc-gen-go protoc-gen-go-grpc)
+tools = $(addprefix $(GOBIN)/, golangci-lint goimports govulncheck protoc-gen-go protoc-gen-go-grpc gci)
 deps = $(addprefix $(GOBIN)/, wire dbmate mockgen)
 
 ifneq (,$(wildcard ./.local.env))
@@ -107,6 +107,7 @@ e2e: generate test-env ## Run e2e tests
 format: tools # Format go code and error if any changes are made
 	@echo "Formating ..."
 	@goimports -w .
+	@gci write --custom-order -s standard -s "prefix(github.com/harness/gitness)" -s default -s blank -s dot .
 	@echo "Formatting complete"
 
 sec:
@@ -179,6 +180,9 @@ $(GOBIN)/protoc-gen-go:
 $(GOBIN)/protoc-gen-go-grpc:
 	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.2
 
+$(GOBIN)/gci:
+	go install github.com/daixiang0/gci@latest
+
 help: ## show help message
 	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m\033[0m\n"} /^[$$()% 0-9a-zA-Z_-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
 

cli/cli.go

@@ -10,17 +10,15 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/adrg/xdg"
-
-	"github.com/harness/gitness/cli/session"
-	"github.com/harness/gitness/client"
-
 	"github.com/harness/gitness/cli/operations/account"
 	"github.com/harness/gitness/cli/operations/user"
 	"github.com/harness/gitness/cli/operations/users"
 	"github.com/harness/gitness/cli/server"
+	"github.com/harness/gitness/cli/session"
+	"github.com/harness/gitness/client"
 	"github.com/harness/gitness/version"
 
+	"github.com/adrg/xdg"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

cli/operations/account/login.go

@@ -9,9 +9,7 @@ import (
 	"time"
 
 	"github.com/harness/gitness/cli/session"
-
 	"github.com/harness/gitness/cli/textui"
-
 	"github.com/harness/gitness/client"
 
 	"gopkg.in/alecthomas/kingpin.v2"

cli/operations/account/register.go

@@ -8,10 +8,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/harness/gitness/cli/textui"
-
 	"github.com/harness/gitness/cli/session"
+	"github.com/harness/gitness/cli/textui"
 	"github.com/harness/gitness/client"
+
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

cli/operations/user/create_pat.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/harness/gitness/client"
-
 	"github.com/harness/gitness/internal/api/controller/user"
 	"github.com/harness/gitness/types/enum"
 

cli/operations/user/users.go

@@ -6,6 +6,7 @@ package user
 
 import (
 	"github.com/harness/gitness/client"
+
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

cli/operations/users/create.go

@@ -11,10 +11,8 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/harness/gitness/client"
-
 	"github.com/harness/gitness/cli/textui"
-
+	"github.com/harness/gitness/client"
 	"github.com/harness/gitness/types"
 
 	"github.com/drone/funcmap"

cli/operations/users/list.go

@@ -12,10 +12,9 @@ import (
 	"time"
 
 	"github.com/harness/gitness/client"
-
-	"github.com/drone/funcmap"
 	"github.com/harness/gitness/types"
 
+	"github.com/drone/funcmap"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

cli/operations/users/update.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	"github.com/harness/gitness/client"
-
 	"github.com/harness/gitness/types"
 
 	"github.com/dchest/uniuri"

cli/operations/users/users.go

@@ -6,6 +6,7 @@ package users
 
 import (
 	"github.com/harness/gitness/client"
+
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

cli/server/config.go

@@ -11,10 +11,9 @@ import (
 
 	"github.com/harness/gitness/gitrpc"
 	"github.com/harness/gitness/gitrpc/server"
-
-	"github.com/google/wire"
 	"github.com/harness/gitness/types"
 
+	"github.com/google/wire"
 	"github.com/kelseyhightower/envconfig"
 )
 

cli/server/server.go

@@ -14,12 +14,12 @@ import (
 
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/version"
-	"golang.org/x/sync/errgroup"
 
 	"github.com/joho/godotenv"
 	"github.com/mattn/go-isatty"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
+	"golang.org/x/sync/errgroup"
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

cli/swagger.go

@@ -8,6 +8,7 @@ import (
 	"os"
 
 	"github.com/harness/gitness/internal/api/openapi"
+
 	"gopkg.in/alecthomas/kingpin.v2"
 )
 

client/client.go

@@ -14,11 +14,11 @@ import (
 	"net/http/httputil"
 	"net/url"
 
-	"github.com/rs/zerolog/log"
-
 	"github.com/harness/gitness/internal/api/controller/user"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/version"
+
+	"github.com/rs/zerolog/log"
 )
 
 // ensure HTTPClient implements Client interface.

client/interface.go

@@ -8,7 +8,6 @@ import (
 	"context"
 
 	"github.com/harness/gitness/internal/api/controller/user"
-
 	"github.com/harness/gitness/types"
 )
 

gitrpc/branch.go

@@ -11,6 +11,7 @@ import (
 	"io"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 )
 

gitrpc/client.go

@@ -6,6 +6,7 @@ package gitrpc
 
 import (
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

gitrpc/internal/gitea/blob.go

@@ -9,8 +9,9 @@ import (
 	"fmt"
 	"io"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 )
 
 // GetBlob returns the blob for the given object sha.

gitrpc/internal/gitea/branch.go

@@ -9,8 +9,9 @@ import (
 	"fmt"
 	"strings"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 )
 
 // CreateBranch creates a new branch.

gitrpc/internal/gitea/commit.go

@@ -12,8 +12,9 @@ import (
 	"strconv"
 	"strings"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 )
 
 const (

gitrpc/internal/gitea/mapping.go

@@ -9,8 +9,9 @@ import (
 	"fmt"
 	"strings"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/rs/zerolog/log"
 )
 

gitrpc/internal/gitea/ref.go

@@ -11,9 +11,10 @@ import (
 	"math"
 	"strings"
 
+	"github.com/harness/gitness/gitrpc/internal/types"
+
 	gitea "code.gitea.io/gitea/modules/git"
 	gitearef "code.gitea.io/gitea/modules/git/foreachref"
-	"github.com/harness/gitness/gitrpc/internal/types"
 )
 
 func DefaultInstructor(_ types.WalkReferencesEntry) (types.WalkInstruction, error) {

gitrpc/internal/gitea/repo.go

@@ -8,8 +8,9 @@ import (
 	"context"
 	"fmt"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 )
 
 // InitRepository initializes a new Git repository.

gitrpc/internal/gitea/submodule.go

@@ -7,8 +7,9 @@ package gitea
 import (
 	"context"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 )
 
 // GetSubmodule returns the submodule at the given path reachable from ref.

gitrpc/internal/gitea/tag.go

@@ -14,8 +14,9 @@ import (
 	"strings"
 	"time"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 )
 
 const (

gitrpc/internal/gitea/tree.go

@@ -11,8 +11,9 @@ import (
 	"path/filepath"
 	"strings"
 
-	gitea "code.gitea.io/gitea/modules/git"
 	"github.com/harness/gitness/gitrpc/internal/types"
+
+	gitea "code.gitea.io/gitea/modules/git"
 )
 
 func cleanTreePath(treePath string) string {

gitrpc/internal/middleware/error.go

@@ -10,6 +10,7 @@ import (
 	"reflect"
 
 	"github.com/harness/gitness/gitrpc/internal/types"
+
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/internal/service/branch.go

@@ -11,6 +11,7 @@ import (
 	"github.com/harness/gitness/gitrpc/internal/gitea"
 	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/internal/service/commit.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/internal/service/mapping.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/internal/service/repo.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/internal/service/shared_repo.go

@@ -15,11 +15,11 @@ import (
 	"strings"
 	"time"
 
+	"github.com/harness/gitness/gitrpc/internal/tempdir"
+	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
 
 	"code.gitea.io/gitea/modules/git"
-	"github.com/harness/gitness/gitrpc/internal/tempdir"
-	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/rs/zerolog/log"
 )
 

gitrpc/internal/service/tag.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/internal/service/tree.go

@@ -8,6 +8,7 @@ import (
 	"context"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/internal/service/upload.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/harness/gitness/gitrpc/internal/types"
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/mapping.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

gitrpc/operations.go

@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 )
 

gitrpc/repo.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	gonanoid "github.com/matoous/go-nanoid/v2"
 	"github.com/rs/zerolog/log"
 )

gitrpc/server/server.go

@@ -6,21 +6,19 @@ package server
 
 import (
 	"errors"
+	"net"
 	"os"
 	"path/filepath"
 
-	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
-	grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
-	"github.com/harness/gitness/gitrpc/internal/middleware"
-
 	"github.com/harness/gitness/gitrpc/internal/gitea"
+	"github.com/harness/gitness/gitrpc/internal/middleware"
 	"github.com/harness/gitness/gitrpc/internal/service"
 	"github.com/harness/gitness/gitrpc/internal/storage"
 	"github.com/harness/gitness/gitrpc/rpc"
 
-	"net"
-
 	"code.gitea.io/gitea/modules/setting"
+	grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
+	grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery"
 	"google.golang.org/grpc"
 )
 

gitrpc/server/wire.go

@@ -5,8 +5,9 @@
 package server
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/gitrpc/internal/middleware"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

gitrpc/smarthttp.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/harness/gitness/gitrpc/internal/streamio"
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 )
 

gitrpc/tag.go

@@ -11,6 +11,7 @@ import (
 	"io"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 )
 

gitrpc/tree.go

@@ -11,6 +11,7 @@ import (
 	"io"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 )
 

gitrpc/upload.go

@@ -11,6 +11,7 @@ import (
 	"io"
 
 	"github.com/harness/gitness/gitrpc/rpc"
+
 	"github.com/rs/zerolog/log"
 )
 

internal/api/auth/auth.go

@@ -14,6 +14,7 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"
 )

internal/api/auth/repo.go

@@ -12,6 +12,7 @@ import (
 	"github.com/harness/gitness/internal/paths"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/pkg/errors"
 )
 

internal/api/auth/space.go

@@ -12,6 +12,7 @@ import (
 	"github.com/harness/gitness/internal/paths"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/pkg/errors"
 )
 

internal/api/controller/repo/create.go

@@ -11,14 +11,13 @@ import (
 	"time"
 
 	"github.com/harness/gitness/gitrpc"
-
-	"github.com/harness/gitness/resources"
-
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/internal/auth"
+	"github.com/harness/gitness/resources"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
 	zerolog "github.com/rs/zerolog/log"
 )
 

internal/api/controller/repo/get_content.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/harness/gitness/gitrpc"
-
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types/enum"

internal/api/controller/repo/move.go

@@ -13,6 +13,7 @@ import (
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/check"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/rs/zerolog/log"
 )
 

internal/api/controller/repo/wire.go

@@ -5,12 +5,13 @@
 package repo
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/gitrpc"
 	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/check"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/api/controller/service/create.go

@@ -8,11 +8,12 @@ import (
 	"context"
 	"time"
 
-	"github.com/dchest/uniuri"
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/dchest/uniuri"
 )
 
 // CreateInput is the input used for create operations.

internal/api/controller/service/update.go

@@ -8,11 +8,12 @@ import (
 	"context"
 	"time"
 
-	"github.com/gotidy/ptr"
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/gotidy/ptr"
 )
 
 // UpdateInput store infos to update an existing service.

internal/api/controller/service/wire.go

@@ -5,10 +5,11 @@
 package service
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types/check"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/api/controller/serviceaccount/create.go

@@ -9,11 +9,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/dchest/uniuri"
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/dchest/uniuri"
 	gonanoid "github.com/matoous/go-nanoid/v2"
 )
 

internal/api/controller/serviceaccount/delete_token.go

@@ -11,6 +11,7 @@ import (
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/rs/zerolog/log"
 )
 

internal/api/controller/serviceaccount/wire.go

@@ -5,10 +5,11 @@
 package serviceaccount
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types/check"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/api/controller/space/wire.go

@@ -5,11 +5,12 @@
 package space
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/check"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/api/controller/user/create.go

@@ -9,12 +9,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/dchest/uniuri"
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/check"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/dchest/uniuri"
 	"golang.org/x/crypto/bcrypt"
 )
 

internal/api/controller/user/delete_token.go

@@ -11,6 +11,7 @@ import (
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/rs/zerolog/log"
 )
 

internal/api/controller/user/helper.go

@@ -10,6 +10,7 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
 	"golang.org/x/crypto/bcrypt"
 )
 

internal/api/controller/user/login.go

@@ -17,6 +17,7 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/internal/token"
 	"github.com/harness/gitness/types"
+
 	"github.com/rs/zerolog/log"
 	"golang.org/x/crypto/bcrypt"
 )

internal/api/controller/user/update.go

@@ -9,11 +9,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/gotidy/ptr"
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/gotidy/ptr"
 	"golang.org/x/crypto/bcrypt"
 )
 

internal/api/controller/user/wire.go

@@ -5,10 +5,11 @@
 package user
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types/check"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/api/handler/repo/http_git.go

@@ -11,15 +11,15 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/harness/gitness/internal/paths"
-
 	"github.com/harness/gitness/gitrpc"
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/internal/auth/authz"
+	"github.com/harness/gitness/internal/paths"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/rs/zerolog/hlog"
 	"github.com/rs/zerolog/log"
 )

internal/api/middleware/encode/encode.go

@@ -8,11 +8,11 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/rs/zerolog/hlog"
-
 	"github.com/harness/gitness/internal/api/render"
 	"github.com/harness/gitness/internal/request"
 	"github.com/harness/gitness/types"
+
+	"github.com/rs/zerolog/hlog"
 )
 
 const (

internal/api/middleware/principal/principal.go

@@ -10,6 +10,7 @@ import (
 	"github.com/harness/gitness/internal/api/render"
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/rs/zerolog/hlog"
 )
 

internal/api/openapi/repo.go

@@ -7,12 +7,13 @@ package openapi
 import (
 	"net/http"
 
-	"github.com/gotidy/ptr"
 	"github.com/harness/gitness/internal/api/controller/repo"
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/gotidy/ptr"
 	"github.com/swaggest/openapi-go/openapi3"
 )
 

internal/api/openapi/resource.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 
 	"github.com/harness/gitness/internal/api/usererror"
+
 	"github.com/swaggest/openapi-go/openapi3"
 )
 

internal/api/openapi/shared.go

@@ -5,9 +5,10 @@
 package openapi
 
 import (
-	"github.com/gotidy/ptr"
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/gotidy/ptr"
 	"github.com/swaggest/openapi-go/openapi3"
 )
 

internal/api/openapi/space.go

@@ -7,12 +7,13 @@ package openapi
 import (
 	"net/http"
 
-	"github.com/gotidy/ptr"
 	"github.com/harness/gitness/internal/api/controller/space"
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/gotidy/ptr"
 	"github.com/swaggest/openapi-go/openapi3"
 )
 

internal/api/render/render.go

@@ -11,9 +11,9 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/rs/zerolog/log"
-
 	"github.com/harness/gitness/internal/api/usererror"
+
+	"github.com/rs/zerolog/log"
 )
 
 // indent the json-encoded API responses.

internal/api/request/util.go

@@ -9,10 +9,11 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/go-chi/chi"
 	"github.com/harness/gitness/internal/api/usererror"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/go-chi/chi"
 )
 
 const (

internal/api/usererror/translate.go

@@ -12,6 +12,7 @@ import (
 	apiauth "github.com/harness/gitness/internal/api/auth"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types/check"
+
 	"github.com/rs/zerolog/log"
 )
 

internal/auth/authn/token.go

@@ -11,12 +11,13 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/dgrijalva/jwt-go"
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/internal/token"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/dgrijalva/jwt-go"
 	"github.com/rs/zerolog/hlog"
 )
 

internal/auth/authn/wire.go

@@ -5,8 +5,9 @@
 package authn
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/internal/store"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/auth/authz/unsafe.go

@@ -7,11 +7,11 @@ package authz
 import (
 	"context"
 
-	"github.com/rs/zerolog/log"
-
 	"github.com/harness/gitness/internal/auth"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
+
+	"github.com/rs/zerolog/log"
 )
 
 var _ Authorizer = (*UnsafeAuthorizer)(nil)

internal/bootstrap/bootstrap.go

@@ -12,6 +12,7 @@ import (
 	"github.com/harness/gitness/internal/api/controller/user"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
+
 	"github.com/rs/zerolog/log"
 )
 

internal/bootstrap/wire.go

@@ -5,9 +5,10 @@
 package bootstrap
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/internal/api/controller/user"
 	"github.com/harness/gitness/types"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/router/api.go

@@ -9,14 +9,13 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/harness/gitness/internal/api/handler/resource"
-
 	"github.com/harness/gitness/internal/api/controller/repo"
 	"github.com/harness/gitness/internal/api/controller/serviceaccount"
 	"github.com/harness/gitness/internal/api/controller/space"
 	"github.com/harness/gitness/internal/api/controller/user"
 	"github.com/harness/gitness/internal/api/handler/account"
 	handlerrepo "github.com/harness/gitness/internal/api/handler/repo"
+	"github.com/harness/gitness/internal/api/handler/resource"
 	handlerserviceaccount "github.com/harness/gitness/internal/api/handler/serviceaccount"
 	handlerspace "github.com/harness/gitness/internal/api/handler/space"
 	"github.com/harness/gitness/internal/api/handler/system"
@@ -25,12 +24,11 @@ import (
 	middlewareauthn "github.com/harness/gitness/internal/api/middleware/authn"
 	"github.com/harness/gitness/internal/api/middleware/encode"
 	"github.com/harness/gitness/internal/api/middleware/principal"
-	"github.com/harness/gitness/types/enum"
-
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/internal/auth/authn"
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
+	"github.com/harness/gitness/types/enum"
 
 	"github.com/go-chi/chi"
 	"github.com/go-chi/chi/middleware"

internal/router/git.go

@@ -8,16 +8,14 @@ import (
 	"fmt"
 	"net/http"
 
-	middlewareauthn "github.com/harness/gitness/internal/api/middleware/authn"
-	"github.com/harness/gitness/internal/auth/authz"
-
 	"github.com/harness/gitness/gitrpc"
 	handlerrepo "github.com/harness/gitness/internal/api/handler/repo"
-
 	"github.com/harness/gitness/internal/api/middleware/accesslog"
+	middlewareauthn "github.com/harness/gitness/internal/api/middleware/authn"
 	"github.com/harness/gitness/internal/api/middleware/encode"
 	"github.com/harness/gitness/internal/api/request"
 	"github.com/harness/gitness/internal/auth/authn"
+	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
 
 	"github.com/go-chi/chi"

internal/router/router.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/harness/gitness/internal/api/render"
 	"github.com/harness/gitness/internal/request"
+
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/hlog"
 	"github.com/rs/zerolog/log"

internal/router/web.go

@@ -10,13 +10,12 @@ import (
 
 	"github.com/harness/gitness/internal/api/openapi"
 	"github.com/harness/gitness/internal/api/render"
-
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/web"
-	"github.com/swaggest/swgui/v3emb"
-	"github.com/unrolled/secure"
 
 	"github.com/go-chi/chi"
+	"github.com/swaggest/swgui/v3emb"
+	"github.com/unrolled/secure"
 )
 
 // WebHandler is an abstraction of an http handler that handles web calls.

internal/router/wire.go

@@ -5,7 +5,6 @@
 package router
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/gitrpc"
 	"github.com/harness/gitness/internal/api/controller/repo"
 	"github.com/harness/gitness/internal/api/controller/serviceaccount"
@@ -14,6 +13,8 @@ import (
 	"github.com/harness/gitness/internal/auth/authn"
 	"github.com/harness/gitness/internal/auth/authz"
 	"github.com/harness/gitness/internal/store"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/server/server.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	"github.com/harness/gitness/internal/router"
+
 	"golang.org/x/crypto/acme/autocert"
 	"golang.org/x/sync/errgroup"
 )

internal/store/database/path.go

@@ -14,6 +14,7 @@ import (
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/check"
 	"github.com/harness/gitness/types/enum"
+
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"

internal/store/database/repo.go

@@ -14,9 +14,9 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
-	"github.com/pkg/errors"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/pkg/errors"
 )
 
 var _ store.RepoStore = (*RepoStore)(nil)

internal/store/database/service.go

@@ -12,9 +12,9 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
-	"github.com/rs/zerolog/log"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/rs/zerolog/log"
 )
 
 var _ store.ServiceStore = (*ServiceStore)(nil)

internal/store/database/service_account.go

@@ -12,9 +12,9 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
-	"github.com/rs/zerolog/log"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/rs/zerolog/log"
 )
 
 var _ store.ServiceAccountStore = (*ServiceAccountStore)(nil)

internal/store/database/space.go

@@ -14,9 +14,9 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
-	"github.com/pkg/errors"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/pkg/errors"
 )
 
 var _ store.SpaceStore = (*SpaceStore)(nil)

internal/store/database/store.go

@@ -13,10 +13,10 @@ import (
 	"time"
 
 	"github.com/harness/gitness/internal/store/database/migrate"
-	"github.com/rs/zerolog/log"
 
 	"github.com/Masterminds/squirrel"
 	"github.com/jmoiron/sqlx"
+	"github.com/rs/zerolog/log"
 )
 
 // build is a global instance of the sql builder. we are able to

internal/store/database/user.go

@@ -12,10 +12,10 @@ import (
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/pkg/errors"
+	"github.com/rs/zerolog/log"
 )
 
 var _ store.UserStore = (*UserStore)(nil)

internal/store/database/user_test.go

@@ -11,14 +11,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/jmoiron/sqlx"
-	"github.com/pkg/errors"
-
 	"github.com/harness/gitness/internal/store"
 	"github.com/harness/gitness/types"
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/jmoiron/sqlx"
+	"github.com/pkg/errors"
 )
 
 // user fields to ignore in test comparisons.

internal/store/database/util.go

@@ -9,6 +9,7 @@ import (
 	"fmt"
 
 	"github.com/harness/gitness/internal/store"
+
 	"github.com/mattn/go-sqlite3"
 	"github.com/pkg/errors"
 	"github.com/rs/zerolog/log"

internal/store/memory/wire.go

@@ -5,8 +5,9 @@
 package memory
 
 import (
-	"github.com/google/wire"
 	"github.com/harness/gitness/internal/store"
+
+	"github.com/google/wire"
 )
 
 // WireSet provides a wire set for this package.

internal/token/jwt.go

@@ -7,9 +7,9 @@ package token
 import (
 	"github.com/harness/gitness/types"
 	"github.com/harness/gitness/types/enum"
-	"github.com/pkg/errors"
 
 	"github.com/golang-jwt/jwt"
+	"github.com/pkg/errors"
 )
 
 const (

mocks/mock_client.go

@@ -8,9 +8,10 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
 	user "github.com/harness/gitness/internal/api/controller/user"
 	types "github.com/harness/gitness/types"
+
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockClient is a mock of Client interface.

mocks/mock_store.go

@@ -8,8 +8,9 @@ import (
 	context "context"
 	reflect "reflect"
 
-	gomock "github.com/golang/mock/gomock"
 	types "github.com/harness/gitness/types"
+
+	gomock "github.com/golang/mock/gomock"
 )
 
 // MockSystemStore is a mock of SystemStore interface.

types/check/path.go

@@ -9,6 +9,7 @@ import (
 	"strings"
 
 	"github.com/harness/gitness/types"
+
 	"github.com/pkg/errors"
 )