Update to go1.17

Author: kevinpollet

.golangci.toml

@@ -15,40 +15,55 @@
   [linters-settings.gocognit]
     min-complexity = 15.0
 
-  [linters-settings.maligned]
-    suggest-new = true
-
   [linters-settings.goconst]
     min-len = 3.0
     min-occurrences = 3.0
 
   [linters-settings.misspell]
     locale = "US"
 
+  [linters-settings.stylecheck]
+    checks = ["all", "-ST1000"]
+
+  [linters-settings.gomoddirectives]
+    replace-allow-list = [
+     "github.com/abbot/go-http-auth",
+     "github.com/go-check/check",
+     "github.com/gorilla/mux",
+     "github.com/mailgun/minheap",
+     "github.com/mailgun/multibuf",
+    ]
+
 [linters]
   enable-all = true
   disable = [
+    "interfacer", # Deprecated
+    "golint", # Deprecated
+    "maligned", # Deprecated
+    "scopelint", # Deprecated
+    "cyclop", # Duplicate of gocyclo
     "lll", # Long lines are ok.
-    "dupl",
-    "prealloc",
-    "maligned",
-    "gochecknoinits",
-    "gochecknoglobals",
+    "dupl", # Not relevant
+    "prealloc", # Not relevant
+    "gochecknoinits", # Too strict
+    "gochecknoglobals", # Too strict
     "gomnd", # Does not allow for any config or time values
     "gosec", # Does not allow exec.Command with variable
-    "scopelint",
-    "funlen",
     "bodyclose", # Too many false positives
-    "godox",
     "goconst", # Too many false positives
-    "testpackage", # Does not allow testing private funcs
+    "wrapcheck", # Too strict
     "goerr113", # Forces wrapping all errors
     "noctx", # Too strict
     "exhaustive", # Too strict
+    "exhaustivestruct", # Too strict
     "nlreturn", # Too strict
-    "wrapcheck",
-    "exhaustivestruct",
-    "tparallel",
+    "ireturn", # Not relevant
+    "varnamelen", # Not relevant
+    "nilnil", # Not relevant
+    "testpackage", # Does not allow testing private funcs
+    "tparallel", # Not relevant
+    "paralleltest", # Not relevant
+    "funlen",
   ]
 
 [issues]

.semaphore/semaphore.yml

@@ -20,14 +20,14 @@ global_job_config:
   prologue:
     commands:
       - curl -sSfL https://raw.githubusercontent.com/ldez/semgo/master/godownloader.sh | sudo sh -s -- -b "/usr/local/bin"
-      - sudo semgo go1.16
+      - sudo semgo go1.17
       - echo "${DOCKERHUB_PASSWORD}" | docker login -u "${DOCKERHUB_USERNAME}" --password-stdin
       - checkout
 
 blocks:
   - name: Build
     run:
-      when: "branch =~ '.*' OR pull_request =~'.*'"
+      when: "branch =~ '.*' OR pull_request =~ '.*'"
     task:
       jobs:
         - name: Cache Go dependencies
@@ -46,7 +46,7 @@ blocks:
 
   - name: Unit Tests
     run:
-      when: "branch =~ '.*' OR pull_request =~'.*'"
+      when: "branch =~ '.*' OR pull_request =~ '.*'"
     task:
       prologue:
         commands:
@@ -58,7 +58,7 @@ blocks:
 
   - name: Integration Tests
     run:
-      when: "branch =~ '.*' OR pull_request =~'.*'"
+      when: "branch =~ '.*' OR pull_request =~ '.*'"
     task:
       prologue:
         commands:

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine AS base-image
+FROM golang:1.17-alpine AS base-image
 
 # Package dependencies
 RUN apk --no-cache --no-progress add \
@@ -21,7 +21,7 @@ WORKDIR /go/src/github.com/traefik/mesh
 RUN curl -sfL https://gist.githubusercontent.com/traefiker/6d7ac019c11d011e4f131bb2cca8900e/raw/goreleaser.sh | sh
 
 # Download golangci-lint binary to bin folder in $GOPATH
-RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOPATH/bin v1.32.0
+RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $GOPATH/bin v1.43.0
 
 ENV GO111MODULE on
 COPY go.mod go.sum ./

README.md

@@ -3,7 +3,6 @@
 </p>
 
 
