Merge branch 'release/0.4.6'

Gopkg.toml

@@ -35,4 +35,8 @@
 
 [[constraint]]
   name = "github.com/kelseyhightower/envconfig"
-  revision = "70f0258d44cbaa3b6a2581d82f58da01a38e4de4"
+  revision = "462fda1f11d8cad3660e52737b8beefd27acfb3f"
+
+[[constraint]]
+  name = "github.com/takama/bit"
+  version = "0.2.3"

Makefile

@@ -8,7 +8,7 @@ REGISTRY?=docker.io/takama
 CA_DIR?=certs
 
 # Use the 0.0.0 tag for testing, it shouldn't clobber any release builds
-RELEASE?=0.4.5
+RELEASE?=0.4.6
 GOOS?=linux
 GOARCH?=amd64
 

charts/Chart.yaml

@@ -1,6 +1,6 @@
 name: k8sapp
 description: A Helm charts for Kubernetes application
-version: 0.4.5
+version: 0.4.6
 home: https://my.domain/
 sources:
   - https://github.com/takama/k8sapp

charts/values-dev.yaml

@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.4.5
+  tag: 0.4.6
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

charts/values-stable.yaml

@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.4.5
+  tag: 0.4.6
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

docs/CHANGELOG.md

@@ -1,7 +1,14 @@
-# Version 0.4.5
+# Version 0.4.6
 
 [Documentation](README.md)
 
+
+## Changelog since 0.4.5
+
+### Codebase
+
+- Released #34: move embedded http router into external package ([#39](https://github.com/takama/k8sapp/pull/39), [@takama](https://github.com/takama))
+
 ## Changelog since 0.4.4
 
 ### Codebase

pkg/handlers/handler.go

@@ -9,9 +9,11 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 	"github.com/takama/k8sapp/pkg/config"
 	"github.com/takama/k8sapp/pkg/logger"
-	"github.com/takama/k8sapp/pkg/router"
 	"github.com/takama/k8sapp/pkg/version"
 )
 
@@ -45,8 +47,8 @@ func New(logger logger.Logger, config *config.Config) *Handler {
 }
 
 // Base handler implements middleware logic
-func (h *Handler) Base(handle func(router.Control)) func(router.Control) {
-	return func(c router.Control) {
+func (h *Handler) Base(handle func(bit.Control)) func(bit.Control) {
+	return func(c bit.Control) {
 		timer := time.Now()
 		handle(c)
 		h.countDuration(timer)
@@ -55,7 +57,7 @@ func (h *Handler) Base(handle func(router.Control)) func(router.Control) {
 }
 
 // Root handler shows version
-func (h *Handler) Root(c router.Control) {
+func (h *Handler) Root(c bit.Control) {
 	c.Code(http.StatusOK)
 	c.Body(fmt.Sprintf("%s v%s", config.SERVICENAME, version.RELEASE))
 }
@@ -75,7 +77,7 @@ func (h *Handler) countDuration(timer time.Time) {
 	}
 }
 
-func (h *Handler) collectCodes(c router.Control) {
+func (h *Handler) collectCodes(c bit.Control) {
 	if c.GetCode() >= 500 {
 		h.stats.requests.Codes.C5xx++
 	} else {

pkg/handlers/handler_test.go

@@ -6,18 +6,19 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 	"github.com/takama/k8sapp/pkg/config"
 	"github.com/takama/k8sapp/pkg/logger"
 	"github.com/takama/k8sapp/pkg/logger/standard"
-	"github.com/takama/k8sapp/pkg/router"
-	"github.com/takama/k8sapp/pkg/router/bitroute"
 	"github.com/takama/k8sapp/pkg/version"
 )
 
 func TestRoot(t *testing.T) {
 	h := New(standard.New(&logger.Config{}), new(config.Config))
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		h.Base(h.Root)(bitroute.NewControl(w, r))
+		h.Base(h.Root)(bit.NewControl(w, r))
 	})
 
 	testHandler(t, handler, http.StatusOK, fmt.Sprintf("%s v%s", config.SERVICENAME, version.RELEASE))
@@ -43,18 +44,18 @@ func testHandler(t *testing.T, handler http.HandlerFunc, code int, body string)
 func TestCollectCodes(t *testing.T) {
 	h := New(standard.New(&logger.Config{}), new(config.Config))
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		h.Base(func(c router.Control) {
+		h.Base(func(c bit.Control) {
 			c.Code(http.StatusBadGateway)
 			c.Body(http.StatusText(http.StatusBadGateway))
-		})(bitroute.NewControl(w, r))
+		})(bit.NewControl(w, r))
 	})
 	testHandler(t, handler, http.StatusBadGateway, http.StatusText(http.StatusBadGateway))
 
 	handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		h.Base(func(c router.Control) {
+		h.Base(func(c bit.Control) {
 			c.Code(http.StatusNotFound)
 			c.Body(http.StatusText(http.StatusNotFound))
-		})(bitroute.NewControl(w, r))
+		})(bit.NewControl(w, r))
 	})
 	testHandler(t, handler, http.StatusNotFound, http.StatusText(http.StatusNotFound))
 }

pkg/handlers/health.go

@@ -7,11 +7,13 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/takama/k8sapp/pkg/router"
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 )
 
 // Health returns "OK" if service is alive
