From 8b48acabe95bc30c228c688752ef50fd6ec664dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Henrique=20Guard=C3=A3o=20Gandarez?= Date: Fri, 11 Aug 2023 12:53:52 -0300 Subject: [PATCH] always send diags with authenticated client --- cmd/run.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/cmd/run.go b/cmd/run.go index dccff266..f878d3ec 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -2,7 +2,6 @@ package cmd import ( "bytes" - "errors" "fmt" "io" "os" @@ -23,7 +22,6 @@ import ( "github.com/wakatime/wakatime-cli/cmd/params" "github.com/wakatime/wakatime-cli/cmd/today" "github.com/wakatime/wakatime-cli/cmd/todaygoal" - "github.com/wakatime/wakatime-cli/pkg/api" "github.com/wakatime/wakatime-cli/pkg/diagnostic" "github.com/wakatime/wakatime-cli/pkg/exitcode" "github.com/wakatime/wakatime-cli/pkg/heartbeat" @@ -342,25 +340,15 @@ func saveHeartbeats(v *viper.Viper) { func sendDiagnostics(v *viper.Viper, d diagnostics) error { paramAPI, err := params.LoadAPIParams(v) - // prevent sending diags for api key errors - if err != nil && !errors.As(err, &api.ErrAuth{}) { + if err != nil { return fmt.Errorf("failed to load API parameters: %s", err) } c, err := cmdapi.NewClient(paramAPI) if err != nil { - log.Warnf("failed to initialize api client: %s", err) - - // try without authentication - c, err = cmdapi.NewClientWithoutAuth(paramAPI) - if err != nil { - return fmt.Errorf("failed to initialize api client without auth: %s", err) - } + return fmt.Errorf("failed to initialize api client: %s", err) } - // foce disable ssl verification - api.WithDisableSSLVerify()(c) - diagnostics := []diagnostic.Diagnostic{ diagnostic.Error(d.OriginalError), diagnostic.Logs(d.Logs),