-[![Travis CI Build Status](https://travis-ci.com/traefik/mesh.svg?branch=master)](https://travis-ci.com/traefik/mesh)
 [![Semaphore CI Build Status](https://traefik.semaphoreci.com/badges/mesh/branches/master.svg?style=shields)](https://traefik.semaphoreci.com/projects/mesh)
 [![Docs](https://img.shields.io/badge/docs-current-brightgreen.svg)](https://doc.traefik.io/traefik-mesh)
 [![Go Report Card](https://goreportcard.com/badge/github.com/traefik/mesh)](https://goreportcard.com/report/github.com/traefik/mesh)

cmd/cleanup/cleanup.go

@@ -3,6 +3,8 @@ package cleanup
 import (
 	"context"
 	"fmt"
+	"os/signal"
+	"syscall"
 
 	"github.com/traefik/mesh/cmd"
 	"github.com/traefik/mesh/pkg/cleanup"
@@ -24,7 +26,8 @@ func NewCmd(cConfig *cmd.CleanupConfiguration, loaders []cli.ResourceLoader) *cl
 }
 
 func cleanupCommand(cConfig *cmd.CleanupConfiguration) error {
-	ctx := cmd.ContextWithSignal(context.Background())
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT)
+	defer cancel()
 
 	logger, err := cmd.NewLogger(cConfig.LogFormat, cConfig.LogLevel, false)
 	if err != nil {

cmd/context.go

@@ -2,9 +2,6 @@ package cmd
 
 import (
 	"context"
-	"os"
-	"os/signal"
-	"syscall"
 )
 
 // ContextWithStopChan creates a context canceled when the given stopCh receives a message
@@ -23,17 +20,3 @@ func ContextWithStopChan(ctx context.Context, stopCh <-chan struct{}) context.Co
 
 	return ctx
 }
-
-// ContextWithSignal creates a context canceled when SIGINT or SIGTERM are notified.
-func ContextWithSignal(ctx context.Context) context.Context {
-	newCtx, cancel := context.WithCancel(ctx)
-	signals := make(chan os.Signal)
-	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
-
-	go func() {
-		<-signals
-		cancel()
-	}()
-
-	return newCtx
-}

cmd/log.go

@@ -27,7 +27,6 @@ func parseLogFormat(format string) (logrus.Formatter, error) {
 // NewLogger returns a new field logger with the provided format, level, and debug configurations.
 func NewLogger(format, level string, debug bool) (logrus.FieldLogger, error) {
 	log := logrus.New()
-
 	log.SetOutput(os.Stdout)
 
 	logLevelStr := level

cmd/mesh/mesh.go

@@ -7,7 +7,9 @@ import (
 	stdlog "log"
 	"net/http"
 	"os"
+	"os/signal"
 	"sync"
+	"syscall"
 	"time"
 
 	"github.com/sirupsen/logrus"
@@ -67,7 +69,8 @@ func main() {
 }
 
 func traefikMeshCommand(config *cmd.TraefikMeshConfiguration) error {
-	ctx := cmd.ContextWithSignal(context.Background())
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT)
+	defer cancel()
 
 	log, err := cmd.NewLogger(config.LogFormat, config.LogLevel, config.Debug)
 	if err != nil {

cmd/prepare/prepare.go

@@ -3,6 +3,8 @@ package prepare
 import (
 	"context"
 	"fmt"
+	"os/signal"
+	"syscall"
 
 	"github.com/traefik/mesh/cmd"
 	"github.com/traefik/mesh/pkg/dns"
@@ -25,7 +27,8 @@ func NewCmd(pConfig *cmd.PrepareConfiguration, loaders []cli.ResourceLoader) *cl
 }
 
 func prepareCommand(pConfig *cmd.PrepareConfiguration) error {
-	ctx := cmd.ContextWithSignal(context.Background())
+	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGTERM, syscall.SIGINT)
+	defer cancel()
 
 	log, err := cmd.NewLogger(pConfig.LogFormat, pConfig.LogLevel, pConfig.Debug)
 	if err != nil {

cmd/version/version.go

@@ -2,6 +2,8 @@ package version
 
 import (
 	"fmt"
+	"io"
+	"os"
 	"runtime"
 
 	"github.com/traefik/mesh/pkg/version"
@@ -24,14 +26,13 @@ func NewCmd() *cli.Command {
 		Description:   `Shows the current Traefik Mesh version.`,
 		Configuration: nil,
 		Run: func(_ []string) error {
-			printVersion()
-			return nil
+			return printVersion(os.Stdout)
 		},
 	}
 }
 
-func printVersion() {
-	fmt.Printf(
+func printVersion(w io.Writer) error {
+	_, err := io.WriteString(w, fmt.Sprintf(
 		versionFormat,
 		version.Version,
 		version.Commit,
@@ -40,5 +41,7 @@ func printVersion() {
 		runtime.Compiler,
 		runtime.GOOS,
 		runtime.GOARCH,
-	)
+	))
+
+	return err
 }