From ca429e9bf81ff75b8799cd47c3ef5f9d34a2b7ba Mon Sep 17 00:00:00 2001
From: Vaibhav Kamra <vkamra@alcion.ai>
Date: Thu, 17 Nov 2022 20:36:43 -0800
Subject: [PATCH] Refactor getItem

---
 src/cmd/getM365/{ => exchange}/getItem.go | 48 ++++++++---------------
 src/cmd/getM365/main.go                   | 37 +++++++++++++++++
 src/internal/tester/config.go             |  2 +-
 3 files changed, 54 insertions(+), 33 deletions(-)
 rename src/cmd/getM365/{ => exchange}/getItem.go (75%)
 create mode 100644 src/cmd/getM365/main.go

diff --git a/src/cmd/getM365/getItem.go b/src/cmd/getM365/exchange/getItem.go
similarity index 75%
rename from src/cmd/getM365/getItem.go
rename to src/cmd/getM365/exchange/getItem.go
index 9b2477006..21305b794 100644
--- a/src/cmd/getM365/getItem.go
+++ b/src/cmd/getM365/exchange/getItem.go
@@ -2,7 +2,7 @@
 // existing M365 account. Data displayed is representative of the current
 // serialization abstraction versioning used by Microsoft Graph and stored by Corso.
 
-package main
+package exchange
 
 import (
 	"bytes"
@@ -24,52 +24,36 @@ import (
 	"github.com/alcionai/corso/src/internal/data"
 	"github.com/alcionai/corso/src/pkg/account"
 	"github.com/alcionai/corso/src/pkg/credentials"
-	"github.com/alcionai/corso/src/pkg/logger"
 	"github.com/alcionai/corso/src/pkg/path"
 )
 
-var getCmd = &cobra.Command{
-	Use:   "get",
-	Short: "Get a M365ID item JSON",
-	RunE:  handleGetCommand,
-}
-
 // Required inputs from user for command execution
 var (
-	tenant, user, m365ID, category string
+	user, tenant, m365ID, category string
 )
 
-// main function will produce the JSON String for a given m365 object of a
-// user. Displayed Objects can be used as inputs for Mockable data
-// Supports:
-// - exchange (contacts, email, and events)
-// Input: go run ./getItem.go     --user <user>
-//
-//	--m365ID <m365ID> --category <oneof: contacts, email, events>
-func main() {
-	ctx, _ := logger.SeedLevel(context.Background(), logger.Development)
-	ctx = SetRootCmd(ctx, getCmd)
+func AddCommands(parent *cobra.Command, userFlag, tenantFlag string) {
+	user = userFlag
+	tenant = tenantFlag
 
-	defer logger.Flush(ctx)
+	exCmd := &cobra.Command{
+		Use:   "exchange",
+		Short: "Get a M365ID item JSON",
+		RunE:  handleExchangeCmd,
+	}
 
-	fs := getCmd.PersistentFlags()
-	fs.StringVar(&user, "user", "", "m365 user id of M365 user")
-	fs.StringVar(&tenant, "tenant", "",
-		"m365 Tenant: m365 identifier for the tenant, not required if active in OS Environment")
+	fs := exCmd.PersistentFlags()
 	fs.StringVar(&m365ID, "m365ID", "", "m365 identifier for object to be created")
 	fs.StringVar(&category, "category", "", "type of M365 data (contacts, email, events or files)") // files not supported
 
-	cobra.CheckErr(getCmd.MarkPersistentFlagRequired("user"))
-	cobra.CheckErr(getCmd.MarkPersistentFlagRequired("m365ID"))
-	cobra.CheckErr(getCmd.MarkPersistentFlagRequired("category"))
+	cobra.CheckErr(exCmd.MarkPersistentFlagRequired("user"))
+	cobra.CheckErr(exCmd.MarkPersistentFlagRequired("m365ID"))
+	cobra.CheckErr(exCmd.MarkPersistentFlagRequired("category"))
 
-	if err := getCmd.ExecuteContext(ctx); err != nil {
-		logger.Flush(ctx)
-		os.Exit(1)
-	}
+	parent.AddCommand(exCmd)
 }
 
-func handleGetCommand(cmd *cobra.Command, args []string) error {
+func handleExchangeCmd(cmd *cobra.Command, args []string) error {
 	ctx := cmd.Context()
 
 	if utils.HasNoFlagsAndShownHelp(cmd) {
diff --git a/src/cmd/getM365/main.go b/src/cmd/getM365/main.go
new file mode 100644
index 000000000..213e01854
--- /dev/null
+++ b/src/cmd/getM365/main.go
@@ -0,0 +1,37 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+
+	. "github.com/alcionai/corso/src/cli/print"
+	"github.com/alcionai/corso/src/cmd/getM365/exchange"
+	"github.com/alcionai/corso/src/pkg/logger"
+)
+
+var user, tenant string
+
+var rootCmd = &cobra.Command{
+	Use: "getM365",
+}
+
+func main() {
+	ctx, _ := logger.SeedLevel(context.Background(), logger.Development)
+
+	ctx = SetRootCmd(ctx, rootCmd)
+	defer logger.Flush(ctx)
+
+	rootCmd.PersistentFlags().StringVar(&user, "user", "", "m365 user id of M365 user")
+	rootCmd.PersistentFlags().StringVar(&tenant, "tenant", "",
+		"m365 Tenant: m365 identifier for the tenant, not required if active in OS Environment")
+
+	exchange.AddCommands(rootCmd, user, tenant)
+
+	if err := rootCmd.Execute(); err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
+}
diff --git a/src/internal/tester/config.go b/src/internal/tester/config.go
index 078fcfadc..9ccfb6ec6 100644
--- a/src/internal/tester/config.go
+++ b/src/internal/tester/config.go
@@ -122,7 +122,7 @@ func readTestConfig() (map[string]string, error) {
 		TestCfgSecondaryUserID,
 		os.Getenv(EnvCorsoSecondaryM365TestUserID),
 		vpr.GetString(TestCfgSecondaryUserID),
-		"lidiah@8qzvrj.onmicrosoft.com",
+		"adelev@8qzvrj.onmicrosoft.com",
 		//"lynner@8qzvrj.onmicrosoft.com",
 	)
 	fallbackTo(