@@ -23,12 +23,12 @@ import (
2323 "github.com/slackapi/slack-cli/cmd/feedback"
2424 "github.com/slackapi/slack-cli/cmd/triggers"
2525 "github.com/slackapi/slack-cli/internal/config"
26- "github.com/slackapi/slack-cli/internal/logger"
2726 "github.com/slackapi/slack-cli/internal/pkg/apps"
2827 "github.com/slackapi/slack-cli/internal/shared"
2928 "github.com/slackapi/slack-cli/internal/shared/types"
3029 "github.com/slackapi/slack-cli/internal/slackerror"
3130 "github.com/slackapi/slack-cli/internal/slacktrace"
31+ "github.com/slackapi/slack-cli/internal/style"
3232)
3333
3434// RunArgs are the arguments passed into the Run function
@@ -43,7 +43,7 @@ type RunArgs struct {
4343}
4444
4545// Run locally runs your app.
46- func Run (ctx context.Context , clients * shared.ClientFactory , log * logger. Logger , runArgs RunArgs ) (* logger. LogEvent , types.InstallState , error ) {
46+ func Run (ctx context.Context , clients * shared.ClientFactory , runArgs RunArgs ) (types.InstallState , error ) {
4747 span , ctx := opentracing .StartSpanFromContext (ctx , "cmd.create" )
4848 defer span .Finish ()
4949
@@ -54,9 +54,9 @@ func Run(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger,
5454 authSession , err := clients .API ().ValidateSession (ctx , runArgs .Auth .Token )
5555 if err != nil {
5656 err = slackerror .Wrap (err , "No auth session found" )
57- return nil , "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun )
57+ return "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun )
5858 }
59- log . Data [ " teamName" ] = * authSession .TeamName
59+ teamName : =* authSession .TeamName
6060
6161 if authSession .UserID != nil {
6262 ctx = config .SetContextUserID (ctx , * authSession .UserID )
@@ -73,17 +73,17 @@ func Run(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger,
7373 // For CLI Run command execute successfully
7474 if ! clients .SDKConfig .Hooks .Start .IsAvailable () {
7575 var err = slackerror .New (slackerror .ErrSDKHookNotFound ).WithMessage ("The `start` script was not found" )
76- return nil , "" , err
76+ return "" , err
7777 }
7878
7979 // Update local install
8080 installedApp , localInstallResult , installState , err := apps .InstallLocalApp (ctx , clients , runArgs .OrgGrantWorkspaceID , runArgs .Auth , runArgs .App )
8181 if err != nil {
82- return nil , "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun )
82+ return "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun )
8383 }
8484
8585 if installState == types .InstallRequestPending || installState == types .InstallRequestCancelled || installState == types .InstallRequestNotSent {
86- return log . SuccessEvent (), types .InstallSuccess , nil
86+ return types .InstallSuccess , nil
8787 }
8888
8989 if runArgs .ShowTriggers {
@@ -93,17 +93,17 @@ func Run(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger,
9393 if strings .Contains (err .Error (), "workflow_not_found" ) {
9494 listErr := triggers .ListWorkflows (ctx , clients , runArgs .App , runArgs .Auth )
9595 if listErr != nil {
96- return nil , "" , slackerror .Wrap (listErr , "Error listing workflows" ).WithRootCause (err )
96+ return "" , slackerror .Wrap (listErr , "Error listing workflows" ).WithRootCause (err )
9797 }
9898 }
99- return nil , "" , err
99+ return "" , err
100100 }
101101 }
102102
103103 // Gather environment variables from an environment file
104104 variables , err := clients .Config .GetDotEnvFileVariables ()
105105 if err != nil {
106- return nil , "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun ).
106+ return "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun ).
107107 WithMessage ("Failed to read the local .env file" )
108108 }
109109
@@ -123,7 +123,6 @@ func Run(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger,
123123
124124 var server = LocalServer {
125125 clients : clients ,
126- log : log ,
127126 token : localInstallResult .APIAccessTokens .AppLevel ,
128127 localHostedContext : localHostedContext ,
129128 cliConfig : cliConfig ,
@@ -141,7 +140,7 @@ func Run(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger,
141140 <- ctx .Done ()
142141 clients .IO .PrintDebug (ctx , "Interrupt signal received in Run command, cleaning up and shutting down" )
143142 if cleanup {
144- deleteAppOnTerminate (ctx , clients , runArgs .Auth , installedApp , log )
143+ deleteAppOnTerminate (ctx , clients , runArgs .Auth , installedApp , teamName )
145144 }
146145 feedback .ShowFeedbackMessageOnTerminate (ctx , clients )
147146 // Notify Slack backend we are closing connection; this should trigger an echoing close message from Slack
@@ -196,21 +195,22 @@ func Run(ctx context.Context, clients *shared.ClientFactory, log *logger.Logger,
196195 if err := <- errChan ; err != nil {
197196 switch slackerror .ToSlackError (err ).Code {
198197 case slackerror .ErrLocalAppRunCleanExit :
199- return log . SuccessEvent (), types .InstallSuccess , nil
198+ return types .InstallSuccess , nil
200199 case slackerror .ErrSDKHookInvocationFailed :
201- return nil , "" , err
200+ return "" , err
202201 }
203- return nil , "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun )
202+ return "" , slackerror .Wrap (err , slackerror .ErrLocalAppRun )
204203 }
205- return log . SuccessEvent (), types .InstallSuccess , nil
204+ return types .InstallSuccess , nil
206205}
207206
208- func deleteAppOnTerminate (ctx context.Context , clients * shared.ClientFactory , auth types.SlackAuth , app types.App , log * logger. Logger ) {
207+ func deleteAppOnTerminate (ctx context.Context , clients * shared.ClientFactory , auth types.SlackAuth , app types.App , teamName string ) {
209208 clients .IO .PrintDebug (ctx , "Removing the local version of this app from the workspace" )
210209 _ , _ , err := apps .Delete (ctx , clients , app .TeamDomain , app , auth )
211210 if err != nil {
212- log .Data ["on_cleanup_app_install_error" ] = err .Error ()
213- log .Info ("on_cleanup_app_install_failed" )
211+ clients .IO .PrintInfo (ctx , false , "%s" , style .Secondary (fmt .Sprintf (`Cleaning up local app install for "%s" failed.` , teamName )))
212+ clients .IO .PrintWarning (ctx , "Local app cleanup failed: %s" , err )
213+ } else {
214+ clients .IO .PrintInfo (ctx , false , "%s" , style .Secondary (fmt .Sprintf (`Cleaned up local app install for "%s".` , teamName )))
214215 }
215- log .Info ("on_cleanup_app_install_done" )
216216}
0 commit comments