Format go imports (flytestdlib) (#4228)

Signed-off-by: Andrew Dye <[email protected]>

flytestdlib/.golangci.yml

@@ -13,6 +13,7 @@ linters:
     - deadcode
     - errcheck
     - gas
+    - gci
     - goconst
     - goimports
     - golint
@@ -28,3 +29,12 @@ linters:
     - unparam
     - unused
     - varcheck
+
+linters-settings:
+  gci:
+    custom-order: true
+    sections:
+      - standard
+      - default
+      - prefix(github.com/flyteorg)
+    skip-generated: true

flytestdlib/boilerplate/flyte/golang_support_tools/tools.go

@@ -6,7 +6,8 @@ package tools
 import (
 	_ "github.com/EngHabu/mockery/cmd/mockery"
 	_ "github.com/alvaroloes/enumer"
-	_ "github.com/flyteorg/flyte/flytestdlib/cli/pflags"
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
 	_ "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
+
+	_ "github.com/flyteorg/flyte/flytestdlib/cli/pflags"
 )

flytestdlib/boilerplate/flyte/golang_test_targets/download_tooling.sh

@@ -19,6 +19,7 @@ tools=(
   "github.com/EngHabu/mockery/cmd/mockery"
   "github.com/flyteorg/flytestdlib/cli/pflags@latest"
   "github.com/golangci/golangci-lint/cmd/golangci-lint"
+  "github.com/daixiang0/gci"
   "github.com/alvaroloes/enumer"
   "github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc"
 )

flytestdlib/boilerplate/flyte/golang_test_targets/goimports

@@ -6,3 +6,4 @@
 # TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst
 
 goimports -w $(find . -type f -name '*.go' -not -path "./vendor/*" -not -path "./pkg/client/*" -not -path "./boilerplate/*")
+gci write -s standard -s default -s "prefix(github.com/flyteorg)" --custom-order --skip-generated .

flytestdlib/boilerplate/flyte/golangci_file/.golangci.yml

@@ -13,6 +13,7 @@ linters:
     - deadcode
     - errcheck
     - gas
+    - gci
     - goconst
     - goimports
     - golint
@@ -28,3 +29,12 @@ linters:
     - unparam
     - unused
     - varcheck
+
+linters-settings:
+  gci:
+    custom-order: true
+    sections:
+      - standard
+      - default
+      - prefix(github.com/flyteorg)
+    skip-generated: true

flytestdlib/boilerplate/update.cfg

@@ -1,4 +1,5 @@
+flyte/code_of_conduct
 flyte/golang_test_targets
 flyte/golang_support_tools
+flyte/golangci_file
 flyte/pull_request_template
-flyte/code_of_conduct

flytestdlib/cache/auto_refresh.go

@@ -6,18 +6,15 @@ import (
 	"sync"
 	"time"
 
-	"github.com/flyteorg/flyte/flytestdlib/contextutils"
-
+	lru "github.com/hashicorp/golang-lru"
+	"github.com/prometheus/client_golang/prometheus"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/util/workqueue"
 
+	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	"github.com/flyteorg/flyte/flytestdlib/errors"
-
 	"github.com/flyteorg/flyte/flytestdlib/logger"
-
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
-	lru "github.com/hashicorp/golang-lru"
-	"github.com/prometheus/client_golang/prometheus"
-	"k8s.io/apimachinery/pkg/util/wait"
 )
 
 type ItemID = string

flytestdlib/cache/auto_refresh_example_test.go

@@ -9,7 +9,6 @@ import (
 	"k8s.io/client-go/util/workqueue"
 
 	"github.com/flyteorg/flyte/flytestdlib/errors"
-
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
 )
 

flytestdlib/cache/auto_refresh_test.go

@@ -8,15 +8,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/flyteorg/flyte/flytestdlib/atomic"
-
+	"github.com/stretchr/testify/assert"
 	"k8s.io/client-go/util/workqueue"
 
+	"github.com/flyteorg/flyte/flytestdlib/atomic"
 	"github.com/flyteorg/flyte/flytestdlib/errors"
-
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
-
-	"github.com/stretchr/testify/assert"
 )
 
 const fakeCacheItemValueLimit = 10

