clean up imports

rockset · Nov 5, 2023 · 586eda0 · 586eda0
1 parent f3fa162
commit 586eda0
Show file tree

Hide file tree

Showing 24 changed files with 84 additions and 68 deletions.
diff --git a/cmd/alias.go b/cmd/alias.go
@@ -2,13 +2,14 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/rockset/cli/completion"
-	"github.com/rockset/cli/config"
-	"github.com/rockset/cli/flag"
+
 	"github.com/rockset/rockset-go-client/openapi"
 	"github.com/rockset/rockset-go-client/option"
 	"github.com/spf13/cobra"
 
+	"github.com/rockset/cli/completion"
+	"github.com/rockset/cli/config"
+	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
 )

diff --git a/cmd/api_key.go b/cmd/api_key.go
@@ -2,15 +2,16 @@ package cmd
 
 import (
 	"fmt"
+
+	"github.com/rockset/rockset-go-client/openapi"
+	"github.com/rockset/rockset-go-client/option"
+	"github.com/spf13/cobra"
+
 	"github.com/rockset/cli/completion"
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
-	"github.com/rockset/rockset-go-client/openapi"
-	"github.com/spf13/cobra"
-
-	"github.com/rockset/rockset-go-client/option"
 )
 
 // TODO when implementing create apikey:

