Format go imports (flyteadmin) (flyteorg#4227)

Signed-off-by: Andrew Dye <[email protected]>
squiishyy · Oct 18, 2023 · 497e194 · 497e194
1 parent de4e722
commit 497e194
Show file tree

Hide file tree

Showing 324 changed files with 1,018 additions and 1,147 deletions.
diff --git a/flyteadmin/.golangci.yml b/flyteadmin/.golangci.yml
@@ -10,6 +10,7 @@ linters:
     - deadcode
     - errcheck
     - gas
+    - gci
     - goconst
     - goimports
     - golint
@@ -25,3 +26,13 @@ linters:
     - unparam
     - unused
     - varcheck
+
+linters-settings:
+  gci:
+    custom-order: true
+    sections:
+      - standard
+      - default
+      - prefix(github.com/flyteorg)
+    skip-generated: true
+
diff --git a/flyteadmin/auth/auth_context.go b/flyteadmin/auth/auth_context.go
@@ -10,15 +10,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
-	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core"
-
 	"github.com/coreos/go-oidc"
+	"golang.org/x/oauth2"
+
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
+	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core"
 	"github.com/flyteorg/flyte/flytestdlib/errors"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
-	"golang.org/x/oauth2"
 )
 
 const (

diff --git a/flyteadmin/auth/authzserver/authorize.go b/flyteadmin/auth/authzserver/authorize.go
@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/flyteorg/flyte/flyteadmin/auth"
 	"github.com/ory/fosite"
 
+	"github.com/flyteorg/flyte/flyteadmin/auth"
 	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
 )

