Refactor: rebranding (#34)

.golangci.toml

@@ -25,11 +25,15 @@
   disable = [
     "maligned",
     "lll",
-    "gas",
+    "gosec",
     "dupl",
     "prealloc",
     "gochecknoglobals",
     "gochecknoinits",
+    "gomnd",
+    "wsl",
+    "goerr113",
+    "testpackage",
   ]
 
 [issues]

LICENSE

@@ -187,6 +187,7 @@
       identification within third-party archives.
 
    Copyright [2015-2018] [Containous]
+   Copyright [2020] [Traefik Labs]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -11,10 +11,10 @@ build:
 	CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags="-s" -o whoami
 
 image:
-	docker build -t containous/whoami .
+	docker build -t traefik/whoami .
 
 check:
 	golangci-lint run
 
 publish-images:
-	seihon publish -v "$(TAG_NAME)" -v "latest" --image-name containous/whoami --dry-run=false
+	seihon publish -v "$(TAG_NAME)" -v "latest" --image-name traefik/whoami --dry-run=false

README.md

@@ -1,7 +1,7 @@
 # whoami
 
-[![Docker Pulls](https://img.shields.io/docker/pulls/containous/whoami.svg)](https://hub.docker.com/r/containous/whoami/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/traefik/whoami.svg)](https://hub.docker.com/r/traefik/whoami/)
-[![Build Status](https://travis-ci.com/containous/whoami.svg?branch=master)](https://travis-ci.com/containous/whoami)
+[![Build Status](https://travis-ci.com/traefik/whoami.svg?branch=master)](https://travis-ci.com/traefik/whoami)
 
 Tiny Go webserver that prints os information and HTTP request to output
 
@@ -9,10 +9,10 @@ Tiny Go webserver that prints os information and HTTP request to output
 
 ### Paths
 
-- `/data?size=n`: creates a response with a size `n`.
+- `/data?size=n[&unit=u]`: creates a response with a size `n`. The unit of measure, if specified, accepts the following values: `KB`, `MB`, `GB`, `TB` (optional, default: bytes).
 - `/echo`: webSocket echo.
 - `/bench`: always return the same response (`1`).
-- `/`: returns the whoami information (request and network information).
+- `/[?wait=d]`: returns the whoami information (request and network information). The optional `wait` query parameter can be provided to tell the server to wait before sending the response. The duration is expected in Go's [`time.Duration`](https://golang.org/pkg/time/#ParseDuration) format (e.g. `/?wait=100ms` to wait 100 milliseconds).
 - `/api`: returns the whoami information as JSON.
 - `/health`: heath check
     - `GET`, `HEAD`, ...: returns a response with the status code defined by the `POST`
@@ -23,11 +23,12 @@ Tiny Go webserver that prints os information and HTTP request to output
 - `cert`: give me a certificate.
 - `key`: give me a key.
 - `port`: give me a port number. (default: 80)
+- `name`: give me a name. (it can be also defined with `WHOAMI_NAME` environment variable)
 
 ## Examples
 
 ```console
-$ docker run -d -P --name iamfoo containous/whoami
+$ docker run -d -P --name iamfoo traefik/whoami
 
 $ docker inspect --format '{{ .NetworkSettings.Ports }}'  iamfoo
 map[80/tcp:[{0.0.0.0 32769}]]
@@ -63,3 +64,7 @@ $ curl -v http://localhost:80/health
 < Date: Mon, 16 Sep 2019 22:52:40 GMT
 < Content-Length: 0
 ```
+
+```console
+docker run -d -P -v ./certs:/certs --name iamfoo traefik/whoami --cert /certs/cert.cer --key /certs/key.key
+```

app.go

@@ -19,7 +19,7 @@ import (
 	"github.com/gorilla/websocket"
 )
 
-// Units
+// Units.
 const (
 	_        = iota
 	KB int64 = 1 << (10 * iota)
@@ -31,11 +31,13 @@ const (
 var cert string
 var key string
 var port string
+var name string
 
 func init() {
 	flag.StringVar(&cert, "cert", "", "give me a certificate")
 	flag.StringVar(&key, "key", "", "give me a key")
 	flag.StringVar(&port, "port", "80", "give me a port number")
+	flag.StringVar(&name, "name", os.Getenv("WHOAMI_NAME"), "give me a name")
 }
 
 var upgrader = websocket.Upgrader{
@@ -149,6 +151,10 @@ func whoamiHandler(w http.ResponseWriter, req *http.Request) {
 		}
 	}
 
+	if name != "" {
+		_, _ = fmt.Fprintln(w, "Name:", name)
+	}
+
 	hostname, _ := os.Hostname()
 	_, _ = fmt.Fprintln(w, "Hostname:", hostname)
 
@@ -185,6 +191,7 @@ func apiHandler(w http.ResponseWriter, req *http.Request) {
 		URL      string      `json:"url,omitempty"`
 		Host     string      `json:"host,omitempty"`
 		Method   string      `json:"method,omitempty"`
+		Name     string      `json:"name,omitempty"`
 	}{
 		Hostname: hostname,
 		IP:       []string{},
@@ -192,6 +199,7 @@ func apiHandler(w http.ResponseWriter, req *http.Request) {
 		URL:      req.URL.RequestURI(),
 		Host:     req.Host,
 		Method:   req.Method,
+		Name:     name,
 	}
 
 	ifaces, _ := net.Interfaces()

go.mod

@@ -1,5 +1,5 @@
-module github.com/containous/whoami
+module github.com/traefik/whoami
 
 go 1.13
 
-require github.com/gorilla/websocket v1.4.1
+require github.com/gorilla/websocket v1.4.2

go.sum

@@ -1,2 +1,2 @@
-github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=