re-use common code

Author: darkoatanasovski

README.md

@@ -10,7 +10,7 @@
 > - The command invocation is `stream-cli chat [verb-noun] [args] [options]` instead of `stream [verb:noun] [args] [options]`. The most obvious change is using dash instead of colon. We also added the `chat` keyword to preserve domain for our other product [Feeds](https://getstream.io/activity-feeds/).
 > - The 1.0.0 Go version's feature set is matching the old one. But if you miss anything, feel free to open an issue.
 
-Stream's Command Line Interface (CLI) makes it easy to create and manage your [Stream](https://getstream.io) apps directly from the terminal. Currently, only Chat is supported; however, the ability to manage Feeds will be coming soon.
+Stream's Command Line Interface (CLI) makes it easy to create and manage your [Stream](https://getstream.io) apps directly from the terminal. It supports both Chat and Feeds, including a unified `import` command for data imports.
 
 # 📚 Documentation
 The full documentation is deployed to [GitHub Pages](https://getstream.github.io/stream-cli/).
@@ -85,13 +85,19 @@ stream-cli version 1.0.0
 Basic commands use the following syntax:
 
 ```shell
-$ stream-cli [chat|feeds] [command] [args] [options]
+$ stream-cli [chat|import] [command] [args] [options]
 ```
 
-Example:
+Examples:
 
 ```shell
 $ stream-cli chat get-channel -t messaging -i redteam
+
+# Import data into Chat
+$ stream-cli import chat upload-import data.json --mode insert
+
+# Import data into Feeds
+$ stream-cli import feeds upload-import data.json
 ```
 
 The `--help` keyword is available every step of the way. Examples:
@@ -100,6 +106,9 @@ The `--help` keyword is available every step of the way. Examples:
 $ stream-cli --help
 $ stream-cli chat --help
 $ stream-cli chat get-channel --help
+$ stream-cli import --help
+$ stream-cli import chat --help
+$ stream-cli import feeds --help
 ```
 
 # 💬 Auto completion

pkg/cmd/chat/imports/imports.go

@@ -1,9 +1,6 @@
 package imports
 
 import (
-	"context"
-	"net/http"
-	"os"
 	"path/filepath"
 	"time"
 
@@ -23,44 +20,16 @@ func NewCmds() []*cobra.Command {
 	}
 }
 
-func uploadToS3(ctx context.Context, filename, url string) error {
-	data, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	defer data.Close()
-
-	stat, err := data.Stat()
-	if err != nil {
-		return err
-	}
-
-	req, err := http.NewRequestWithContext(ctx, "PUT", url, data)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.ContentLength = stat.Size()
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	return nil
-}
-
 func uploadCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "upload-import [filename] --mode [upsert|insert] --output-format [json|tree]",
 		Short: "Upload an import",
 		Example: heredoc.Doc(`
 			# Uploads an import and prints it as JSON
-			$ stream-cli chat upload-import data.json --mode insert
+			$ stream-cli import chat upload-import data.json --mode insert
 
 			# Uploads an import and prints it as a browsable tree
-			$ stream-cli chat upload-import data.json --mode insert --output-format tree
+			$ stream-cli import chat upload-import data.json --mode insert --output-format tree
 		`),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -87,7 +56,7 @@ func uploadCmd() *cobra.Command {
 				return err
 			}
 
-			if err := uploadToS3(cmd.Context(), filename, createImportURLResp.UploadURL); err != nil {
+			if err := utils.UploadToS3(cmd.Context(), filename, createImportURLResp.UploadURL); err != nil {
 				return err
 			}
 			createImportResp, err := c.CreateImport(cmd.Context(), createImportURLResp.Path, mode, opts...)
@@ -114,10 +83,10 @@ func getCmd() *cobra.Command {
 		Short: "Get import",
 		Example: heredoc.Doc(`
 			# Returns an import and prints it as JSON
-			$ stream-cli chat get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272
+			$ stream-cli import chat get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272
 
 			# Returns an import and prints it as JSON, and wait for it to complete
-			$ stream-cli chat get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272 --watch
+			$ stream-cli import chat get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272 --watch
 		`),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -164,10 +133,10 @@ func listCmd() *cobra.Command {
 		Short: "List imports",
 		Example: heredoc.Doc(`
 			# List all imports as json (default)
-			$ stream-cli chat list-imports
+			$ stream-cli import chat list-imports
 
 			# List all imports as browsable tree
-			$ stream-cli chat list-imports --output-format tree
+			$ stream-cli import chat list-imports --output-format tree
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			c, err := config.GetConfig(cmd).GetClient(cmd)

pkg/cmd/chat/root.go

@@ -9,7 +9,6 @@ import (
 	"github.com/GetStream/stream-cli/pkg/cmd/chat/device"
 	"github.com/GetStream/stream-cli/pkg/cmd/chat/events"
 	"github.com/GetStream/stream-cli/pkg/cmd/chat/file"
-	"github.com/GetStream/stream-cli/pkg/cmd/chat/imports"
 	"github.com/GetStream/stream-cli/pkg/cmd/chat/message"
 	"github.com/GetStream/stream-cli/pkg/cmd/chat/push"
 	"github.com/GetStream/stream-cli/pkg/cmd/chat/reaction"
@@ -29,7 +28,6 @@ func NewRootCmd() *cobra.Command {
 	cmd.AddCommand(device.NewCmds()...)
 	cmd.AddCommand(events.NewCmds()...)
 	cmd.AddCommand(file.NewCmds()...)
-	cmd.AddCommand(imports.NewCmds()...)
 	cmd.AddCommand(message.NewCmds()...)
 	cmd.AddCommand(user.NewCmds()...)
 	cmd.AddCommand(push.NewCmds()...)

pkg/cmd/feeds/imports/imports.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"os"
 	"path/filepath"
 	"strings"
 	"time"
@@ -76,44 +75,16 @@ func getImportV2Task(ctx context.Context, app *config.App, id string) (map[strin
 	return result, nil
 }
 
-func uploadToS3(ctx context.Context, filename, url string) error {
-	data, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	defer data.Close()
-
-	stat, err := data.Stat()
-	if err != nil {
-		return err
-	}
-
-	req, err := http.NewRequestWithContext(ctx, "PUT", url, data)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.ContentLength = stat.Size()
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	return nil
-}
-
 func uploadCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "upload-import [filename] --output-format [json|tree]",
 		Short: "Upload an import for Feeds",
 		Example: heredoc.Doc(`
 			# Uploads a feeds import and prints it as JSON
-			$ stream-cli feeds upload-import data.json
+			$ stream-cli import feeds upload-import data.json
 
 			# Uploads a feeds import and prints it as a browsable tree
-			$ stream-cli feeds upload-import data.json --output-format tree
+			$ stream-cli import feeds upload-import data.json --output-format tree
 		`),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -130,7 +101,7 @@ func uploadCmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			if err := uploadToS3(cmd.Context(), filename, createURLResp.Data.UploadUrl); err != nil {
+			if err := utils.UploadToS3(cmd.Context(), filename, createURLResp.Data.UploadUrl); err != nil {
 				return err
 			}
 
@@ -177,10 +148,10 @@ func getCmd() *cobra.Command {
 		Short: "Get a feeds import task",
 		Example: heredoc.Doc(`
 			# Returns a feeds import and prints it as JSON
-			$ stream-cli feeds get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272
+			$ stream-cli import feeds get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272
 
 			# Returns a feeds import and watches for completion
-			$ stream-cli feeds get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272 --watch
+			$ stream-cli import feeds get-import dcb6e366-93ec-4e52-af6f-b0c030ad5272 --watch
 		`),
 		Args: cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -228,13 +199,13 @@ func listCmd() *cobra.Command {
 		Short: "List feeds import tasks",
 		Example: heredoc.Doc(`
 			# List all feeds imports as json (default)
-			$ stream-cli feeds list-imports
+			$ stream-cli import feeds list-imports
 
 			# List feeds imports filtered by state
-			$ stream-cli feeds list-imports --state 2
+			$ stream-cli import feeds list-imports --state 2
 
 			# List all feeds imports as browsable tree
-			$ stream-cli feeds list-imports --output-format tree
+			$ stream-cli import feeds list-imports --output-format tree
 		`),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			client, err := config.GetConfig(cmd).GetFeedsClient(cmd)

pkg/cmd/feeds/root.go

@@ -0,0 +1,31 @@
+package importcmd
+
+import (
+	"github.com/spf13/cobra"
+
+	chatImports "github.com/GetStream/stream-cli/pkg/cmd/chat/imports"
+	feedsImports "github.com/GetStream/stream-cli/pkg/cmd/feeds/imports"
+)
+
+func NewRootCmd() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "import",
+		Short: "Import data into your Stream applications",
+	}
+
+	chatCmd := &cobra.Command{
+		Use:   "chat",
+		Short: "Import data into Chat",
+	}
+	chatCmd.AddCommand(chatImports.NewCmds()...)
+
+	feedsCmd := &cobra.Command{
+		Use:   "feeds",
+		Short: "Import data into Feeds",
+	}
+	feedsCmd.AddCommand(feedsImports.NewCmds()...)
+
+	cmd.AddCommand(chatCmd, feedsCmd)
+
+	return cmd
+}

pkg/cmd/importcmd/root.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/GetStream/stream-cli/pkg/cmd/chat"
 	cfgCmd "github.com/GetStream/stream-cli/pkg/cmd/config"
-	feedsCmd "github.com/GetStream/stream-cli/pkg/cmd/feeds"
+	"github.com/GetStream/stream-cli/pkg/cmd/importcmd"
 	"github.com/GetStream/stream-cli/pkg/config"
 	"github.com/GetStream/stream-cli/pkg/version"
 )
@@ -29,6 +29,12 @@ func NewCmd() *cobra.Command {
 
 			# Create a new Chat user
 			$ stream-cli chat upsert-user --properties "{\"id\":\"my-user-1\"}"
+
+			# Upload a chat import
+			$ stream-cli import chat upload-import data.json --mode insert
+
+			# Upload a feeds import
+			$ stream-cli import feeds upload-import data.json
 		`),
 		Version: version.FmtVersion(),
 	}
@@ -40,7 +46,7 @@ func NewCmd() *cobra.Command {
 	root.AddCommand(
 		cfgCmd.NewRootCmd(),
 		chat.NewRootCmd(),
-		feedsCmd.NewRootCmd(),
+		importcmd.NewRootCmd(),
 	)
 
 	cobra.OnInitialize(config.GetInitConfig(root, cfgPath))

pkg/cmd/root/root.go

@@ -0,0 +1,36 @@
+package utils
+
+import (
+	"context"
+	"net/http"
+	"os"
+)
+
+// UploadToS3 uploads a local file to the given S3 presigned URL via HTTP PUT.
+func UploadToS3(ctx context.Context, filename, url string) error {
+	data, err := os.Open(filename)
+	if err != nil {
+		return err
+	}
+	defer data.Close()
+
+	stat, err := data.Stat()
+	if err != nil {
+		return err
+	}
+
+	req, err := http.NewRequestWithContext(ctx, "PUT", url, data)
+	if err != nil {
+		return err
+	}
+	req.Header.Set("Content-Type", "application/json")
+	req.ContentLength = stat.Size()
+
+	resp, err := http.DefaultClient.Do(req)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	return nil
+}