diff --git a/flyteadmin/auth/authzserver/authorize_test.go b/flyteadmin/auth/authzserver/authorize_test.go
@@ -8,18 +8,14 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	config2 "github.com/flyteorg/flyte/flytestdlib/config"
-
-	"github.com/flyteorg/flyte/flyteadmin/auth"
+	"github.com/ory/fosite"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 
-	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks"
-
+	"github.com/flyteorg/flyte/flyteadmin/auth"
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
-
-	"github.com/ory/fosite"
-
-	"github.com/stretchr/testify/assert"
+	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks"
+	config2 "github.com/flyteorg/flyte/flytestdlib/config"
 )
 
 func TestAuthEndpoint(t *testing.T) {

diff --git a/flyteadmin/auth/authzserver/initialize.go b/flyteadmin/auth/authzserver/initialize.go
@@ -3,14 +3,12 @@ package authzserver
 import (
 	"crypto/rsa"
 
-	"github.com/ory/fosite/handler/oauth2"
-
 	"github.com/ory/fosite"
-
-	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
-
 	"github.com/ory/fosite/compose"
+	"github.com/ory/fosite/handler/oauth2"
 	"github.com/ory/fosite/token/jwt"
+
+	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
 )
 
 // RegisterHandlers registers http endpoints for handling OAuth2 flow (/authorize,

diff --git a/flyteadmin/auth/authzserver/initialize_test.go b/flyteadmin/auth/authzserver/initialize_test.go
@@ -3,10 +3,8 @@ package authzserver
 import (
 	"testing"
 
-	"github.com/ory/fosite/storage"
-
 	"github.com/ory/fosite/compose"
-
+	"github.com/ory/fosite/storage"
 	"github.com/stretchr/testify/mock"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth"

diff --git a/flyteadmin/auth/authzserver/metadata.go b/flyteadmin/auth/authzserver/metadata.go
@@ -7,14 +7,12 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/flyteorg/flyte/flyteadmin/auth"
-	"github.com/flyteorg/flyte/flyteadmin/auth/config"
-
 	"github.com/lestrrat-go/jwx/jwk"
 
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
+	"github.com/flyteorg/flyte/flyteadmin/auth"
+	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 var (

diff --git a/flyteadmin/auth/authzserver/metadata_provider.go b/flyteadmin/auth/authzserver/metadata_provider.go
@@ -13,13 +13,11 @@ import (
 	"google.golang.org/grpc/codes"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth"
+	authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config"
 	"github.com/flyteorg/flyte/flyteadmin/pkg/async"
 	flyteErrors "github.com/flyteorg/flyte/flyteadmin/pkg/errors"
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
-	authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config"
-
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 type OAuth2MetadataProvider struct {

diff --git a/flyteadmin/auth/authzserver/metadata_provider_test.go b/flyteadmin/auth/authzserver/metadata_provider_test.go
@@ -8,13 +8,12 @@ import (
 	"strings"
 	"testing"
 
-	config2 "github.com/flyteorg/flyte/flytestdlib/config"
-
 	"github.com/stretchr/testify/assert"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 	authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
+	config2 "github.com/flyteorg/flyte/flytestdlib/config"
 )
 
 var oauthMetadataFailureErrorMessage = "Failed to get oauth metadata"

diff --git a/flyteadmin/auth/authzserver/metadata_test.go b/flyteadmin/auth/authzserver/metadata_test.go
@@ -7,12 +7,11 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks"
 	"github.com/lestrrat-go/jwx/jwk"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth"
-
-	"github.com/stretchr/testify/assert"
+	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks"
 )
 
 func Test_newJSONWebKeySet(t *testing.T) {

diff --git a/flyteadmin/auth/authzserver/provider.go b/flyteadmin/auth/authzserver/provider.go
@@ -9,27 +9,21 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
-	"k8s.io/apimachinery/pkg/util/sets"
-
-	"github.com/lestrrat-go/jwx/jwk"
-
-	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
-
-	"github.com/flyteorg/flyte/flyteadmin/auth"
-	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core"
-
 	jwtgo "github.com/golang-jwt/jwt/v4"
+	"github.com/lestrrat-go/jwx/jwk"
+	"github.com/ory/fosite"
+	"github.com/ory/fosite/compose"
 	fositeOAuth2 "github.com/ory/fosite/handler/oauth2"
+	"github.com/ory/fosite/storage"
 	"github.com/ory/fosite/token/jwt"
+	"k8s.io/apimachinery/pkg/util/sets"
 
+	"github.com/flyteorg/flyte/flyteadmin/auth"
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
-
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/compose"
-	"github.com/ory/fosite/storage"
+	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
+	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 const (

diff --git a/flyteadmin/auth/authzserver/provider_test.go b/flyteadmin/auth/authzserver/provider_test.go
@@ -12,13 +12,11 @@ import (
 	"time"
 
 	jwtgo "github.com/golang-jwt/jwt/v4"
-
-	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
-
 	"github.com/stretchr/testify/assert"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth"
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 	"github.com/flyteorg/flyte/flyteplugins/go/tasks/pluginmachinery/core/mocks"
 )
 

diff --git a/flyteadmin/auth/authzserver/resource_server.go b/flyteadmin/auth/authzserver/resource_server.go
@@ -10,17 +10,15 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/coreos/go-oidc"
 	jwtgo "github.com/golang-jwt/jwt/v4"
-
+	"golang.org/x/oauth2"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"github.com/flyteorg/flyte/flytestdlib/config"
-
-	"github.com/coreos/go-oidc"
 	authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config"
 	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
 	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
-	"golang.org/x/oauth2"
+	"github.com/flyteorg/flyte/flytestdlib/config"
 )
 
 // External auth server implementation

diff --git a/flyteadmin/auth/authzserver/resource_server_test.go b/flyteadmin/auth/authzserver/resource_server_test.go
@@ -14,13 +14,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/coreos/go-oidc"
 	"github.com/golang-jwt/jwt/v4"
-
-	"github.com/stretchr/testify/assert"
-
 	"github.com/lestrrat-go/jwx/jwk"
+	"github.com/stretchr/testify/assert"
 
-	"github.com/coreos/go-oidc"
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 	authConfig "github.com/flyteorg/flyte/flyteadmin/auth/config"
 	stdlibConfig "github.com/flyteorg/flyte/flytestdlib/config"

diff --git a/flyteadmin/auth/authzserver/stateless_token_store.go b/flyteadmin/auth/authzserver/stateless_token_store.go
@@ -8,17 +8,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/flyteorg/flyte/flyteadmin/auth"
-
-	"github.com/flyteorg/flyte/flyteadmin/auth/config"
-	"k8s.io/apimachinery/pkg/util/sets"
-
+	"github.com/ory/fosite"
 	"github.com/ory/fosite/handler/oauth2"
 	oauth22 "github.com/ory/fosite/handler/oauth2"
+	"github.com/ory/fosite/storage"
 	"github.com/ory/fosite/token/jwt"
+	"k8s.io/apimachinery/pkg/util/sets"
 
-	"github.com/ory/fosite"
-	"github.com/ory/fosite/storage"
+	"github.com/flyteorg/flyte/flyteadmin/auth"
+	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 )
 
 const (

diff --git a/flyteadmin/auth/authzserver/token.go b/flyteadmin/auth/authzserver/token.go
@@ -7,9 +7,8 @@ import (
 
 	"github.com/ory/fosite"
 
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
 	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 var (

diff --git a/flyteadmin/auth/authzserver/token_test.go b/flyteadmin/auth/authzserver/token_test.go
@@ -14,11 +14,9 @@ import (
 	"time"
 
 	jwtgo "github.com/golang-jwt/jwt/v4"
-
-	"github.com/flyteorg/flyte/flyteadmin/auth/config"
-
 	"github.com/stretchr/testify/assert"
 
+	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces/mocks"
 )
 

diff --git a/flyteadmin/auth/authzserver/utils.go b/flyteadmin/auth/authzserver/utils.go
@@ -5,10 +5,11 @@ import (
 	"encoding/base64"
 	"net/http"
 
-	"github.com/flyteorg/flyte/flyteadmin/auth"
-	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 	"github.com/gtank/cryptopasta"
 	"github.com/ory/fosite"
+
+	"github.com/flyteorg/flyte/flyteadmin/auth"
+	"github.com/flyteorg/flyte/flyteadmin/auth/config"
 )
 
 func interfaceSliceToStringSlice(raw []interface{}) []string {

diff --git a/flyteadmin/auth/config/config_test.go b/flyteadmin/auth/config/config_test.go
@@ -6,15 +6,13 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
-	"github.com/flyteorg/flyte/flytestdlib/config"
-	"github.com/flyteorg/flyte/flytestdlib/config/viper"
-
 	"github.com/ghodss/yaml"
+	"github.com/ory/fosite"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/ory/fosite"
+	"github.com/flyteorg/flyte/flytestdlib/config"
+	"github.com/flyteorg/flyte/flytestdlib/config/viper"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 func TestHashFlyteClientSecret(t *testing.T) {

diff --git a/flyteadmin/auth/cookie.go b/flyteadmin/auth/cookie.go
@@ -9,11 +9,11 @@ import (
 	"net/url"
 	"time"
 
-	"github.com/flyteorg/flyte/flytestdlib/errors"
-	"github.com/flyteorg/flyte/flytestdlib/logger"
 	"github.com/gorilla/securecookie"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth/interfaces"
+	"github.com/flyteorg/flyte/flytestdlib/errors"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 const (

diff --git a/flyteadmin/auth/cookie_manager.go b/flyteadmin/auth/cookie_manager.go
@@ -8,12 +8,12 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
-	"github.com/flyteorg/flyte/flytestdlib/errors"
-	"github.com/flyteorg/flyte/flytestdlib/logger"
 	"golang.org/x/oauth2"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
+	"github.com/flyteorg/flyte/flytestdlib/errors"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 type CookieManager struct {

diff --git a/flyteadmin/auth/cookie_manager_test.go b/flyteadmin/auth/cookie_manager_test.go
@@ -10,13 +10,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
-
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/oauth2"
 
 	"github.com/flyteorg/flyte/flyteadmin/auth/config"
+	"github.com/flyteorg/flyte/flyteidl/gen/pb-go/flyteidl/service"
 )
 
 func TestCookieManager(t *testing.T) {