Merge pull request #213 from canonical/lint/imports

lint: sorting imports

cmd/create.go

@@ -8,12 +8,13 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/authorization"
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	"github.com/canonical/identity-platform-admin-ui/internal/openfga"
 	"github.com/canonical/identity-platform-admin-ui/internal/tracing"
-	"github.com/spf13/cobra"
 )
 
 // createCmd represents the create command

cmd/createFgaModel.go

@@ -8,13 +8,14 @@ import (
 	"fmt"
 	"net/url"
 
+	"github.com/openfga/go-sdk/client"
+	"github.com/spf13/cobra"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/authorization"
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	"github.com/canonical/identity-platform-admin-ui/internal/openfga"
 	"github.com/canonical/identity-platform-admin-ui/internal/tracing"
-	"github.com/openfga/go-sdk/client"
-	"github.com/spf13/cobra"
 )
 
 // createFgaModelCmd represents the createFgaModel command

cmd/remove.go

@@ -8,12 +8,13 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/spf13/cobra"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/authorization"
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	"github.com/canonical/identity-platform-admin-ui/internal/openfga"
 	"github.com/canonical/identity-platform-admin-ui/internal/tracing"
-	"github.com/spf13/cobra"
 )
 
 // removeCmd represents the remove command

cmd/serve.go

@@ -12,6 +12,9 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/kelseyhightower/envconfig"
+	"github.com/spf13/cobra"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/authorization"
 	"github.com/canonical/identity-platform-admin-ui/internal/config"
 	ih "github.com/canonical/identity-platform-admin-ui/internal/hydra"
@@ -26,8 +29,6 @@ import (
 	"github.com/canonical/identity-platform-admin-ui/pkg/rules"
 	"github.com/canonical/identity-platform-admin-ui/pkg/schemas"
 	"github.com/canonical/identity-platform-admin-ui/pkg/web"
-	"github.com/kelseyhightower/envconfig"
-	"github.com/spf13/cobra"
 )
 
 // serveCmd represents the serve command

cmd/version.go

@@ -6,8 +6,9 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/version"
 	"github.com/spf13/cobra"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/version"
 )
 
 // versionCmd represents the version command

internal/monitoring/middlewares.go

