*: remove os.Kill from signal.Notify

Clears SA1016 in staticcheck

Author: Anthony Romano

etcdctl/ctlv3/command/elect_command.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"os"
 	"os/signal"
+	"syscall"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
@@ -73,7 +74,7 @@ func observe(c *clientv3.Client, election string) error {
 
 	donec := make(chan struct{})
 	sigc := make(chan os.Signal, 1)
-	signal.Notify(sigc, os.Interrupt, os.Kill)
+	signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		<-sigc
 		cancel()
@@ -107,7 +108,7 @@ func campaign(c *clientv3.Client, election string, prop string) error {
 
 	donec := make(chan struct{})
 	sigc := make(chan os.Signal, 1)
-	signal.Notify(sigc, os.Interrupt, os.Kill)
+	signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		<-sigc
 		cancel()

etcdctl/ctlv3/command/lock_command.go

@@ -18,6 +18,7 @@ import (
 	"errors"
 	"os"
 	"os/signal"
+	"syscall"
 
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
@@ -57,7 +58,7 @@ func lockUntilSignal(c *clientv3.Client, lockname string) error {
 	// unlock in case of ordinary shutdown
 	donec := make(chan struct{})
 	sigc := make(chan os.Signal, 1)
-	signal.Notify(sigc, os.Interrupt, os.Kill)
+	signal.Notify(sigc, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
 		<-sigc
 		cancel()

main_test.go

@@ -29,7 +29,7 @@ func TestMain(t *testing.T) {
 	}
 
 	notifier := make(chan os.Signal, 1)
-	signal.Notify(notifier, syscall.SIGINT, syscall.SIGTERM, syscall.SIGKILL)
+	signal.Notify(notifier, syscall.SIGINT, syscall.SIGTERM)
 	go main()
 	<-notifier
 }

test

@@ -281,7 +281,7 @@ function fmt_pass {
 		if [ -n "${staticcheckResult}" ]; then
 			# TODO: resolve these after go1.8 migration
 			# See https://github.com/dominikh/go-tools/tree/master/cmd/staticcheck
-			STATIC_CHECK_MASK="SA(1016|1019|2002)"
+			STATIC_CHECK_MASK="SA(1019|2002)"
 			if echo "${staticcheckResult}" | egrep -v "$STATIC_CHECK_MASK"; then
 				echo -e "staticcheck checking ${path} failed:\n${staticcheckResult}"
 				exit 255