chore: establish and enforce a convention for import paths (#211)

.golangci.yaml

@@ -11,7 +11,6 @@ linters:
     - gochecknoinits
     - forbidigo
     - gochecknoglobals
-    - goimports
     # deprecated
     - exhaustivestruct
     - interfacer
@@ -24,6 +23,7 @@ linters:
     - golint
     - nosnakecase
     - testpackage
+    - gci
 linters-settings:
   depguard:
     rules:
@@ -70,5 +70,5 @@ linters-settings:
     lines: 120
     statements: 80
 
-  skip-dirs:
-    - mocks
+  goimports:
+    local-prefixes: "github.com/openfga/cli"

Makefile

@@ -20,10 +20,6 @@ $(GO_BIN)/gofumpt:
 	@echo "==> Installing gofumpt within "${GO_BIN}""
 	@go install -v mvdan.cc/gofumpt@latest
 
-$(GO_BIN)/gci:
-	@echo "==> Installing gci within "${GO_BIN}""
-	@go install -v github.com/daixiang0/gci@latest
-
 $(BUILD_DIR)/$(BINARY_NAME):
 	@echo "==> Building binary within ${BUILD_DIR}/${BINARY_NAME}"
 	go build -v -o ${BUILD_DIR}/${BINARY_NAME} main.go
@@ -62,4 +58,3 @@ audit: $(GO_BIN)/govulncheck
 format: $(GO_BIN)/gofumpt $(GO_BIN)/gci
 	@echo "==> Formatting project files"
 	gofumpt -w .
-	gci write -s standard -s default .

cmd/model/get.go

@@ -21,14 +21,15 @@ import (
 	"fmt"
 	"os"
 
+	openfga "github.com/openfga/go-sdk"
+	"github.com/openfga/go-sdk/client"
+	"github.com/spf13/cobra"
+
 	"github.com/openfga/cli/internal/authorizationmodel"
 	"github.com/openfga/cli/internal/clierrors"
 	"github.com/openfga/cli/internal/cmdutils"
 	"github.com/openfga/cli/internal/fga"
 	"github.com/openfga/cli/internal/output"
-	openfga "github.com/openfga/go-sdk"
-	"github.com/openfga/go-sdk/client"
-	"github.com/spf13/cobra"
 )
 
 func getModel(clientConfig fga.ClientConfig, fgaClient client.SdkClient) (*openfga.ReadAuthorizationModelResponse,

cmd/model/get_test.go

@@ -7,10 +7,11 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/openfga/cli/internal/fga"
-	"github.com/openfga/cli/internal/mocks"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
+
+	"github.com/openfga/cli/internal/fga"
+	mock_client "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockGet = errors.New("mock error")

cmd/model/list.go

@@ -21,12 +21,13 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/openfga/cli/internal/authorizationmodel"
-	"github.com/openfga/cli/internal/cmdutils"
-	"github.com/openfga/cli/internal/output"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
 	"github.com/spf13/cobra"
+
+	"github.com/openfga/cli/internal/authorizationmodel"
+	"github.com/openfga/cli/internal/cmdutils"
+	"github.com/openfga/cli/internal/output"
 )
 
 // MaxModelsPagesLength Limit the models so that we are not paginating indefinitely.

cmd/model/list_test.go

@@ -7,9 +7,10 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	mockclient "github.com/openfga/cli/internal/mocks"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
+
+	mockclient "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockList = errors.New("mock error")

cmd/model/test.go

@@ -21,11 +21,12 @@ import (
 	"os"
 	"path"
 
+	"github.com/spf13/cobra"
+	"gopkg.in/yaml.v3"
+
 	"github.com/openfga/cli/internal/cmdutils"
 	"github.com/openfga/cli/internal/output"
 	"github.com/openfga/cli/internal/storetest"
-	"github.com/spf13/cobra"
-	"gopkg.in/yaml.v3"
 )
 
 // testCmd represents the test command.

cmd/model/transform.go

@@ -19,10 +19,11 @@ package model
 import (
 	"fmt"
 
-	"github.com/openfga/cli/internal/authorizationmodel"
-	"github.com/openfga/cli/internal/output"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/spf13/cobra"
+
+	"github.com/openfga/cli/internal/authorizationmodel"
+	"github.com/openfga/cli/internal/output"
 )
 
 // transformCmd represents the transform command.

cmd/model/validate.go

@@ -22,12 +22,13 @@ import (
 
 	"github.com/oklog/ulid/v2"
 	pb "github.com/openfga/api/proto/openfga/v1"
-	"github.com/openfga/cli/internal/authorizationmodel"
-	"github.com/openfga/cli/internal/output"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/openfga/pkg/typesystem"
 	"github.com/spf13/cobra"
 	"google.golang.org/protobuf/encoding/protojson"
+
+	"github.com/openfga/cli/internal/authorizationmodel"
+	"github.com/openfga/cli/internal/output"
 )
 
 type validationResult struct {

cmd/model/validate_test.go

@@ -4,8 +4,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/openfga/cli/internal/authorizationmodel"
 	openfga "github.com/openfga/go-sdk"
+
+	"github.com/openfga/cli/internal/authorizationmodel"
 )
 
 func TestValidateCmdWithArgs(t *testing.T) {

cmd/model/write.go

@@ -21,12 +21,13 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/openfga/cli/internal/authorizationmodel"
-	"github.com/openfga/cli/internal/cmdutils"
-	"github.com/openfga/cli/internal/output"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
 	"github.com/spf13/cobra"
+
+	"github.com/openfga/cli/internal/authorizationmodel"
+	"github.com/openfga/cli/internal/cmdutils"
+	"github.com/openfga/cli/internal/output"
 )
 
 func Write(

cmd/model/write_test.go

@@ -7,9 +7,10 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
+	"github.com/openfga/go-sdk/client"
+
 	"github.com/openfga/cli/internal/authorizationmodel"
 	mockclient "github.com/openfga/cli/internal/mocks"
-	"github.com/openfga/go-sdk/client"
 )
 
 var errMockWrite = errors.New("mock error")

cmd/query/check.go

@@ -20,10 +20,11 @@ import (
 	"context"
 	"fmt"
 
-	cmdutils2 "github.com/openfga/cli/internal/cmdutils"
-	"github.com/openfga/cli/internal/output"
 	"github.com/openfga/go-sdk/client"
 	"github.com/spf13/cobra"
+
+	cmdutils2 "github.com/openfga/cli/internal/cmdutils"
+	"github.com/openfga/cli/internal/output"
 )
 
 func check(

cmd/query/check_test.go

@@ -6,9 +6,10 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/openfga/cli/internal/mocks"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
+
+	mock_client "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockCheck = errors.New("mock error")

cmd/query/expand.go

@@ -20,10 +20,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/openfga/cli/internal/cmdutils"
-	"github.com/openfga/cli/internal/output"
 	"github.com/openfga/go-sdk/client"
 	"github.com/spf13/cobra"
+
+	"github.com/openfga/cli/internal/cmdutils"
+	"github.com/openfga/cli/internal/output"
 )
 
 func expand(fgaClient client.SdkClient, relation string, object string) (*client.ClientExpandResponse, error) {

cmd/query/expand_test.go

@@ -8,8 +8,9 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/openfga/cli/internal/mocks"
 	"github.com/openfga/go-sdk/client"
+
+	mock_client "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockExpand = errors.New("mock error")

cmd/query/list-objects.go

@@ -20,10 +20,11 @@ import (
 	"context"
 	"fmt"
 
-	cmdutils2 "github.com/openfga/cli/internal/cmdutils"
-	"github.com/openfga/cli/internal/output"
 	"github.com/openfga/go-sdk/client"
 	"github.com/spf13/cobra"
+
+	cmdutils2 "github.com/openfga/cli/internal/cmdutils"
+	"github.com/openfga/cli/internal/output"
 )
 
 // listObjects in the internal function for calling SDK for list objects.

cmd/query/list-objects_test.go

@@ -6,8 +6,9 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/openfga/cli/internal/mocks"
 	"github.com/openfga/go-sdk/client"
+
+	mock_client "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockListObjects = errors.New("mock error")

cmd/query/list-relations.go

@@ -21,12 +21,13 @@ import (
 	"fmt"
 	"strings"
 
-	cmdutils2 "github.com/openfga/cli/internal/cmdutils"
-	"github.com/openfga/cli/internal/fga"
-	"github.com/openfga/cli/internal/output"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
 	"github.com/spf13/cobra"
+
+	cmdutils2 "github.com/openfga/cli/internal/cmdutils"
+	"github.com/openfga/cli/internal/fga"
+	"github.com/openfga/cli/internal/output"
 )
 
 func getRelationsForType(

cmd/query/list-relations_test.go

@@ -8,9 +8,10 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	"github.com/openfga/cli/internal/fga"
-	"github.com/openfga/cli/internal/mocks"
 	"github.com/openfga/go-sdk/client"
+
+	"github.com/openfga/cli/internal/fga"
+	mock_client "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockGet = errors.New("mock get model error")

cmd/root.go

@@ -22,13 +22,14 @@ import (
 	"os"
 	"strings"
 
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
+
 	"github.com/openfga/cli/cmd/model"
 	"github.com/openfga/cli/cmd/query"
 	"github.com/openfga/cli/cmd/store"
 	"github.com/openfga/cli/cmd/tuple"
 	"github.com/openfga/cli/internal/cmdutils"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 )
 
 var cfgFile string

cmd/store/create.go

@@ -20,13 +20,14 @@ import (
 	"context"
 	"fmt"
 
+	"github.com/openfga/go-sdk/client"
+	"github.com/spf13/cobra"
+
 	"github.com/openfga/cli/cmd/model"
 	"github.com/openfga/cli/internal/authorizationmodel"
 	"github.com/openfga/cli/internal/cmdutils"
 	"github.com/openfga/cli/internal/fga"
 	"github.com/openfga/cli/internal/output"
-	"github.com/openfga/go-sdk/client"
-	"github.com/spf13/cobra"
 )
 
 type CreateStoreAndModelResponse struct {

cmd/store/create_test.go

@@ -7,8 +7,9 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
-	"github.com/openfga/cli/internal/mocks"
 	"github.com/openfga/go-sdk/client"
+
+	mock_client "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockCreate = errors.New("mock error")

cmd/store/delete.go

@@ -21,10 +21,11 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/openfga/cli/internal/cmdutils"
 	"github.com/openfga/cli/internal/confirmation"
 	"github.com/openfga/cli/internal/output"
-	"github.com/spf13/cobra"
 )
 
 // deleteCmd represents the delete command.

cmd/store/get.go

@@ -21,11 +21,12 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/openfga/go-sdk/client"
+	"github.com/spf13/cobra"
+
 	"github.com/openfga/cli/internal/cmdutils"
 	"github.com/openfga/cli/internal/fga"
 	"github.com/openfga/cli/internal/output"
-	"github.com/openfga/go-sdk/client"
-	"github.com/spf13/cobra"
 )
 
 func getStore(clientConfig fga.ClientConfig, fgaClient client.SdkClient) (*client.ClientGetStoreResponse, error) {

cmd/store/get_test.go

@@ -7,9 +7,10 @@ import (
 	"time"
 
 	"github.com/golang/mock/gomock"
-	"github.com/openfga/cli/internal/fga"
-	"github.com/openfga/cli/internal/mocks"
 	"github.com/openfga/go-sdk/client"
+
+	"github.com/openfga/cli/internal/fga"
+	mock_client "github.com/openfga/cli/internal/mocks"
 )
 
 var errMockGet = errors.New("mock error")

cmd/store/list.go

@@ -20,11 +20,12 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/openfga/cli/internal/cmdutils"
-	"github.com/openfga/cli/internal/output"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
 	"github.com/spf13/cobra"
+
+	"github.com/openfga/cli/internal/cmdutils"
+	"github.com/openfga/cli/internal/output"
 )
 
 // MaxStoresPagesLength Limit the pages of stores so that we are not paginating indefinitely.