@@ -9,8 +9,9 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/go-chi/chi/v5/middleware"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 )
 
 const (

internal/monitoring/prometheus/prometheus.go

@@ -6,9 +6,10 @@ package prometheus
 import (
 	"fmt"
 
+	"github.com/prometheus/client_golang/prometheus"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
-	"github.com/prometheus/client_golang/prometheus"
 )
 
 type Monitor struct {

internal/openfga/client.go

@@ -11,13 +11,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
-	"github.com/canonical/identity-platform-admin-ui/internal/tracing"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
 	"github.com/openfga/go-sdk/credentials"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
+	"github.com/canonical/identity-platform-admin-ui/internal/tracing"
 )
 
 type Client struct {

internal/openfga/client_test.go

@@ -9,12 +9,13 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	"github.com/kelseyhightower/envconfig"
 	openfga "github.com/openfga/go-sdk"
 	"github.com/openfga/go-sdk/client"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/mock/gomock"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 )
 
 //go:generate mockgen -build_flags=--mod=mod -package openfga -destination ./mock_logger.go -source=../../internal/logging/interfaces.go

internal/openfga/noop.go

@@ -6,11 +6,13 @@ package openfga
 import (
 	"context"
 
+	openfga "github.com/openfga/go-sdk"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 
 	"github.com/canonical/identity-platform-admin-ui/internal/tracing"
-	openfga "github.com/openfga/go-sdk"
+
 	"github.com/openfga/go-sdk/client"
 )
 

internal/tracing/middleware.go

@@ -6,9 +6,10 @@ package tracing
 import (
 	"net/http"
 
+	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
-	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 )
 
 // Middleware is the monitoring middleware object implementing Prometheus monitoring

internal/tracing/tracer.go

@@ -7,7 +7,6 @@ import (
 	"context"
 	"runtime/debug"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"go.opentelemetry.io/contrib/propagators/jaeger"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -20,6 +19,8 @@ import (
 	sdktrace "go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.18.0"
 	"go.opentelemetry.io/otel/trace"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 )
 
 type Tracer struct {

pkg/clients/handlers.go

@@ -10,9 +10,10 @@ import (
 	"net/url"
 	"strconv"
 
+	"github.com/go-chi/chi/v5"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/canonical/identity-platform-admin-ui/internal/responses"
-	"github.com/go-chi/chi/v5"
 )
 
 type API struct {

pkg/clients/handlers_test.go

@@ -12,10 +12,11 @@ import (
 	reflect "reflect"
 	"testing"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/responses"
 	"github.com/go-chi/chi/v5"
 	hClient "github.com/ory/hydra-client-go/v2"
 	"go.uber.org/mock/gomock"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/responses"
 )
 
 //go:generate mockgen -build_flags=--mod=mod -package clients -destination ./mock_logger.go -source=../../internal/logging/interfaces.go

pkg/clients/service.go

@@ -12,10 +12,11 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	hClient "github.com/ory/hydra-client-go/v2"
 	"go.opentelemetry.io/otel/trace"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 )
 
 type PaginationLinksMeta struct {

pkg/clients/service_test.go

@@ -12,10 +12,11 @@ import (
 	reflect "reflect"
 	"testing"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	hClient "github.com/ory/hydra-client-go/v2"
 	"go.opentelemetry.io/otel/trace"
 	"go.uber.org/mock/gomock"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 )
 
 //go:generate mockgen -build_flags=--mod=mod -package clients -destination ./mock_logger.go -source=../../internal/logging/interfaces.go

pkg/identities/handlers.go

@@ -8,10 +8,11 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/go-chi/chi/v5"
 	kClient "github.com/ory/kratos-client-go"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 )
 
 // CreateIdentityRequest is used as a proxy struct

pkg/identities/handlers_test.go

@@ -14,10 +14,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 	"github.com/go-chi/chi/v5"
 	gomock "go.uber.org/mock/gomock"
 
+	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
+
 	kClient "github.com/ory/kratos-client-go"
 )
 

pkg/identities/service.go

@@ -10,10 +10,11 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	kClient "github.com/ory/kratos-client-go"
 	"go.opentelemetry.io/otel/trace"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 )
 
 type Service struct {

pkg/idp/handlers.go

@@ -8,9 +8,10 @@ import (
 	"io"
 	"net/http"
 
+	"github.com/go-chi/chi/v5"
+
 	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 	"github.com/canonical/identity-platform-admin-ui/internal/logging"
-	"github.com/go-chi/chi/v5"
 )
 
 const okValue = "ok"

pkg/idp/handlers_test.go

@@ -15,9 +15,10 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 	"github.com/go-chi/chi/v5"
 	gomock "go.uber.org/mock/gomock"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 )
 
 //go:generate mockgen -build_flags=--mod=mod -package idp -destination ./mock_logger.go -source=../../internal/logging/interfaces.go

pkg/idp/service.go

@@ -8,13 +8,14 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	"github.com/google/uuid"
 	"go.opentelemetry.io/otel/trace"
 	"gopkg.in/yaml.v3"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	coreV1 "k8s.io/client-go/kubernetes/typed/core/v1"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 )
 
 type Config struct {

pkg/metrics/handlers.go

@@ -6,9 +6,10 @@ package metrics
 import (
 	"net/http"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/go-chi/chi/v5"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 )
 
 type API struct {

pkg/rules/handlers_test.go

@@ -12,10 +12,11 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 	"github.com/go-chi/chi/v5"
 	oathkeeper "github.com/ory/oathkeeper-client-go"
 	"go.uber.org/mock/gomock"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 )
 
 //go:generate mockgen -build_flags=--mod=mod -package rules -destination ./mock_logger.go -source=../../internal/logging/interfaces.go

pkg/rules/service.go

@@ -8,11 +8,12 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	oathkeeper "github.com/ory/oathkeeper-client-go"
 	"go.opentelemetry.io/otel/trace"
 
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
+
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	coreV1 "k8s.io/client-go/kubernetes/typed/core/v1"
 )

pkg/schemas/handlers.go

@@ -8,10 +8,11 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 	"github.com/go-chi/chi/v5"
 	kClient "github.com/ory/kratos-client-go"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
 )
 
 const okValue = "ok"

pkg/schemas/handlers_test.go

@@ -15,10 +15,11 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 	"github.com/go-chi/chi/v5"
 	kClient "github.com/ory/kratos-client-go"
 	gomock "go.uber.org/mock/gomock"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/http/types"
 )
 
 //go:generate mockgen -build_flags=--mod=mod -package schemas -destination ./mock_logger.go -source=../../internal/logging/interfaces.go

pkg/schemas/service.go

@@ -10,12 +10,13 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/canonical/identity-platform-admin-ui/internal/logging"
-	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 	kClient "github.com/ory/kratos-client-go"
 	"go.opentelemetry.io/otel/trace"
 	metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	coreV1 "k8s.io/client-go/kubernetes/typed/core/v1"
+
+	"github.com/canonical/identity-platform-admin-ui/internal/logging"
+	"github.com/canonical/identity-platform-admin-ui/internal/monitoring"
 )
 
 const DEFAULT_SCHEMA = "default.schema"