cleanup for context cancellation in etcd

Author: cyrilst

.cirrus.yml

@@ -1,10 +1,16 @@
-container:
-  image: golang:1.13
+task:
+  env:
+    GOPROXY: https://proxy.golang.org
+    matrix:
+      VERSION: 1.13
+      VERSION: 1.14
+      VERSION: 1.15
 
-env:
-  GOPROXY: https://proxy.golang.org
+  container:
+    image: golang:$VERSION
+
+  name: test-$VERSION
 
-test_task:
   test_script:
     - apt-get update
     - apt-get install -y asciidoc docbook-utils docbook-xml libxml2-utils xsltproc
@@ -17,8 +23,8 @@ test_task:
     - make get-deps check
 
 docker_builder:
-  depends_on:
-    - test
+  name: docker
+
   build_script:
     - GOPATH=/tmp/go
     - PATH="$PATH:$GOPATH/bin"

pkg/utils/etcd.go

@@ -386,6 +386,7 @@ func (c *Client) SetErrorBanner(errorBanner string, expire time.Time) error {
 	key := "/sshproxy/error_banner/value"
 	keyExpire := "/sshproxy/error_banner/expire"
 	ctx, cancel := context.WithTimeout(context.Background(), c.requestTimeout)
+	defer cancel()
 	currentTime := time.Now()
 	diff := expire.Sub(currentTime)
 	seconds := int64(diff.Seconds())
@@ -396,7 +397,6 @@ func (c *Client) SetErrorBanner(errorBanner string, expire time.Time) error {
 		}
 		_, err = c.cli.Put(ctx, key, errorBanner, clientv3.WithLease(resp.ID))
 		_, err2 := c.cli.Put(ctx, keyExpire, expire.Format("2006-01-02 15:04:05"), clientv3.WithLease(resp.ID))
-		cancel()
 		if err != nil {
 			return err
 		}
@@ -406,7 +406,6 @@ func (c *Client) SetErrorBanner(errorBanner string, expire time.Time) error {
 	} else {
 		_, err := c.cli.Put(ctx, key, errorBanner)
 		_, err2 := c.cli.Delete(ctx, keyExpire)
-		cancel()
 		if err != nil {
 			return err
 		}