Merge pull request #5037 from samihda/main

petemoore · web-flow · commit 007f2384e188 · 2022-01-12T10:30:28.000+01:00
Remove dependency `graceful`
diff --git a/changelog/issue-4594.md b/changelog/issue-4594.md
@@ -0,0 +1,4 @@
+audience: users
+level: silent
+reference: issue 4594
+---
diff --git a/clients/client-shell/cmds/signin/signin.go b/clients/client-shell/cmds/signin/signin.go
@@ -2,14 +2,14 @@
 package signin
 
 import (
+	"context"
 	"fmt"
 	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
 	"os"
 	"strings"
-	"time"
 
 	"github.com/pkg/browser"
 	"github.com/spf13/cobra"
@@ -19,7 +19,6 @@ import (
 	"github.com/taskcluster/taskcluster/v44/clients/client-go/tcauth"
 	"github.com/taskcluster/taskcluster/v44/clients/client-shell/cmds/root"
 	"github.com/taskcluster/taskcluster/v44/clients/client-shell/config"
-	graceful "gopkg.in/tylerb/graceful.v1"
 )
 
 var log = root.Logger
@@ -66,14 +65,11 @@ func cmdSignin(cmd *cobra.Command, _ []string) error {
 	// Find port, choose 0 meaning random port, if none
 	port, _ := cmd.Flags().GetInt("port")
 
-	// Setup server that we can shutdown gracefully
-	s := graceful.Server{
-		Timeout: 5 * time.Second,
-		Server:  &http.Server{},
-	}
+	// Set up server for the redirect page after a successful sign in
+	s := http.Server{}
 
 	// Handle callback
-	s.Server.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	s.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		qs := r.URL.Query()
 		csh, _ := cmd.Flags().GetBool("csh")
 		rootURL := config.RootURL()
@@ -101,7 +97,9 @@ func cmdSignin(cmd *cobra.Command, _ []string) error {
 				</body>
 			</html>
 		`))
-		s.Stop(50 * time.Millisecond)
+		if err := s.Shutdown(context.Background()); err != nil {
+			log.Errorf("Error shutting down server: %s\n", err)
+		}
 	})
 
 	// Start listening on localhost
diff --git a/go.mod b/go.mod
@@ -56,7 +56,6 @@ require (
 	golang.org/x/net v0.0.0-20210614182718-04defd469f4e
 	golang.org/x/sys v0.0.0-20210510120138-977fb7262007
 	golang.org/x/tools v0.1.5
-	gopkg.in/tylerb/graceful.v1 v1.2.15
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
 	howett.net/plist v0.0.0-20201203080718-1454fab16a06 // indirect
diff --git a/go.sum b/go.sum
@@ -422,8 +422,6 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
-gopkg.in/tylerb/graceful.v1 v1.2.15 h1:1JmOyhKqAyX3BgTXMI84LwT6FOJ4tP2N9e2kwTCM0nQ=
-gopkg.in/tylerb/graceful.v1 v1.2.15/go.mod h1:yBhekWvR20ACXVObSSdD3u6S9DeSylanL2PAbAC/uJ8=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
