lint

cmd/createrole.go

@@ -5,12 +5,13 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
+	"go.infratographer.com/x/gidx"
+	"go.infratographer.com/x/viperx"
+
 	"go.infratographer.com/permissions-api/internal/config"
 	"go.infratographer.com/permissions-api/internal/iapl"
 	"go.infratographer.com/permissions-api/internal/query"
 	"go.infratographer.com/permissions-api/internal/spicedbx"
-	"go.infratographer.com/x/gidx"
-	"go.infratographer.com/x/viperx"
 )
 
 const (

cmd/schema_mermaid.go

@@ -6,8 +6,9 @@ import (
 	"os"
 	"text/template"
 
-	"go.infratographer.com/permissions-api/internal/iapl"
 	"gopkg.in/yaml.v3"
+
+	"go.infratographer.com/permissions-api/internal/iapl"
 )
 
 var (

internal/api/assignments.go

@@ -3,9 +3,10 @@ package api
 import (
 	"net/http"
 
-	"go.infratographer.com/permissions-api/internal/types"
 	"go.infratographer.com/x/gidx"
 
+	"go.infratographer.com/permissions-api/internal/types"
+
 	"github.com/labstack/echo/v4"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"

internal/api/permissions.go

@@ -8,11 +8,12 @@ import (
 	"time"
 
 	"github.com/labstack/echo/v4"
-	"go.infratographer.com/permissions-api/internal/query"
-	"go.infratographer.com/permissions-api/internal/types"
 	"go.infratographer.com/x/gidx"
 	"go.opentelemetry.io/otel/codes"
 	"go.uber.org/multierr"
+
+	"go.infratographer.com/permissions-api/internal/query"
+	"go.infratographer.com/permissions-api/internal/types"
 )
 
 const (

internal/api/router.go

@@ -5,12 +5,13 @@ import (
 	"net/http"
 
 	"github.com/labstack/echo/v4"
-	"go.infratographer.com/permissions-api/internal/query"
-	"go.infratographer.com/permissions-api/internal/types"
 	"go.infratographer.com/x/echojwtx"
 	"go.infratographer.com/x/gidx"
 	"go.opentelemetry.io/otel"
 	"go.uber.org/zap"
+
+	"go.infratographer.com/permissions-api/internal/query"
+	"go.infratographer.com/permissions-api/internal/types"
 )
 
 var tracer = otel.Tracer("go.infratographer.com/permissions-api/internal/api")

internal/iapl/policy.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"go.infratographer.com/permissions-api/internal/types"
+
 	"gopkg.in/yaml.v3"
 )
 

internal/iapl/policy_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+
 	"go.infratographer.com/permissions-api/internal/testingx"
 )
 

internal/pubsub/subscriber.go

@@ -7,15 +7,16 @@ import (
 	"sync"
 	"time"
 
-	"go.infratographer.com/permissions-api/internal/query"
-	"go.infratographer.com/permissions-api/internal/types"
 	"go.infratographer.com/x/events"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/multierr"
 	"go.uber.org/zap"
+
+	"go.infratographer.com/permissions-api/internal/query"
+	"go.infratographer.com/permissions-api/internal/types"
 )
 
 const nakDelay = 10 * time.Second

internal/pubsub/subscriber_test.go

@@ -6,13 +6,14 @@ import (
 	"testing"
 	"time"
 
-	"go.infratographer.com/permissions-api/internal/query"
-	"go.infratographer.com/permissions-api/internal/query/mock"
-	"go.infratographer.com/permissions-api/internal/testingx"
 	"go.infratographer.com/x/events"
 	"go.infratographer.com/x/gidx"
 	"go.infratographer.com/x/testing/eventtools"
 
+	"go.infratographer.com/permissions-api/internal/query"
+	"go.infratographer.com/permissions-api/internal/query/mock"
+	"go.infratographer.com/permissions-api/internal/testingx"
+
 	"github.com/stretchr/testify/require"
 )
 

internal/query/relations.go

@@ -8,12 +8,13 @@ import (
 	"strings"
 
 	pb "github.com/authzed/authzed-go/proto/authzed/api/v1"
-	"go.infratographer.com/permissions-api/internal/types"
 	"go.infratographer.com/x/gidx"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/multierr"
+
+	"go.infratographer.com/permissions-api/internal/types"
 )
 
 var roleSubjectRelation = "subject"

internal/query/relations_test.go

@@ -9,11 +9,12 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
+	"go.infratographer.com/x/gidx"
+
 	"go.infratographer.com/permissions-api/internal/iapl"
 	"go.infratographer.com/permissions-api/internal/spicedbx"
 	"go.infratographer.com/permissions-api/internal/testingx"
 	"go.infratographer.com/permissions-api/internal/types"
-	"go.infratographer.com/x/gidx"
 )
 
 func testEngine(ctx context.Context, t *testing.T, namespace string) Engine {

internal/query/roles.go

@@ -1,8 +1,9 @@
 package query
 
 import (
-	"go.infratographer.com/permissions-api/internal/types"
 	"go.infratographer.com/x/gidx"
+
+	"go.infratographer.com/permissions-api/internal/types"
 )
 
 const (

pkg/permissions/mockpermissions/permissions.go

@@ -6,9 +6,10 @@ import (
 	"context"
 
 	"github.com/stretchr/testify/mock"
-	"go.infratographer.com/permissions-api/pkg/permissions"
 	"go.infratographer.com/x/events"
 	"go.infratographer.com/x/gidx"
+
+	"go.infratographer.com/permissions-api/pkg/permissions"
 )
 
 var _ permissions.AuthRelationshipRequestHandler = (*MockPermissions)(nil)

pkg/permissions/mockpermissions/permissions_test.go

@@ -5,10 +5,11 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"go.infratographer.com/permissions-api/pkg/permissions"
-	"go.infratographer.com/permissions-api/pkg/permissions/mockpermissions"
 	"go.infratographer.com/x/events"
 	"go.infratographer.com/x/gidx"
+
+	"go.infratographer.com/permissions-api/pkg/permissions"
+	"go.infratographer.com/permissions-api/pkg/permissions/mockpermissions"
 )
 
 func TestPermissions(t *testing.T) {

pkg/permissions/permissions_test.go

@@ -8,9 +8,10 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/require"
-	"go.infratographer.com/permissions-api/pkg/permissions"
 	"go.infratographer.com/x/echojwtx"
 	"go.infratographer.com/x/gidx"
+
+	"go.infratographer.com/permissions-api/pkg/permissions"
 )
 
 func TestPermissions(t *testing.T) {

pkg/permissions/relationships_test.go

@@ -8,10 +8,11 @@ import (
 
 	"github.com/labstack/echo/v4"
 	"github.com/stretchr/testify/require"
-	"go.infratographer.com/permissions-api/pkg/permissions"
 	"go.infratographer.com/x/events"
 	"go.infratographer.com/x/gidx"
 	"go.infratographer.com/x/testing/eventtools"
+
+	"go.infratographer.com/permissions-api/pkg/permissions"
 )
 
 func TestMiddlewareMissing(t *testing.T) {