-func (h *Handler) Health(c router.Control) {
+func (h *Handler) Health(c bit.Control) {
 	c.Code(http.StatusOK)
 	c.Body(http.StatusText(http.StatusOK))
 }

pkg/handlers/health_test.go

@@ -4,16 +4,18 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 	"github.com/takama/k8sapp/pkg/config"
 	"github.com/takama/k8sapp/pkg/logger"
 	"github.com/takama/k8sapp/pkg/logger/standard"
-	"github.com/takama/k8sapp/pkg/router/bitroute"
 )
 
 func TestHealth(t *testing.T) {
 	h := New(standard.New(&logger.Config{}), new(config.Config))
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		h.Base(h.Health)(bitroute.NewControl(w, r))
+		h.Base(h.Health)(bit.NewControl(w, r))
 	})
 
 	testHandler(t, handler, http.StatusOK, http.StatusText(http.StatusOK))

pkg/handlers/info.go

@@ -11,7 +11,9 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/takama/k8sapp/pkg/router"
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 	"github.com/takama/k8sapp/pkg/version"
 )
 
@@ -60,7 +62,7 @@ type Codes struct {
 }
 
 // Info returns detailed info about the service
-func (h *Handler) Info(c router.Control) {
+func (h *Handler) Info(c bit.Control) {
 	host, _ := os.Hostname()
 	m := new(runtime.MemStats)
 	runtime.ReadMemStats(m)

pkg/handlers/info_test.go

@@ -6,17 +6,19 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 	"github.com/takama/k8sapp/pkg/config"
 	"github.com/takama/k8sapp/pkg/logger"
 	"github.com/takama/k8sapp/pkg/logger/standard"
-	"github.com/takama/k8sapp/pkg/router/bitroute"
 	"github.com/takama/k8sapp/pkg/version"
 )
 
 func TestInfo(t *testing.T) {
 	h := New(standard.New(&logger.Config{}), new(config.Config))
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		h.Base(h.Info)(bitroute.NewControl(w, r))
+		h.Base(h.Info)(bit.NewControl(w, r))
 	})
 
 	req, err := http.NewRequest("GET", "/", nil)

pkg/handlers/ready.go

@@ -7,11 +7,13 @@ package handlers
 import (
 	"net/http"
 
-	"github.com/takama/k8sapp/pkg/router"
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 )
 
 // Ready returns "OK" if service is ready to serve traffic
-func (h *Handler) Ready(c router.Control) {
+func (h *Handler) Ready(c bit.Control) {
 	// TODO: possible use cases:
 	// load data from a database, a message broker, any external services, etc
 

pkg/handlers/ready_test.go

@@ -4,16 +4,18 @@ import (
 	"net/http"
 	"testing"
 
+	"github.com/takama/bit"
+	// Alternative of the Bit router with the same Router interface
+	// "github.com/takama/k8sapp/pkg/router/httprouter"
 	"github.com/takama/k8sapp/pkg/config"
 	"github.com/takama/k8sapp/pkg/logger"
 	"github.com/takama/k8sapp/pkg/logger/standard"
-	"github.com/takama/k8sapp/pkg/router/bitroute"
 )
 
 func TestReady(t *testing.T) {
 	h := New(standard.New(&logger.Config{}), new(config.Config))
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		h.Base(h.Ready)(bitroute.NewControl(w, r))
+		h.Base(h.Ready)(bit.NewControl(w, r))
 	})
 
 	testHandler(t, handler, http.StatusOK, http.StatusText(http.StatusOK))