refactor: remove DeployResult from Deploy func

Author: mwbrooks

cmd/platform/deploy.go

@@ -89,7 +89,7 @@ func NewDeployCommand(clients *shared.ClientFactory) *cobra.Command {
 				}
 			default:
 				showTriggers := triggers.ShowTriggers(clients, deployFlags.hideTriggers)
-				_, err = deployFunc(ctx, clients, showTriggers, app)
+				err = deployFunc(ctx, clients, showTriggers, app)
 				if err != nil {
 					return err
 				}

cmd/platform/deploy_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/slackapi/slack-cli/internal/config"
 	"github.com/slackapi/slack-cli/internal/hooks"
 	"github.com/slackapi/slack-cli/internal/iostreams"
-	"github.com/slackapi/slack-cli/internal/pkg/platform"
 	"github.com/slackapi/slack-cli/internal/prompts"
 	"github.com/slackapi/slack-cli/internal/shared"
 	"github.com/slackapi/slack-cli/internal/shared/types"
@@ -44,9 +43,9 @@ type DeployPkgMock struct {
 	mock.Mock
 }
 
-func (m *DeployPkgMock) Deploy(ctx context.Context, clients *shared.ClientFactory, showPrompts bool, app types.App) (platform.DeployResult, error) {
+func (m *DeployPkgMock) Deploy(ctx context.Context, clients *shared.ClientFactory, showPrompts bool, app types.App) error {
 	args := m.Called(ctx, clients, showPrompts, app)
-	return args.Get(0).(platform.DeployResult), args.Error(1)
+	return args.Error(0)
 }
 
 // Setup a mock for Install package
@@ -79,9 +78,7 @@ func TestDeployCommand(t *testing.T) {
 
 	deployPkgMock := new(DeployPkgMock)
 	deployFunc = deployPkgMock.Deploy
-	deployPkgMock.On("Deploy", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(platform.DeployResult{
-		AuthSession: "{}",
-	}, nil)
+	deployPkgMock.On("Deploy", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 
 	appSelectMock := prompts.NewAppSelectMock()
 	appSelectMock.On("AppSelectPrompt", mock.Anything, mock.Anything, prompts.ShowHostedOnly, prompts.ShowAllApps).Return(prompts.SelectedApp{}, nil)

internal/pkg/platform/deploy.go

@@ -17,7 +17,6 @@ package platform
 import (
 	"archive/zip"
 	"context"
-	"encoding/json"
 	"fmt"
 	"io"
 	"os"
@@ -37,25 +36,25 @@ import (
 )
 
 // Deploy will package and upload an app to the Slack Platform
-func Deploy(ctx context.Context, clients *shared.ClientFactory, showTriggers bool, app types.App) (DeployResult, error) {
+func Deploy(ctx context.Context, clients *shared.ClientFactory, showTriggers bool, app types.App) error {
 	span, ctx := opentracing.StartSpanFromContext(ctx, "cmd.deploy")
 	defer span.Finish()
 
 	// Get auth token
 	token := config.GetContextToken(ctx)
 	if strings.TrimSpace(token) == "" {
-		return DeployResult{}, slackerror.New(slackerror.ErrAuthToken)
+		return slackerror.New(slackerror.ErrAuthToken)
 	}
 
 	if app.IsNew() {
 		err := slackerror.New("no app found to deploy")
-		return DeployResult{}, slackerror.Wrap(err, slackerror.ErrAppDeploy)
+		return slackerror.Wrap(err, slackerror.ErrAppDeploy)
 	}
 
 	// Validate auth session
 	authSession, err := clients.API().ValidateSession(ctx, token)
 	if err != nil {
-		return DeployResult{}, slackerror.Wrap(err, slackerror.ErrSlackAuth)
+		return slackerror.Wrap(err, slackerror.ErrSlackAuth)
 	}
 
 	// Add enterprise_id returned from auth session to app if exists
@@ -66,8 +65,6 @@ func Deploy(ctx context.Context, clients *shared.ClientFactory, showTriggers boo
 		// TODO: should we also SetAppEnterpriseID for metrics tracking?
 	}
 
-	authString, _ := json.Marshal(authSession)
-	authSessionJSON := string(authString)
 	if authSession.UserID != nil {
 		ctx = config.SetContextUserID(ctx, *authSession.UserID)
 		clients.EventTracker.SetAuthUserID(*authSession.UserID)
@@ -79,37 +76,31 @@ func Deploy(ctx context.Context, clients *shared.ClientFactory, showTriggers boo
 	// updating an app manifest should happen before an app is deployed.
 	manifest, err := clients.AppClient().Manifest.GetManifestRemote(ctx, token, app.AppID)
 	if err != nil {
-		return DeployResult{}, slackerror.Wrap(err, slackerror.ErrAppManifestAccess)
+		return slackerror.Wrap(err, slackerror.ErrAppManifestAccess)
 	}
-	appName := manifest.DisplayInformation.Name
 
 	if showTriggers {
 		// Generate an optional trigger when none exist
 		_, err = triggers.TriggerGenerate(ctx, clients, app)
 		if err != nil {
-			return DeployResult{}, slackerror.Wrap(err, slackerror.ErrAppDeploy)
+			return slackerror.Wrap(err, slackerror.ErrAppDeploy)
 		}
 	}
 
 	// deploy the app
-	appID, deployTime, err := deployApp(ctx, clients, app, manifest, authSession)
+	_, _, err = deployApp(ctx, clients, app, manifest, authSession)
 	if err != nil {
-		return DeployResult{}, slackerror.Wrap(err, slackerror.ErrAppDeploy)
+		return slackerror.Wrap(err, slackerror.ErrAppDeploy)
 	}
 
 	// Save app to apps.json
 	if !clients.Config.SkipLocalFs() {
 		if err := clients.AppClient().SaveDeployed(ctx, app); err != nil {
-			return DeployResult{}, slackerror.Wrap(err, slackerror.ErrAppDeploy)
+			return slackerror.Wrap(err, slackerror.ErrAppDeploy)
 		}
 	}
 
-	return DeployResult{
-		AppName:     appName,
-		AppID:       appID,
-		DeployTime:  deployTime,
-		AuthSession: authSessionJSON,
-	}, nil
+	return nil
 }
 
 func deployApp(ctx context.Context, clients *shared.ClientFactory, app types.App, manifest types.SlackYaml, authSession api.AuthSession) (string, string, error) {
@@ -246,14 +237,6 @@ func deploySuccessText(clients *shared.ClientFactory, app types.App, manifest ty
 	})
 }
 
-// DeployResult contains data collected during the deploy process for output
-type DeployResult struct {
-	AppName     string
-	AppID       string
-	DeployTime  string
-	AuthSession string
-}
-
 type packageResult struct {
 	Filename string
 	Size     int64