Fix handling of context

facade/facade.go

@@ -1,8 +1,10 @@
 package facade
 
 import (
+	cntxt "context"
 	"io"
 	"os"
+	"os/signal"
 	"runtime"
 	"strings"
 
@@ -34,7 +36,7 @@ var (
 	filePath    string
 )
 
-//newRootCmd returns cobra.Command instance for root command
+// newRootCmd returns cobra.Command instance for root command
 func newRootCmd(ui *rwi.RWI, args []string) *cobra.Command {
 	rootCmd := &cobra.Command{
 		Use:   Name,
@@ -104,6 +106,7 @@ func newRootCmd(ui *rwi.RWI, args []string) *cobra.Command {
 	rootCmd.PersistentFlags().BoolP(context.UTC.String(), "u", false, "output with UTC time")
 
 	rootCmd.SilenceUsage = true
+	rootCmd.CompletionOptions.DisableDefaultCmd = true
 	rootCmd.SetArgs(args)
 	rootCmd.SetIn(ui.Reader())       //Stdin
 	rootCmd.SetOut(ui.ErrorWriter()) //Stdout -> Stderr
@@ -113,7 +116,6 @@ func newRootCmd(ui *rwi.RWI, args []string) *cobra.Command {
 		newHkpCmd(ui),
 		newGitHubCmd(ui),
 		newFetchCmd(ui),
-		newCompletionCmd(ui, rootCmd),
 	)
 
 	return rootCmd
@@ -154,7 +156,7 @@ func parseContext(cmd *cobra.Command) *context.Context {
 	return cxt
 }
 
-//Execute is called from main function
+// Execute is called from main function
 func Execute(ui *rwi.RWI, args []string) (exit exitcode.ExitCode) {
 	defer func() {
 		//panic hundling
@@ -171,15 +173,19 @@ func Execute(ui *rwi.RWI, args []string) (exit exitcode.ExitCode) {
 		}
 	}()
 
+	// create interrupt SIGNAL
+	ctx, cancel := signal.NotifyContext(cntxt.Background(), os.Interrupt)
+	defer cancel()
+
 	//execution
 	exit = exitcode.Normal
-	if err := newRootCmd(ui, args).Execute(); err != nil {
+	if err := newRootCmd(ui, args).ExecuteContext(ctx); err != nil {
 		exit = exitcode.Abnormal
 	}
 	return
 }
 
-/* Copyright 2017-2021 Spiegel
+/* Copyright 2017-2023 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facade/fetch.go

@@ -1,19 +1,17 @@
 package facade
 
 import (
-	"context"
 	"os"
 
 	"github.com/goark/errs"
 
 	"github.com/goark/fetch"
 	"github.com/goark/gocli/rwi"
-	"github.com/goark/gocli/signal"
 	"github.com/goark/gpgpdump/parse"
 	"github.com/spf13/cobra"
 )
 
-//newHkpCmd returns cobra.Command instance for show sub-command
+// newHkpCmd returns cobra.Command instance for show sub-command
 func newFetchCmd(ui *rwi.RWI) *cobra.Command {
 	fetchCmd := &cobra.Command{
 		Use:     "fetch [flags] URL",
@@ -38,9 +36,9 @@ func newFetchCmd(ui *rwi.RWI) *cobra.Command {
 			}
 
 			//Fetch OpenPGP packets
-			resp, err := fetch.New().Get(
+			resp, err := fetch.New().GetWithContext(
+				cmd.Context(),
 				u,
-				fetch.WithContext(signal.Context(context.Background(), os.Interrupt)),
 			)
 			if err != nil {
 				return debugPrint(ui, err)
@@ -71,7 +69,7 @@ func newFetchCmd(ui *rwi.RWI) *cobra.Command {
 	return fetchCmd
 }
 
-/* Copyright 2019-2021 Spiegel
+/* Copyright 2019-2023 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facade/github.go

@@ -2,21 +2,19 @@ package facade
 
 import (
 	"bytes"
-	"context"
 	"os"
 
 	"github.com/goark/errs"
 
 	"github.com/goark/fetch"
 	"github.com/goark/gocli/rwi"
-	"github.com/goark/gocli/signal"
 	"github.com/goark/gpgpdump/github"
 	"github.com/goark/gpgpdump/parse"
 	contxt "github.com/goark/gpgpdump/parse/context"
 	"github.com/spf13/cobra"
 )
 
-//newHkpCmd returns cobra.Command instance for show sub-command
+// newHkpCmd returns cobra.Command instance for show sub-command
 func newGitHubCmd(ui *rwi.RWI) *cobra.Command {
 	githubCmd := &cobra.Command{
 		Use:     "github [flags] GitHubUserID",
@@ -44,7 +42,7 @@ func newGitHubCmd(ui *rwi.RWI) *cobra.Command {
 
 			//Fetch OpenPGP packets
 			resp, err := github.GetKey(
-				signal.Context(context.Background(), os.Interrupt),
+				cmd.Context(),
 				fetch.New(),
 				userID,
 				keyid,
@@ -78,7 +76,7 @@ func newGitHubCmd(ui *rwi.RWI) *cobra.Command {
 	return githubCmd
 }
 
-/* Copyright 2019-2021 Spiegel
+/* Copyright 2019-2023 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

facade/hkp.go

@@ -1,22 +1,20 @@
 package facade
 
 import (
-	"context"
 	"os"
 
 	"github.com/goark/errs"
 
 	"github.com/goark/fetch"
 	"github.com/goark/gocli/rwi"
-	"github.com/goark/gocli/signal"
 	"github.com/goark/gpgpdump/ecode"
 	"github.com/goark/gpgpdump/hkp"
 	"github.com/goark/gpgpdump/parse"
 	contxt "github.com/goark/gpgpdump/parse/context"
 	"github.com/spf13/cobra"
 )
 
-//newHkpCmd returns cobra.Command instance for show sub-command
+// newHkpCmd returns cobra.Command instance for show sub-command
 func newHkpCmd(ui *rwi.RWI) *cobra.Command {
 	hkpCmd := &cobra.Command{
 		Use:     "hkp [flags] {userID | keyID}",
@@ -63,7 +61,7 @@ func newHkpCmd(ui *rwi.RWI) *cobra.Command {
 				hkp.WithProtocol(prt),
 				hkp.WithPort(port),
 			).Fetch(
-				signal.Context(context.Background(), os.Interrupt),
+				cmd.Context(),
 				fetch.New(),
 				userID,
 			)
@@ -99,7 +97,7 @@ func newHkpCmd(ui *rwi.RWI) *cobra.Command {
 	return hkpCmd
 }
 
-/* Copyright 2019-2021 Spiegel
+/* Copyright 2019-2023 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

github/github.go

@@ -18,9 +18,9 @@ const maxKeys = 100
 
 var maxKeysStr = strconv.Itoa(maxKeys)
 
-//Get returns OpenPGP ASCII armor text from GitHub user profile
+// Get returns OpenPGP ASCII armor text from GitHub user profile
 func Get(ctx context.Context, cli fetch.Client, username string) ([]byte, error) {
-	resp, err := cli.Get(makeURL(username), fetch.WithContext(ctx))
+	resp, err := cli.GetWithContext(ctx, makeURL(username))
 	if err != nil {
 		return nil, errs.Wrap(err, errs.WithContext("username", username))
 	}
@@ -36,7 +36,7 @@ func makeURL(username string) *url.URL {
 	return u
 }
 
-//GetKey returns JSON text for GitHub OpenPGP API
+// GetKey returns JSON text for GitHub OpenPGP API
 func GetKey(ctx context.Context, cli fetch.Client, username string, keyID string) ([]byte, error) {
 	if len(keyID) == 0 {
 		return Get(ctx, cli, username)
@@ -66,9 +66,9 @@ func getInPage(ctx context.Context, cli fetch.Client, username string, page int)
 	if err != nil {
 		return nil, errs.Wrap(ecode.ErrInvalidRequest, errs.WithCause(err), errs.WithContext("username", username), errs.WithContext("page", page))
 	}
-	resp, err := cli.Get(
+	resp, err := cli.GetWithContext(
+		ctx,
 		u,
-		fetch.WithContext(ctx),
 		fetch.WithRequestHeaderSet("Accept", "application/vnd.github.v3+json"),
 	)
 	if err != nil {
@@ -98,7 +98,7 @@ func makeURLAPI(username string, page int) (*url.URL, error) {
 	return u, nil
 }
 
-/* Copyright 2020-2021 Spiegel
+/* Copyright 2020-2023 Spiegel
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

github/github_test.go

@@ -144,9 +144,15 @@ func newtestClient2() *testClient {
 func (c *testClient) Get(u *url.URL, opts ...fetch.RequestOpts) (fetch.Response, error) {
 	return c.resp, nil
 }
+func (c *testClient) GetWithContext(ctx context.Context, u *url.URL, opts ...fetch.RequestOpts) (fetch.Response, error) {
+	return c.resp, nil
+}
 func (c *testClient) Post(u *url.URL, payload io.Reader, opts ...fetch.RequestOpts) (fetch.Response, error) {
 	return c.resp, nil
 }
+func (c *testClient) PostWithContext(ctx context.Context, u *url.URL, payload io.Reader, opts ...fetch.RequestOpts) (fetch.Response, error) {
+	return c.resp, nil
+}
 
 var _ fetch.Client = (*testClient)(nil)
 

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/ProtonMail/go-crypto v0.0.0-20230426101702-58e86b294756
 	github.com/atotto/clipboard v0.1.4
 	github.com/goark/errs v1.2.2
-	github.com/goark/fetch v0.3.0
+	github.com/goark/fetch v0.4.1
 	github.com/goark/gocli v0.13.0
 	github.com/spf13/cobra v1.7.0
 )

go.sum

@@ -9,8 +9,8 @@ github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUK
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/goark/errs v1.2.2 h1:UrMZZJL0WaOzaO+ErSV+nz/k/+bmW2wUiFe5V7pUeEo=
 github.com/goark/errs v1.2.2/go.mod h1:ZsQucxaDFVfSB8I99j4bxkDRfNOrlKINwg72QMuRWKw=
-github.com/goark/fetch v0.3.0 h1:2m32EGOLBi99RzI5urFfmv5++CMqfenVw7NH8z/lbX8=
-github.com/goark/fetch v0.3.0/go.mod h1:sqDdPbbHeIjDVeHrgvzhHpkUr8X9pVC9DgJoVwU02x0=
+github.com/goark/fetch v0.4.1 h1:Y59g9sAdgqjPS7UADdLIoQGRxJE1WMo5ixlJi/ZcCfc=
+github.com/goark/fetch v0.4.1/go.mod h1:umZxLIJHa15J8EQSp5zft1dHDv0VGwmQL6pOfaJ60FY=
 github.com/goark/gocli v0.13.0 h1:hR/5E4JGMEcbQxkSqR7K/0XnYY2Hd6GDpuazXGC3jn4=
 github.com/goark/gocli v0.13.0/go.mod h1:pFYWXAXZ5G4QqPcXsDTSFbCuVg0qO40NYkp2XKthc18=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=

hkp/fetch_test.go

@@ -84,9 +84,15 @@ var _ fetch.Client = (*testClient)(nil)
 func (c *testClient) Get(u *url.URL, opts ...fetch.RequestOpts) (fetch.Response, error) {
 	return newtestResponse(), nil
 }
+func (c *testClient) GetWithContext(ctx context.Context, u *url.URL, opts ...fetch.RequestOpts) (fetch.Response, error) {
+	return newtestResponse(), nil
+}
 func (c *testClient) Post(u *url.URL, payload io.Reader, opts ...fetch.RequestOpts) (fetch.Response, error) {
 	return newtestResponse(), nil
 }
+func (c *testClient) PostWithContext(ctx context.Context, u *url.URL, payload io.Reader, opts ...fetch.RequestOpts) (fetch.Response, error) {
+	return newtestResponse(), nil
+}
 
 func TestFetch(t *testing.T) {
 	testCases := []struct {