diff --git a/cmd/api_key_test.go b/cmd/api_key_test.go
@@ -4,12 +4,14 @@ package cmd_test
 
 import (
 	"fmt"
-	"github.com/rockset/cli/cmd"
-	"github.com/rockset/cli/internal/test"
+	"testing"
+
 	"github.com/rockset/rockset-go-client"
 	"github.com/rockset/rockset-go-client/option"
 	"github.com/stretchr/testify/suite"
-	"testing"
+
+	"github.com/rockset/cli/cmd"
+	"github.com/rockset/cli/internal/test"
 )
 
 type APIKeySuite struct {

diff --git a/cmd/auth.go b/cmd/auth.go
@@ -3,17 +3,17 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"github.com/dustin/go-humanize"
-	"github.com/rockset/rockset-go-client/option"
 	"io"
 	"log/slog"
 	"os"
 	"strings"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/dustin/go-humanize"
 	"github.com/pkg/browser"
 	devauth "github.com/rockset/device-authorization"
+	"github.com/rockset/rockset-go-client/option"
 	"github.com/spf13/cobra"
 
 	"github.com/rockset/cli/config"

diff --git a/cmd/collection.go b/cmd/collection.go
@@ -4,12 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/rockset/cli/completion"
-	"github.com/rockset/cli/config"
-	"github.com/rockset/cli/flag"
-	"github.com/rockset/cli/format"
-	"github.com/rockset/cli/sort"
-	"github.com/spf13/cobra"
 	"os"
 	"strings"
 	"time"
@@ -18,6 +12,13 @@ import (
 	"github.com/rockset/rockset-go-client/dataset"
 	"github.com/rockset/rockset-go-client/openapi"
 	"github.com/rockset/rockset-go-client/option"
+	"github.com/spf13/cobra"
+
+	"github.com/rockset/cli/completion"
+	"github.com/rockset/cli/config"
+	"github.com/rockset/cli/flag"
+	"github.com/rockset/cli/format"
+	"github.com/rockset/cli/sort"
 )
 
 func newDeleteCollectionCmd() *cobra.Command {

diff --git a/cmd/config.go b/cmd/config.go
@@ -3,14 +3,15 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/rockset/cli/flag"
 	"io"
 	"os"
 	"sort"
 
-	"github.com/rockset/cli/config"
 	"github.com/rockset/rockset-go-client"
 	"github.com/spf13/cobra"
+
+	"github.com/rockset/cli/config"
+	"github.com/rockset/cli/flag"
 )
 
 // config is the file containing the auth contexts

diff --git a/cmd/document.go b/cmd/document.go
@@ -2,11 +2,13 @@ package cmd
 
 import (
 	"fmt"
+
+	"github.com/spf13/cobra"
+	"log/slog"
+
 	"github.com/rockset/cli/completion"
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/flag"
-	"github.com/spf13/cobra"
-	"golang.org/x/exp/slog"
 )
 
 func newDeleteDocumentsCmd() *cobra.Command {

diff --git a/cmd/format.go b/cmd/format.go
@@ -1,9 +1,9 @@
 package cmd
 
 import (
-	"github.com/rockset/cli/flag"
 	"github.com/spf13/cobra"
 
+	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 )
 

diff --git a/cmd/integration.go b/cmd/integration.go
@@ -2,14 +2,15 @@ package cmd
 
 import (
 	"fmt"
+
+	"github.com/rockset/rockset-go-client/openapi"
+	"github.com/rockset/rockset-go-client/option"
+	"github.com/spf13/cobra"
+
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
-	"github.com/rockset/rockset-go-client/openapi"
-	"github.com/spf13/cobra"
-
-	"github.com/rockset/rockset-go-client/option"
 )
 
 func newGetIntegrationCmd() *cobra.Command {

diff --git a/cmd/organization.go b/cmd/organization.go
@@ -1,8 +1,9 @@
 package cmd
 
 import (
-	"github.com/rockset/cli/config"
 	"github.com/spf13/cobra"
+
+	"github.com/rockset/cli/config"
 )
 
 func newGetOrganizationCmd() *cobra.Command {

diff --git a/cmd/query.go b/cmd/query.go
@@ -3,19 +3,19 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"github.com/rockset/cli/flag"
 	"io"
 	"os"
 	"strings"
 
 	"github.com/chzyer/readline"
 	"github.com/spf13/cobra"
-	"golang.org/x/exp/slog"
+	"log/slog"
 
 	"github.com/rockset/rockset-go-client"
 	"github.com/rockset/rockset-go-client/openapi"
 
 	"github.com/rockset/cli/config"
+	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/tui"
 )

diff --git a/cmd/query_lambda.go b/cmd/query_lambda.go
@@ -2,16 +2,16 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/rockset/cli/completion"
-	"github.com/rockset/cli/config"
-	"github.com/rockset/cli/flag"
 	"os"
 	"strings"
 
 	"github.com/rockset/rockset-go-client/openapi"
 	"github.com/rockset/rockset-go-client/option"
 	"github.com/spf13/cobra"
 
+	"github.com/rockset/cli/completion"
+	"github.com/rockset/cli/config"
+	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
 )

diff --git a/cmd/query_lambda_test.go b/cmd/query_lambda_test.go
@@ -5,9 +5,10 @@ package cmd_test
 import (
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/rockset/cli/cmd"
 	"github.com/rockset/cli/internal/test"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestExecuteLambdaCmd(t *testing.T) {

diff --git a/cmd/roles.go b/cmd/roles.go
@@ -1,12 +1,13 @@
 package cmd
 
 import (
+	"github.com/rockset/rockset-go-client/openapi"
+	"github.com/spf13/cobra"
+
 	"github.com/rockset/cli/completion"
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
-	"github.com/rockset/rockset-go-client/openapi"
-	"github.com/spf13/cobra"
 )
 
 func newListRolesCommand() *cobra.Command {

diff --git a/cmd/root.go b/cmd/root.go
@@ -2,17 +2,17 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/mitchellh/go-homedir"
-	"github.com/rockset/cli/flag"
 	"os"
 	"path"
 	"strings"
 
+	"github.com/mitchellh/go-homedir"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
-	"golang.org/x/exp/slog"
+	"log/slog"
 
 	"github.com/rockset/cli/config"
+	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 )
 

diff --git a/cmd/stream.go b/cmd/stream.go
@@ -5,8 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-
-	"golang.org/x/exp/slog"
+	"log/slog"
 
 	"github.com/rockset/rockset-go-client/openapi"
 )

diff --git a/cmd/stream_test.go b/cmd/stream_test.go
@@ -2,16 +2,15 @@ package cmd_test
 
 import (
 	"context"
-	"github.com/rockset/cli/flag"
 	"os"
 	"testing"
 
+	"github.com/rockset/rockset-go-client/openapi"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/rockset/cli/cmd"
-
-	"github.com/rockset/rockset-go-client/openapi"
+	"github.com/rockset/cli/flag"
 )
 
 func TestStreamDocuments(t *testing.T) {

diff --git a/cmd/test.go b/cmd/test.go
@@ -3,12 +3,14 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"strings"
+	"time"
+
 	tea "github.com/charmbracelet/bubbletea"
+	"github.com/spf13/cobra"
+
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/tui"
-	"github.com/spf13/cobra"
-	"strings"
-	"time"
 )
 
 func newTestCmd() *cobra.Command {

diff --git a/cmd/user.go b/cmd/user.go
@@ -1,13 +1,13 @@
 package cmd
 
 import (
+	"github.com/rockset/rockset-go-client/openapi"
+	"github.com/spf13/cobra"
+
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
-	"github.com/spf13/cobra"
-
-	"github.com/rockset/rockset-go-client/openapi"
 )
 
 func newListUsersCmd() *cobra.Command {

diff --git a/cmd/version.go b/cmd/version.go
@@ -4,11 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/rockset/cli/flag"
-	"github.com/rockset/cli/tui"
-	"github.com/spf13/cobra"
 	"net/http"
 	"runtime/debug"
+
+	"github.com/spf13/cobra"
+
+	"github.com/rockset/cli/flag"
+	"github.com/rockset/cli/tui"
 )
 
 func newVersionCmd() *cobra.Command {

diff --git a/cmd/view.go b/cmd/view.go
@@ -1,15 +1,15 @@
 package cmd
 
 import (
+	"github.com/rockset/rockset-go-client/openapi"
+	"github.com/rockset/rockset-go-client/option"
+	"github.com/spf13/cobra"
+
 	"github.com/rockset/cli/completion"
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
-	"github.com/rockset/rockset-go-client/openapi"
-	"github.com/spf13/cobra"
-
-	"github.com/rockset/rockset-go-client/option"
 )
 
 func newListViewsCmd() *cobra.Command {

diff --git a/cmd/virtual_instance.go b/cmd/virtual_instance.go
@@ -4,17 +4,18 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"regexp"
+
+	"github.com/rockset/rockset-go-client"
+	"github.com/rockset/rockset-go-client/openapi"
+	"github.com/rockset/rockset-go-client/option"
+	"github.com/spf13/cobra"
+
 	"github.com/rockset/cli/completion"
 	"github.com/rockset/cli/config"
 	"github.com/rockset/cli/flag"
 	"github.com/rockset/cli/format"
 	"github.com/rockset/cli/sort"
-	"github.com/rockset/rockset-go-client/openapi"
-	"github.com/spf13/cobra"
-	"regexp"
-
-	"github.com/rockset/rockset-go-client"
-	"github.com/rockset/rockset-go-client/option"
 )
 
 func newCreateVirtualInstanceCmd() *cobra.Command {