Merge branch 'main' of https://github.com/slackapi/slack-cli into evegeris-sandbox-integration

Author: vegeris

.claude/CLAUDE.md

@@ -31,6 +31,10 @@ make lint               # Run golangci-lint
 golangci-lint --version # Verify linter version
 ```
 
+### Formatting
+
+Always run `gofmt -w` on changed Go files after making edits to ensure proper formatting.
+
 ### Other Commands
 
 ```bash

cmd/app/add.go

@@ -16,13 +16,11 @@ package app
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/slackapi/slack-cli/internal/app"
 	"github.com/slackapi/slack-cli/internal/cmdutil"
 	"github.com/slackapi/slack-cli/internal/config"
 	"github.com/slackapi/slack-cli/internal/experiment"
-	"github.com/slackapi/slack-cli/internal/logger"
 	"github.com/slackapi/slack-cli/internal/pkg/apps"
 	"github.com/slackapi/slack-cli/internal/prompts"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -186,11 +184,8 @@ func RunAddCommand(ctx context.Context, clients *shared.ClientFactory, selection
 
 	clients.Config.ManifestEnv = app.SetManifestEnvTeamVars(clients.Config.ManifestEnv, selection.App.TeamDomain, selection.App.IsDev)
 
-	// Set up event logger
-	log := newAddLogger(clients, selection.Auth.TeamDomain)
-
 	// Install dev app or prod app to a workspace
-	installedApp, installState, err := appInstall(ctx, clients, log, selection, orgGrantWorkspaceID)
+	installedApp, installState, err := appInstall(ctx, clients, selection, orgGrantWorkspaceID)
 	if err != nil {
 		return ctx, installState, types.App{}, err // pass the installState because some callers may use it to handle the error
 	}
@@ -201,74 +196,19 @@ func RunAddCommand(ctx context.Context, clients *shared.ClientFactory, selection
 	return ctx, installState, installedApp, nil
 }
 
-// newAddLogger creates a logger instance to receive event notifications
-func newAddLogger(clients *shared.ClientFactory, envName string) *logger.Logger {
-	return logger.New(
-		// OnEvent
-		func(event *logger.LogEvent) {
-			teamName := event.DataToString("teamName")
-			appName := event.DataToString("appName")
-			switch event.Name {
-			case "app_install_manifest":
-				// Ignore this event and format manifest outputs in create/update events
-			case "app_install_manifest_create":
-				_, _ = clients.IO.WriteOut().Write([]byte(style.Sectionf(style.TextSection{
-					Emoji: "books",
-					Text:  "App Manifest",
-					Secondary: []string{
-						fmt.Sprintf(`Creating app manifest for "%s" in "%s"`, appName, teamName),
-					},
-				})))
-			case "app_install_manifest_update":
-				_, _ = clients.IO.WriteOut().Write([]byte("\n" + style.Sectionf(style.TextSection{
-					Emoji: "books",
-					Text:  "App Manifest",
-					Secondary: []string{
-						fmt.Sprintf(`Updated app manifest for "%s" in "%s"`, appName, teamName),
-					},
-				})))
-			case "app_install_start":
-				_, _ = clients.IO.WriteOut().Write([]byte("\n" + style.Sectionf(style.TextSection{
-					Emoji: "house",
-					Text:  "App Install",
-					Secondary: []string{
-						fmt.Sprintf(`Installing "%s" app to "%s"`, appName, teamName),
-					},
-				})))
-			case "app_install_icon_success":
-				iconPath := event.DataToString("iconPath")
-				_, _ = clients.IO.WriteOut().Write([]byte(
-					style.SectionSecondaryf("Updated app icon: %s", iconPath),
-				))
-			case "app_install_icon_error":
-				iconError := event.DataToString("iconError")
-				_, _ = clients.IO.WriteOut().Write([]byte(
-					style.SectionSecondaryf("Error updating app icon: %s", iconError),
-				))
-			case "app_install_complete":
-				_, _ = clients.IO.WriteOut().Write([]byte(
-					style.SectionSecondaryf("Finished in %s", event.DataToString("installTime")),
-				))
-			default:
-				// Ignore the event
-			}
-		},
-	)
-}
-
 // printAddSuccess will print a list of the environments
 func printAddSuccess(clients *shared.ClientFactory, cmd *cobra.Command, appInstance types.App) error {
 	return runListCommand(cmd, clients)
 }
 
 // appInstall will install an app to a team. It supports both local and deployed app types.
-func appInstall(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger, selection *prompts.SelectedApp, orgGrantWorkspaceID string) (types.App, types.InstallState, error) {
+func appInstall(ctx context.Context, clients *shared.ClientFactory, selection *prompts.SelectedApp, orgGrantWorkspaceID string) (types.App, types.InstallState, error) {
 	if selection != nil && selection.App.IsDev {
 		// Install local dev app to a team
-		installedApp, _, installState, err := appInstallDevAppFunc(ctx, clients, "", log, selection.Auth, selection.App)
+		installedApp, _, installState, err := appInstallDevAppFunc(ctx, clients, "", selection.Auth, selection.App)
 		return installedApp, installState, err
 	} else {
-		installState, installedApp, err := appInstallProdAppFunc(ctx, clients, log, selection.Auth, selection.App, orgGrantWorkspaceID)
+		installState, installedApp, err := appInstallProdAppFunc(ctx, clients, selection.Auth, selection.App, orgGrantWorkspaceID)
 		return installedApp, installState, err
 	}
 }

cmd/app/delete.go

@@ -20,7 +20,6 @@ import (
 
 	"github.com/slackapi/slack-cli/internal/cmdutil"
 	"github.com/slackapi/slack-cli/internal/iostreams"
-	"github.com/slackapi/slack-cli/internal/logger"
 	"github.com/slackapi/slack-cli/internal/pkg/apps"
 	"github.com/slackapi/slack-cli/internal/prompts"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -99,30 +98,14 @@ func RunDeleteCommand(ctx context.Context, clients *shared.ClientFactory, cmd *c
 		}
 	}
 
-	// Set up event logger and execute the command
-	log := newDeleteLogger(clients, cmd, team)
-	log.Data["appID"] = selection.App.AppID
-	env, err := apps.Delete(ctx, clients, log, team, selection.App, selection.Auth)
-
-	return env, err
-}
+	// Execute the command
+	env, teamName, err := apps.Delete(ctx, clients, team, selection.App, selection.Auth)
+	if err != nil {
+		return env, err
+	}
+	printDeleteApp(ctx, clients, selection.App.AppID, teamName)
 
-// newDeleteLogger creates a logger instance to receive event notifications
-func newDeleteLogger(clients *shared.ClientFactory, cmd *cobra.Command, envName string) *logger.Logger {
-	ctx := cmd.Context()
-	return logger.New(
-		// OnEvent
-		func(event *logger.LogEvent) {
-			appID := event.DataToString("appID")
-			teamName := event.DataToString("teamName")
-			switch event.Name {
-			case "on_apps_delete_app_success":
-				printDeleteApp(ctx, clients, appID, teamName)
-			default:
-				// Ignore the event
-			}
-		},
-	)
+	return env, nil
 }
 
 func confirmDeletion(ctx context.Context, IO iostreams.IOStreamer, app prompts.SelectedApp) (bool, error) {

cmd/app/link.go

@@ -18,13 +18,13 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-	"slices"
 	"strings"
 
 	"github.com/slackapi/slack-cli/internal/cmdutil"
 	"github.com/slackapi/slack-cli/internal/config"
 	"github.com/slackapi/slack-cli/internal/iostreams"
 	"github.com/slackapi/slack-cli/internal/pkg/apps"
+	"github.com/slackapi/slack-cli/internal/prompts"
 	"github.com/slackapi/slack-cli/internal/shared"
 	"github.com/slackapi/slack-cli/internal/shared/types"
 	"github.com/slackapi/slack-cli/internal/slackerror"
@@ -262,7 +262,7 @@ func LinkAppFooterSection(ctx context.Context, clients *shared.ClientFactory, ap
 
 // promptExistingApp gathers details to represent app information
 func promptExistingApp(ctx context.Context, clients *shared.ClientFactory) (types.App, *types.SlackAuth, error) {
-	slackAuth, err := promptTeamSlackAuth(ctx, clients)
+	slackAuth, err := prompts.PromptTeamSlackAuth(ctx, clients, "Select the existing app team")
 	if err != nil {
 		return types.App{}, &types.SlackAuth{}, err
 	}
@@ -291,61 +291,6 @@ func promptExistingApp(ctx context.Context, clients *shared.ClientFactory) (type
 	return apps[0], slackAuth, nil
 }
 
-// promptTeamSlackAuth retrieves an authenticated team from input
-func promptTeamSlackAuth(ctx context.Context, clients *shared.ClientFactory) (*types.SlackAuth, error) {
-	allAuths, err := clients.Auth().Auths(ctx)
-	if err != nil {
-		return &types.SlackAuth{}, err
-	}
-	slices.SortFunc(allAuths, func(i, j types.SlackAuth) int {
-		if i.TeamDomain == j.TeamDomain {
-			return strings.Compare(i.TeamID, j.TeamID)
-		}
-		return strings.Compare(i.TeamDomain, j.TeamDomain)
-	})
-	var teamLabels []string
-	for _, auth := range allAuths {
-		teamLabels = append(
-			teamLabels,
-			style.TeamSelectLabel(auth.TeamDomain, auth.TeamID),
-		)
-	}
-	selection, err := clients.IO.SelectPrompt(
-		ctx,
-		"Select the existing app team",
-		teamLabels,
-		iostreams.SelectPromptConfig{
-			Required: true,
-			Flag:     clients.Config.Flags.Lookup("team"),
-		},
-	)
-	if err != nil {
-		return &types.SlackAuth{}, err
-	}
-	if selection.Prompt {
-		clients.Auth().SetSelectedAuth(ctx, allAuths[selection.Index], clients.Config, clients.Os)
-		return &allAuths[selection.Index], nil
-	}
-	teamMatch := false
-	teamIndex := -1
-	for ii, auth := range allAuths {
-		if selection.Option == auth.TeamID || selection.Option == auth.TeamDomain {
-			if teamMatch {
-				return &types.SlackAuth{}, slackerror.New(slackerror.ErrMissingAppTeamID).
-					WithMessage("The team cannot be determined by team domain").
-					WithRemediation("Provide the team ID for the installed app")
-			}
-			teamMatch = true
-			teamIndex = ii
-		}
-	}
-	if !teamMatch {
-		return &types.SlackAuth{}, slackerror.New(slackerror.ErrCredentialsNotFound)
-	}
-	clients.Auth().SetSelectedAuth(ctx, allAuths[teamIndex], clients.Config, clients.Os)
-	return &allAuths[teamIndex], nil
-}
-
 // promptAppID retrieves an app ID from user input
 func promptAppID(ctx context.Context, clients *shared.ClientFactory) (string, error) {
 	if clients.Config.Flags.Lookup("app").Changed {

cmd/app/uninstall.go

@@ -20,7 +20,6 @@ import (
 
 	"github.com/slackapi/slack-cli/internal/cmdutil"
 	"github.com/slackapi/slack-cli/internal/iostreams"
-	"github.com/slackapi/slack-cli/internal/logger"
 	"github.com/slackapi/slack-cli/internal/pkg/apps"
 	"github.com/slackapi/slack-cli/internal/prompts"
 	"github.com/slackapi/slack-cli/internal/shared"
@@ -94,30 +93,14 @@ func RunUninstallCommand(ctx context.Context, clients *shared.ClientFactory, cmd
 		}
 	}
 
-	// Set up event logger and execute the command
-	log := newUninstallLogger(clients, cmd, teamDomain)
-	log.Data["appID"] = selection.App.AppID
-	env, err := apps.Uninstall(ctx, clients, log, teamDomain, selection.App, selection.Auth)
-
-	return env, err
-}
+	// Execute the command
+	env, teamName, err := apps.Uninstall(ctx, clients, teamDomain, selection.App, selection.Auth)
+	if err != nil {
+		return env, err
+	}
+	printUninstallApp(ctx, clients, selection.App.AppID, teamName)
 
-// newUninstallLogger creates a logger instance to receive event notifications
-func newUninstallLogger(clients *shared.ClientFactory, cmd *cobra.Command, envName string) *logger.Logger {
-	ctx := cmd.Context()
-	return logger.New(
-		// OnEvent
-		func(event *logger.LogEvent) {
-			appID := event.DataToString("appID")
-			teamName := event.DataToString("teamName")
-			switch event.Name {
-			case "on_apps_uninstall_app_success":
-				printUninstallApp(ctx, clients, appID, teamName)
-			default:
-				// Ignore the event
-			}
-		},
-	)
+	return env, nil
 }
 
 func confirmUninstall(ctx context.Context, IO iostreams.IOStreamer, cmd *cobra.Command, selection prompts.SelectedApp) (bool, error) {

cmd/auth/auth_test.go

@@ -19,7 +19,6 @@ import (
 	"testing"
 
 	"github.com/slackapi/slack-cli/internal/hooks"
-	"github.com/slackapi/slack-cli/internal/logger"
 	"github.com/slackapi/slack-cli/internal/shared"
 	"github.com/slackapi/slack-cli/internal/shared/types"
 	"github.com/slackapi/slack-cli/internal/slackcontext"
@@ -32,7 +31,7 @@ type listMockObject struct {
 	mock.Mock
 }
 
-func (m *listMockObject) MockListFunction(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger) ([]types.SlackAuth, error) {
+func (m *listMockObject) MockListFunction(ctx context.Context, clients *shared.ClientFactory) ([]types.SlackAuth, error) {
 	args := m.Called()
 	return args.Get(0).([]types.SlackAuth), args.Error(1)
 }

cmd/auth/list.go

@@ -18,7 +18,6 @@ import (
 	"fmt"
 
 	"github.com/slackapi/slack-cli/internal/iostreams"
-	"github.com/slackapi/slack-cli/internal/logger"
 	"github.com/slackapi/slack-cli/internal/pkg/auth"
 	"github.com/slackapi/slack-cli/internal/shared"
 	"github.com/slackapi/slack-cli/internal/shared/types"
@@ -52,34 +51,15 @@ func NewListCommand(clients *shared.ClientFactory) *cobra.Command {
 // runListCommand will execute the list command
 func runListCommand(cmd *cobra.Command, clients *shared.ClientFactory) error {
 	ctx := cmd.Context()
-	log := newListLogger(cmd, clients.IO)
-	userAuthList, err := listFunc(ctx, clients, log)
+	userAuthList, err := listFunc(ctx, clients)
 	if err != nil {
 		return err
 	}
+	printAuthList(cmd, clients.IO, userAuthList)
 	printAuthListSuccess(cmd, clients.IO, userAuthList)
 	return nil
 }
 
-// newListLogger creates a logger instance to receive event notifications
-func newListLogger(cmd *cobra.Command, IO iostreams.IOStreamer) *logger.Logger {
-	return logger.New(
-		// OnEvent
-		func(event *logger.LogEvent) {
-			switch event.Name {
-			case "on_auth_list":
-				userAuthList := []types.SlackAuth{}
-				if event.Data["userAuthList"] != nil {
-					userAuthList = event.Data["userAuthList"].([]types.SlackAuth)
-				}
-				printAuthList(cmd, IO, userAuthList)
-			default:
-				// Ignore the event
-			}
-		},
-	)
-}
-
 // printAuthList will display a list of all authorizations available and highlight the default.
 // The output will be a list formatted as:
 //

cmd/auth/list_test.go

@@ -18,7 +18,6 @@ import (
 	"context"
 	"testing"
 
-	"github.com/slackapi/slack-cli/internal/logger"
 	"github.com/slackapi/slack-cli/internal/shared"
 	"github.com/slackapi/slack-cli/internal/shared/types"
 	"github.com/slackapi/slack-cli/internal/slackcontext"
@@ -32,7 +31,7 @@ type ListPkgMock struct {
 	mock.Mock
 }
 
-func (m *ListPkgMock) List(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger) ([]types.SlackAuth, error) {
+func (m *ListPkgMock) List(ctx context.Context, clients *shared.ClientFactory) ([]types.SlackAuth, error) {
 	m.Called()
 	return []types.SlackAuth{}, nil
 }