*: Run make fmt on codebase

Signed-off-by: timflannagan <[email protected]>

Author: timflannagan

docs/cmd/generate_docs.go

@@ -20,11 +20,12 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/google/go-github/v32/github"
 	"github.com/rotisserie/eris"
-	. "github.com/solo-io/gloo/docs/cmd/securityscanutils"
 	changelogdocutils "github.com/solo-io/go-utils/changeloggenutils"
 	"github.com/solo-io/go-utils/githubutils"
 	"github.com/solo-io/go-utils/versionutils"
 	"github.com/spf13/cobra"
+
+	. "github.com/solo-io/gloo/docs/cmd/securityscanutils"
 )
 
 func main() {

docs/cmd/test/securityscanutils/generate_securityscan_doc_test.go

@@ -3,6 +3,7 @@ package securityscanutils_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	. "github.com/solo-io/gloo/docs/cmd/securityscanutils"
 )
 

docs/content/crds/generate.go

@@ -9,10 +9,11 @@ import (
 
 	"github.com/hashicorp/go-multierror"
 	"github.com/rotisserie/eris"
-	"github.com/solo-io/gloo/pkg/utils/cmdutils"
-	"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
 	"github.com/stoewer/go-strcase"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/solo-io/gloo/pkg/utils/cmdutils"
+	"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
 )
 
 func main() {

docs/content/guides/dev/example-proxy-controller.go

@@ -12,14 +12,15 @@ import (
 	"os"
 	"time"
 
-	v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
-	matchers "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers"
 	"github.com/solo-io/k8s-utils/kubeutils"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/factory"
 	"github.com/solo-io/solo-kit/pkg/api/v1/clients/kube"
 	core "github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 
+	v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
+	matchers "github.com/solo-io/gloo/projects/gloo/pkg/api/v1/core/matchers"
+
 	// import for GKE
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )

docs/content/guides/dev/plugin.go

@@ -11,11 +11,12 @@ import (
 	"time"
 
 	cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
+	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
+	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
+
 	v1 "github.com/solo-io/gloo/projects/gloo/pkg/api/v1"
 	"github.com/solo-io/gloo/projects/gloo/pkg/discovery"
 	"github.com/solo-io/gloo/projects/gloo/pkg/plugins"
-	"github.com/solo-io/solo-kit/pkg/api/v1/clients"
-	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 
 	// add these imports to use Envoy's API
 	envoycore "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"

install/helm/gloo/generate.go

@@ -6,9 +6,10 @@ import (
 
 	"github.com/ghodss/yaml"
 	errors "github.com/rotisserie/eris"
-	"github.com/solo-io/gloo/install/helm/gloo/generate"
 	"github.com/solo-io/go-utils/log"
 	"github.com/solo-io/k8s-utils/installutils/helmchart"
+
+	"github.com/solo-io/gloo/install/helm/gloo/generate"
 )
 
 var (

install/test/5-gateway-validation-webhook-configuration_test.go

@@ -9,18 +9,20 @@ import (
 
 	"github.com/golang/protobuf/ptypes/wrappers"
 	"github.com/onsi/gomega/types"
-	glootestutils "github.com/solo-io/gloo/test/testutils"
 	v1 "k8s.io/api/admissionregistration/v1"
 
+	glootestutils "github.com/solo-io/gloo/test/testutils"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	gloostringutils "github.com/solo-io/gloo/pkg/utils/stringutils"
 	"github.com/solo-io/go-utils/stringutils"
 	"github.com/solo-io/k8s-utils/installutils/kuberesource"
 	. "github.com/solo-io/k8s-utils/manifesttestutils"
 	admissionregistrationv1 "k8s.io/api/admissionregistration/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/yaml"
+
+	gloostringutils "github.com/solo-io/gloo/pkg/utils/stringutils"
 )
 
 const (

install/test/grpc_json_transcoder_test.go

@@ -9,10 +9,11 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/types"
-	"github.com/solo-io/gloo/projects/gateway/pkg/defaults"
-	glootestutils "github.com/solo-io/gloo/test/testutils"
 	. "github.com/solo-io/k8s-utils/manifesttestutils"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+
+	"github.com/solo-io/gloo/projects/gateway/pkg/defaults"
+	glootestutils "github.com/solo-io/gloo/test/testutils"
 )
 
 var _ = Describe("GrpcJsonTranscoder helm test", func() {

install/test/helm_suite_test.go

@@ -12,11 +12,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
-	"github.com/solo-io/gloo/pkg/cliutil/helm"
-	"github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/install"
-	"github.com/solo-io/gloo/projects/gloo/pkg/defaults"
-	"github.com/solo-io/gloo/test/makefile"
-	glootestutils "github.com/solo-io/gloo/test/testutils"
 	soloHelm "github.com/solo-io/go-utils/helmutils"
 	"github.com/solo-io/go-utils/testutils"
 	"github.com/solo-io/k8s-utils/installutils/kuberesource"
@@ -28,6 +23,12 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/solo-io/gloo/pkg/cliutil/helm"
+	"github.com/solo-io/gloo/projects/gloo/cli/pkg/cmd/install"
+	"github.com/solo-io/gloo/projects/gloo/pkg/defaults"
+	"github.com/solo-io/gloo/test/makefile"
+	glootestutils "github.com/solo-io/gloo/test/testutils"
 )
 
 const (

install/test/helm_test.go

@@ -16,12 +16,6 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/format"
 	"github.com/onsi/gomega/types"
-	values "github.com/solo-io/gloo/install/helm/gloo/generate"
-	"github.com/solo-io/gloo/install/test/securitycontext"
-	"github.com/solo-io/gloo/pkg/utils/kubeutils"
-	"github.com/solo-io/gloo/projects/gateway/pkg/defaults"
-	"github.com/solo-io/gloo/test/gomega/matchers"
-	glootestutils "github.com/solo-io/gloo/test/testutils"
 	"github.com/solo-io/k8s-utils/installutils/kuberesource"
 	. "github.com/solo-io/k8s-utils/manifesttestutils"
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources"
@@ -36,6 +30,13 @@ import (
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/utils/pointer"
+
+	values "github.com/solo-io/gloo/install/helm/gloo/generate"
+	"github.com/solo-io/gloo/install/test/securitycontext"
+	"github.com/solo-io/gloo/pkg/utils/kubeutils"
+	"github.com/solo-io/gloo/projects/gateway/pkg/defaults"
+	"github.com/solo-io/gloo/test/gomega/matchers"
+	glootestutils "github.com/solo-io/gloo/test/testutils"
 )
 
 func GetPodNamespaceStats() corev1.EnvVar {

install/test/k8sgateway_test.go

@@ -5,17 +5,18 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	. "github.com/solo-io/k8s-utils/manifesttestutils"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/util/intstr"
+	"k8s.io/utils/pointer"
+
 	"github.com/solo-io/gloo/install/utils/kuberesource"
 	"github.com/solo-io/gloo/pkg/utils/kubeutils"
 	"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
 	"github.com/solo-io/gloo/projects/gateway2/wellknown"
 	"github.com/solo-io/gloo/test/gomega/matchers"
 	glootestutils "github.com/solo-io/gloo/test/testutils"
-	. "github.com/solo-io/k8s-utils/manifesttestutils"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/resource"
-	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/utils/pointer"
 )
 
 var _ = Describe("Kubernetes Gateway API integration", func() {

install/test/rbac_test.go

@@ -3,9 +3,10 @@ package test
 import (
 	"fmt"
 
-	glootestutils "github.com/solo-io/gloo/test/testutils"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
+	glootestutils "github.com/solo-io/gloo/test/testutils"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/format"

install/test/svc_accnt_test.go

@@ -2,6 +2,7 @@ package test
 
 import (
 	. "github.com/onsi/ginkgo/v2"
+
 	glootestutils "github.com/solo-io/gloo/test/testutils"
 
 	. "github.com/onsi/gomega"

install/utils/kuberesource/unstructured.go

@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 
 	"github.com/pkg/errors"
-	"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
+
+	"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
 )
 
 // ConvertUnstructured converts an unstructured object to a typed object

install/utils/kuberesource/unstructured_test.go

@@ -9,9 +9,10 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+
+	"github.com/solo-io/gloo/projects/gateway2/api/v1alpha1"
 )
 
 var (

jobs/certgen/cmd/main.go

@@ -6,11 +6,12 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 
-	"github.com/solo-io/gloo/jobs/pkg/run"
-	"github.com/solo-io/gloo/projects/gloo/cli/pkg/constants"
 	"github.com/solo-io/go-utils/contextutils"
 	"github.com/solo-io/solo-kit/pkg/utils/statusutils"
 	"github.com/spf13/cobra"
+
+	"github.com/solo-io/gloo/jobs/pkg/run"
+	"github.com/solo-io/gloo/projects/gloo/cli/pkg/constants"
 )
 
 func main() {

jobs/pkg/kube/secret.go

@@ -7,14 +7,15 @@ import (
 	"time"
 
 	errors "github.com/rotisserie/eris"
-	"github.com/solo-io/gloo/jobs/pkg/certgen"
 	"github.com/solo-io/go-utils/contextutils"
 	"github.com/solo-io/k8s-utils/certutils"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
+
+	"github.com/solo-io/gloo/jobs/pkg/certgen"
 )
 
 type TlsSecret struct {

jobs/pkg/run/run.go

@@ -5,13 +5,14 @@ import (
 	"time"
 
 	"github.com/rotisserie/eris"
-	"github.com/solo-io/gloo/jobs/pkg/certgen"
-	"github.com/solo-io/gloo/jobs/pkg/kube"
-	"github.com/solo-io/gloo/projects/gloo/cli/pkg/helpers"
 	"github.com/solo-io/go-utils/contextutils"
 	"go.uber.org/zap"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
+
+	"github.com/solo-io/gloo/jobs/pkg/certgen"
+	"github.com/solo-io/gloo/jobs/pkg/kube"
+	"github.com/solo-io/gloo/projects/gloo/cli/pkg/helpers"
 )
 
 // Options to configure the rotation job

pkg/bootstrap/leaderelector/identity_test.go

@@ -3,6 +3,7 @@ package leaderelector_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/solo-io/gloo/pkg/bootstrap/leaderelector"
 )
 

pkg/bootstrap/leaderelector/kube/factory.go

@@ -6,12 +6,13 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/solo-io/gloo/pkg/bootstrap/leaderelector"
-	"github.com/solo-io/gloo/pkg/utils/envutils"
 	"github.com/solo-io/go-utils/contextutils"
 	"k8s.io/client-go/rest"
 	k8sleaderelection "k8s.io/client-go/tools/leaderelection"
 	"sigs.k8s.io/controller-runtime/pkg/leaderelection"
+
+	"github.com/solo-io/gloo/pkg/bootstrap/leaderelector"
+	"github.com/solo-io/gloo/pkg/utils/envutils"
 )
 
 var _ leaderelector.ElectionFactory = new(kubeElectionFactory)

pkg/bootstrap/leaderelector/leader_test.go

@@ -6,6 +6,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/solo-io/gloo/pkg/bootstrap/leaderelector"
 )
 

pkg/bootstrap/leaderelector/singlereplica/factory.go

@@ -3,8 +3,9 @@ package singlereplica
 import (
 	"context"
 
-	"github.com/solo-io/gloo/pkg/bootstrap/leaderelector"
 	"github.com/solo-io/go-utils/contextutils"
+
+	"github.com/solo-io/gloo/pkg/bootstrap/leaderelector"
 )
 
 var _ leaderelector.ElectionFactory = new(singleReplicaElectionFactory)

pkg/cliutil/input_test.go

@@ -3,6 +3,7 @@ package cliutil_test
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	. "github.com/solo-io/gloo/pkg/cliutil"
 	"github.com/solo-io/gloo/pkg/cliutil/testutil"
 )

pkg/cliutil/nsselect/select.go

@@ -6,9 +6,10 @@ import (
 
 	"github.com/solo-io/go-utils/contextutils"
 
-	"github.com/solo-io/gloo/pkg/cliutil"
 	"github.com/solo-io/solo-kit/pkg/api/v1/resources/core"
 	survey "gopkg.in/AlecAivazis/survey.v1"
+
+	"github.com/solo-io/gloo/pkg/cliutil"
 )
 
 //NOTE these functions are good candidates for code generation

pkg/cliutil/testutil/testutil.go

@@ -9,8 +9,9 @@ import (
 	"github.com/hinshun/vt10x"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/solo-io/gloo/pkg/cliutil"
 	"gopkg.in/AlecAivazis/survey.v1/terminal"
+
+	"github.com/solo-io/gloo/pkg/cliutil"
 )
 
 func Stdio(c *expect.Console) terminal.Stdio {

pkg/cliutil/uri.go

@@ -17,6 +17,7 @@ import (
 	"github.com/solo-io/gloo/pkg/utils/kubeutils"
 
 	"github.com/avast/retry-go/v4"
+
 	"github.com/solo-io/gloo/pkg/utils/kubeutils/portforward"
 
 	"github.com/hashicorp/go-multierror"

pkg/github-action-utils/version.go

@@ -6,10 +6,11 @@ import (
 	"os"
 
 	"github.com/pkg/errors"
-	"github.com/solo-io/gloo/pkg/version"
 	"github.com/solo-io/go-utils/changelogutils"
 	"github.com/solo-io/go-utils/versionutils"
 	"github.com/solo-io/go-utils/vfsutils"
+
+	"github.com/solo-io/gloo/pkg/version"
 )
 
 // GetLatestEnterpriseVersion computes the latest Gloo Enterprise version.

pkg/schemes/extended_scheme.go

@@ -3,13 +3,14 @@ package schemes
 import (
 	"fmt"
 
-	"github.com/solo-io/gloo/projects/gateway2/wellknown"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/discovery"
 	"k8s.io/client-go/rest"
 
+	"github.com/solo-io/gloo/projects/gateway2/wellknown"
+
 	gwv1a2 "sigs.k8s.io/gateway-api/apis/v1alpha2"
 )