flytestdlib/cli/pflags/api/generator.go

@@ -7,11 +7,10 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
+	"github.com/ernesto-jimenez/gogen/gogenutil"
 	"golang.org/x/tools/go/packages"
 
-	"github.com/ernesto-jimenez/gogen/gogenutil"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 const (

flytestdlib/cli/pflags/cmd/root.go

@@ -6,9 +6,10 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/spf13/cobra"
+
 	"github.com/flyteorg/flyte/flytestdlib/cli/pflags/api"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
-	"github.com/spf13/cobra"
 )
 
 var (

flytestdlib/cli/pflags/cmd/version.go

@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/flyteorg/flyte/flytestdlib/version"
 	"github.com/spf13/cobra"
+
+	"github.com/flyteorg/flyte/flytestdlib/version"
 )
 
 var versionCmd = &cobra.Command{

flytestdlib/config/config_cmd.go

@@ -8,11 +8,10 @@ import (
 	"strings"
 	"unsafe"
 
-	"github.com/ghodss/yaml"
-	"k8s.io/apimachinery/pkg/util/sets"
-
 	"github.com/fatih/color"
+	"github.com/ghodss/yaml"
 	"github.com/spf13/cobra"
+	"k8s.io/apimachinery/pkg/util/sets"
 )
 
 const (

flytestdlib/config/regexp_test.go

@@ -6,9 +6,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/flyteorg/flyte/flytestdlib/internal/utils"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/flyteorg/flyte/flytestdlib/internal/utils"
 )
 
 func TestRegexp_MarshalJSON(t *testing.T) {

flytestdlib/config/section.go

@@ -8,9 +8,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/flyteorg/flyte/flytestdlib/atomic"
-
 	"github.com/spf13/pflag"
+
+	"github.com/flyteorg/flyte/flytestdlib/atomic"
 )
 
 type Section interface {

flytestdlib/config/section_test.go

@@ -10,13 +10,12 @@ import (
 	"testing"
 	"time"
 
-	"k8s.io/apimachinery/pkg/util/rand"
-
-	"github.com/flyteorg/flyte/flytestdlib/internal/utils"
 	"github.com/ghodss/yaml"
 	"github.com/spf13/pflag"
-
 	"github.com/stretchr/testify/assert"
+	"k8s.io/apimachinery/pkg/util/rand"
+
+	"github.com/flyteorg/flyte/flytestdlib/internal/utils"
 )
 
 // Make sure existing config file(s) parse correctly before overriding them with this flag!

flytestdlib/config/tests/accessor_test.go

@@ -16,14 +16,13 @@ import (
 	"testing"
 	"time"
 
+	"github.com/ghodss/yaml"
+	"github.com/spf13/pflag"
+	"github.com/stretchr/testify/assert"
 	k8sRand "k8s.io/apimachinery/pkg/util/rand"
 
 	"github.com/flyteorg/flyte/flytestdlib/config"
 	"github.com/flyteorg/flyte/flytestdlib/internal/utils"
-	"github.com/spf13/pflag"
-
-	"github.com/ghodss/yaml"
-	"github.com/stretchr/testify/assert"
 )
 
 type accessorCreatorFn func(registry config.Section, configPath string) config.Accessor

flytestdlib/config/tests/config_cmd_test.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"testing"
 
-	"github.com/flyteorg/flyte/flytestdlib/config"
-
 	"github.com/spf13/cobra"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/flyteorg/flyte/flytestdlib/config"
 )
 
 func executeCommand(root *cobra.Command, args ...string) (output string, err error) {

flytestdlib/config/tests/types_test.go

@@ -1,13 +1,13 @@
 package tests
 
 import (
+	"encoding/json"
 	"fmt"
 
-	"encoding/json"
+	"github.com/spf13/pflag"
 
 	"github.com/flyteorg/flyte/flytestdlib/config"
 	"github.com/flyteorg/flyte/flytestdlib/config/viper"
-	"github.com/spf13/pflag"
 )
 
 const testNameFormatter = "[%v] %v"

flytestdlib/config/url_test.go

@@ -6,9 +6,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/flyteorg/flyte/flytestdlib/internal/utils"
-
 	"github.com/stretchr/testify/assert"
+
+	"github.com/flyteorg/flyte/flytestdlib/internal/utils"
 )
 
 func TestURL_MarshalJSON(t *testing.T) {

flytestdlib/config/viper/collection.go

@@ -7,14 +7,12 @@ import (
 	"os"
 	"strings"
 
-	"github.com/flyteorg/flyte/flytestdlib/errors"
-
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
-	viperLib "github.com/spf13/viper"
-
 	"github.com/fsnotify/fsnotify"
 	"github.com/spf13/pflag"
+	viperLib "github.com/spf13/viper"
+
+	"github.com/flyteorg/flyte/flytestdlib/errors"
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 type Viper interface {

flytestdlib/config/viper/viper.go

@@ -10,23 +10,18 @@ import (
 	"strings"
 	"sync"
 
-	"k8s.io/apimachinery/pkg/util/sets"
-
+	"github.com/fsnotify/fsnotify"
+	"github.com/mitchellh/mapstructure"
 	"github.com/pkg/errors"
-
-	stdLibErrs "github.com/flyteorg/flyte/flytestdlib/errors"
-
 	"github.com/spf13/cobra"
+	"github.com/spf13/pflag"
+	viperLib "github.com/spf13/viper"
+	"k8s.io/apimachinery/pkg/util/sets"
 
 	"github.com/flyteorg/flyte/flytestdlib/config"
 	"github.com/flyteorg/flyte/flytestdlib/config/files"
+	stdLibErrs "github.com/flyteorg/flyte/flytestdlib/errors"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
-
-	"github.com/fsnotify/fsnotify"
-	"github.com/mitchellh/mapstructure"
-
-	"github.com/spf13/pflag"
-	viperLib "github.com/spf13/viper"
 )
 
 const (

flytestdlib/database/config_test.go

@@ -5,10 +5,11 @@ import (
 	"path/filepath"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/flyteorg/flyte/flytestdlib/config"
 	"github.com/flyteorg/flyte/flytestdlib/config/viper"
 	"github.com/flyteorg/flyte/flytestdlib/logger"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestParseDatabaseConfig(t *testing.T) {

flytestdlib/database/gorm.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"time"
 
-	"github.com/flyteorg/flyte/flytestdlib/logger"
-
 	gormLogger "gorm.io/gorm/logger"
+
+	"github.com/flyteorg/flyte/flytestdlib/logger"
 )
 
 // GetGormLogger converts between the flytestdlib configured log level to the equivalent gorm log level and outputs

flytestdlib/fastcheck/fastcheck_test.go

@@ -5,10 +5,11 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils"
 	"github.com/flyteorg/flyte/flytestdlib/promutils/labeled"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestFilter(t *testing.T) {

flytestdlib/fastcheck/lru.go

@@ -3,8 +3,9 @@ package fastcheck
 import (
 	"context"
 
-	"github.com/flyteorg/flyte/flytestdlib/promutils"
 	cache "github.com/hashicorp/golang-lru"
+
+	"github.com/flyteorg/flyte/flytestdlib/promutils"
 )
 
 // validate that it conforms to the interface

flytestdlib/ioutils/timed_readers_test.go

@@ -5,8 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/flyteorg/flyte/flytestdlib/promutils"
 	"github.com/stretchr/testify/assert"
+
+	"github.com/flyteorg/flyte/flytestdlib/promutils"
 )
 
 func TestReadAll(t *testing.T) {

flytestdlib/logger/logger.go

@@ -10,9 +10,9 @@ import (
 	"runtime"
 	"strings"
 
-	"github.com/flyteorg/flyte/flytestdlib/contextutils"
-
 	"github.com/sirupsen/logrus"
+
+	"github.com/flyteorg/flyte/flytestdlib/contextutils"
 )
 
 const (