From ea9742b52117c03e3cdb49eb830cd63185b2c282 Mon Sep 17 00:00:00 2001 From: Kemal Hadimli Date: Wed, 26 Jan 2022 08:12:12 +0000 Subject: [PATCH 1/2] fix: Panic when canceled --- pkg/ui/console/client.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/ui/console/client.go b/pkg/ui/console/client.go index 22d0cdc2dfa862..2c9904c2104d25 100644 --- a/pkg/ui/console/client.go +++ b/pkg/ui/console/client.go @@ -130,6 +130,9 @@ func (c Client) Fetch(ctx context.Context, failOnError bool) error { return err } + if response == nil { + response = &client.FetchResponse{} + } } if ui.IsTerminal() && fetchProgress != nil { From 2eee4e95b890507c940c62bb26d0649c222168ae Mon Sep 17 00:00:00 2001 From: Kemal Hadimli Date: Wed, 26 Jan 2022 09:53:56 +0000 Subject: [PATCH 2/2] CR --- pkg/ui/console/client.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkg/ui/console/client.go b/pkg/ui/console/client.go index 2c9904c2104d25..20b0ac4a05fbfe 100644 --- a/pkg/ui/console/client.go +++ b/pkg/ui/console/client.go @@ -129,10 +129,6 @@ func (c Client) Fetch(ctx context.Context, failOnError bool) error { if st, ok := status.FromError(err); !ok || st.Code() != gcodes.Canceled { return err } - - if response == nil { - response = &client.FetchResponse{} - } } if ui.IsTerminal() && fetchProgress != nil { @@ -141,6 +137,11 @@ func (c Client) Fetch(ctx context.Context, failOnError bool) error { printFetchResponse(response) } + if response == nil { + ui.ColorizedOutput(ui.ColorProgress, "Provider fetch canceled.\n\n") + return nil + } + ui.ColorizedOutput(ui.ColorProgress, "Provider fetch complete.\n\n") for _, summary := range response.ProviderFetchSummary { status := emojiStatus[ui.StatusOK]