minke-generator-go 0.8.7 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7423ec4af6e0b2e68217c5e87fbe09c786b608ee
-  data.tar.gz: a0ecfbcd25904c237a65ce7f4788a6697a44f1ac
+  metadata.gz: ccd7dbe99e9143f886b837464fdc16fa21cb940c
+  data.tar.gz: 9a3046943f8b56edc1205e8299df82a2db3a189d
 SHA512:
-  metadata.gz: 2846f60293d99a5c73b1e08b1f7fff7a4d96b144493930bf3bc87eb511ecc048d8052c842cf3651142694b872dbe93e1120d9d3167281458a3f9dfc20e506b85
-  data.tar.gz: 59908db1fd657c291037ce6f6c815ac0c58d2eebf1cd38474c56d9d59543573e7e4d29ccb0b9134918bb9753f7beb2084675dfa69a57ab6f7d662b4b9c66b838
+  metadata.gz: c5f0153adec63eb06bc0a8c3cd1365d4ad4d8814680325b745dd6714f22759d9f19e1684092fad0a485af104c06b71a1d47a37dc0c3d6e4b9c1ccc1b716b72f4
+  data.tar.gz: 704ef8ae332a864bcf695d0ded61ec7889c29cfe6e55a0d84580724007b822a88f87b58efbac52748d07d5dfc0c45ec4be03ed0cc801b118486c2e77d155125a

data/Dockerfile

@@ -3,7 +3,9 @@ FROM golang:alpine
 # install curl
 RUN apk update && \
     apk add curl && \
-    apk add git
+    apk add git && \
+    apk add openssh-client && \
+    apk add make
 
 # install Glide
 RUN go get -u github.com/Masterminds/glide

data/lib/generators/gomicroservice/scaffold/Makefile.erb

@@ -0,0 +1,9 @@
+build:
+	go build -o <%= application_name %> ./main.go
+
+run: build
+	./<%= application_name %> ./config.json /
+
+test:
+	go test -v -race $(shell go list ./... | grep -v /vendor/)
+

data/lib/generators/gomicroservice/scaffold/{_build → _minke}/config.yml.erb

@@ -21,9 +21,6 @@ build:
       -
         from: '../<%= application_name %>'
         to: './dockerfile/<%= application_name %>'
-      -
-        from: './swagger_spec/swagger.yml'
-        to: './dockerfile/<%= application_name %>/swagger_spec'
 run:
   consul_loader:
     config_file: './consul_keys.yml'
@@ -43,3 +40,15 @@ cucumber:
     port: 8001
     path: /v1/health
     type: bridge
+shell:
+  consul_loader:
+    config_file: './consul_keys.yml'
+    url:
+      address: consul
+      port: 8500
+      type: bridge
+  docker:
+    application_docker_file: './dockerfile/<%= application_name %>/'
+    application_compose_file: './dockercompose/<%= application_name %>/docker-compose-no-server.yml'
+  ports:
+    - "8001:8001"

data/lib/generators/gomicroservice/scaffold/_minke/consul_keys.yml.erb

@@ -0,0 +1,5 @@
+---
+<%= application_name %>:
+  settings:
+    environment: dev
+    

data/lib/generators/gomicroservice/scaffold/{_build/dockercompose/<%= application_name %>/docker-no-server.yml.erb → _minke/dockercompose/<%= application_name %>/docker-compose-no-server.yml.erb }

@@ -1,14 +1,6 @@
 version: '2'
 
 services:
-  statsd:
-    image: 'hopsoft/graphite-statsd:latest'
-    ports:
-      - "::80"
-    expose:
-      - "8125/udp"
-    environment:
-      - "SERVICE_8125_NAME=statsd-8125"
   registrator:
     image: 'gliderlabs/registrator:latest'
     command: '-internal -tags=dev consul://consul:8500'

data/lib/generators/gomicroservice/scaffold/{_build → _minke}/dockercompose/<%= application_name %>/docker-compose.yml.erb

@@ -8,16 +8,7 @@ services:
     environment:
       - "CONSUL=consul:8500"
     links:
-      - statsd:statsd
       - syslog:syslog
-  statsd:
-    image: 'hopsoft/graphite-statsd:latest'
-    ports:
-      - "::80"
-    expose:
-      - "8125/udp"
-    environment:
-      - "SERVICE_8125_NAME=statsd-8125"
   registrator:
     image: 'gliderlabs/registrator:latest'
     command: '-internal -tags=dev consul://consul:8500'

data/lib/generators/gomicroservice/scaffold/{_build → _minke}/dockerfile/<%= application_name %>/Dockerfile.erb

@@ -5,19 +5,16 @@ EXPOSE 8001
 # Create directory for server files
 RUN mkdir /<%= application_name %>
 
-# Add s6 config
-ADD s6-etc /etc/s6
-RUN chmod -R 755 /etc/s6; \
-chmod -R 755 /etc/s6
 
 # Add consul template
 ADD config.ctmpl /<%= application_name %>/config.ctmpl
+ADD entrypoint.sh /entrypoint.sh
 
 # Add server files
-ADD swagger_spec /swagger
 ADD <%= application_name %> /<%= application_name %>/<%= application_name %>
 
 RUN chmod 755 /<%= application_name %>/<%= application_name %>
+RUN chmod 755 /entrypoint.sh
 
-ENTRYPOINT ["/usr/bin/s6-svscan","/etc/s6"]
+ENTRYPOINT ["/entrypoint.sh"]
 CMD []

data/lib/generators/gomicroservice/scaffold/{_build → _minke}/dockerfile/<%= application_name %>/config.ctmpl.erb

@@ -1,4 +1,3 @@
 {
-  "stats_d_server": "{{range service "statsd-8125"}}{{.Address}}:{{.Port}}{{end}}",
   "syslog_server": "{{range $index, $element := service "syslog-514"}}{{if eq $index 0}}{{.Address}}:{{.Port}}{{end}}{{end}}"
 }

data/lib/generators/gomicroservice/scaffold/_minke/dockerfile/<%= application_name %>/entrypoint.sh.erb

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+consul-template -consul $CONSUL -exec-reload-signal=SIGTERM -template /<%= application_name %>/config.ctmpl:/<%= application_name %>/config.json -exec "/<%= application_name %>/<%= application_name %> /<%= application_name %>/config.json /"

data/lib/generators/gomicroservice/scaffold/config.json

@@ -0,0 +1,3 @@
+{
+  "syslog_server": "syslog_server:514"
+}

data/lib/generators/gomicroservice/scaffold/glide.yaml.erb

@@ -1,16 +1,10 @@
 package: <%= namespace %>/<%= application_name %>
 import:
-- package: github.com/alexcesaro/statsd
-  version: ^2.0.0
 - package: github.com/asaskevich/govalidator
   version: ^4.0.0
-- package: github.com/facebookgo/inject
-- package: github.com/gorilla/context
-  version: ^1.1.0
+- package: github.com/Sirupsen/logrus
 - package: github.com/gorilla/pat
 - package: github.com/stretchr/testify
   version: ^1.1.3
   subpackages:
   - mock
-testImport:
-- package: github.com/alecthomas/assert

data/lib/generators/gomicroservice/scaffold/global/global.go

@@ -6,14 +6,16 @@ import (
 	"os"
 )
 
+// ConfigStruct defines a config object usually created on startup
 type ConfigStruct struct {
-	StatsDServerIP string `json:"stats_d_server"`
-	SysLogIP       string `json:"syslog_server"`
-	RootFolder     string
+	SysLogIP   string `json:"syslog_server"`
+	RootFolder string
 }
 
+// Config is a global instance of the config
 var Config ConfigStruct
 
+// LoadConfig load the config file from the given folder
 func LoadConfig(config string, rootfolder string) error {
 	fmt.Println("Loading Config: ", config)
 

data/lib/generators/gomicroservice/scaffold/handlers/echo.go.erb

@@ -2,38 +2,37 @@ package handlers
 
 import (
 	"encoding/json"
-	"fmt"
 	"net/http"
-	"log"
 
-	"github.com/gorilla/context"
-	"<%= namespace %>/<%= application_name %>/logging"
+	log "github.com/Sirupsen/logrus"
 )
 
-type EchoDependenciesContainer struct {
-	StatsD logging.StatsD `inject:"statsd"`
-	Log    *log.Logger    `inject:""`
-}
+const kTagEcho = "EchoHandler"
 
-var EchoDependencies *EchoDependenciesContainer = &EchoDependenciesContainer{}
-const EHTAGNAME = "EchoHandler: "
+type echoHandlerDependencies struct {
+	logger *log.Logger
+}
 
-// use the validation middleware to automatically validate input
+// Echo uses the validation middleware to automatically validate input
 // github.com/asaskevich/govalidator
 type Echo struct {
 	Echo string `json:"echo" valid:"stringlength(1|255),required"`
 }
 
-func EchoHandler(rw http.ResponseWriter, r *http.Request) {
-	EchoDependencies.StatsD.Increment(ECHO_HANDLER + POST + CALLED)
-	EchoDependencies.Log.Printf("%v Called GET\n", EHTAGNAME)
+type echoHandler struct {
+	deps echoHandlerDependencies
+}
+
+func (e *echoHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	e.deps.logger.WithField(kTagEcho, "Called GET")
 
 	// request is set into the context from the middleware
-	request := context.Get(r, "request").(*Echo)
-	fmt.Println("r: ", request)
+	request := r.Context().Value(validationRequestKey{}).(Echo)
 
 	encoder := json.NewEncoder(rw)
 	encoder.Encode(request)
+}
 
-	EchoDependencies.StatsD.Increment(ECHO_HANDLER + POST + SUCCESS)
+func newEchoHandler(deps echoHandlerDependencies) http.Handler {
+	return &echoHandler{deps}
 }

data/lib/generators/gomicroservice/scaffold/handlers/echo_test.go.erb

@@ -1,74 +1,37 @@
 package handlers
 
 import (
+	"context"
 	"encoding/json"
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
-	"log"
-	"os"
-	"github.com/facebookgo/inject"
-	"github.com/gorilla/context"
+
+	log "github.com/Sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"<%= namespace %>/<%= application_name %>/mocks"
 )
 
-var echoStatsDMock *mocks.MockStatsD
-
-func echoTestSetup(t *testing.T) {
-	// create an injection graph containing the mocked elements we wish to replace
-
-	var g inject.Graph
-
-	echoStatsDMock = &mocks.MockStatsD{}
-	EchoDependencies = &EchoDependenciesContainer{}
-
-	err := g.Provide(
-		&inject.Object{Value: EchoDependencies},
-		&inject.Object{Value: echoStatsDMock, Name: "statsd"},
-		&inject.Object{Value: log.New(os.Stdout, "tester", log.Lshortfile)},
-	)
-
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	if err := g.Populate(); err != nil {
-		fmt.Println(err)
+func echoTestSetup(t *testing.T) http.Handler {
+	deps := echoHandlerDependencies{
+		logger: &log.Logger{},
 	}
 
-	echoStatsDMock.Mock.On("Increment", mock.Anything).Return()
-}
-
-func TestEchoHandlerSetStats(t *testing.T) {
-	echoTestSetup(t)
-
-	var responseRecorder httptest.ResponseRecorder
-	var request http.Request
-
-	echo := Echo{Echo: "Hello World"}
-	context.Set(&request, "request", &echo)
-
-	EchoHandler(&responseRecorder, &request)
-
-	echoStatsDMock.Mock.AssertCalled(t, "Increment", ECHO_HANDLER+POST+CALLED)
-	echoStatsDMock.Mock.AssertCalled(t, "Increment", ECHO_HANDLER+POST+SUCCESS)
+	return newEchoHandler(deps)
 }
 
 func TestEchoHandlerCorrectlyEchosResponse(t *testing.T) {
-	echoTestSetup(t)
+	h := echoTestSetup(t)
 
 	var responseRecorder *httptest.ResponseRecorder
-	var request http.Request
+	r := httptest.NewRequest("POST", "/echo", nil)
 
 	responseRecorder = httptest.NewRecorder()
 
 	echo := Echo{Echo: "Hello World"}
-	context.Set(&request, "request", &echo)
+	c := context.WithValue(context.Background(), validationRequestKey{}, echo)
+	r = r.WithContext(c)
 
-	EchoHandler(responseRecorder, &request)
+	h.ServeHTTP(responseRecorder, r)
 
 	body := responseRecorder.Body.Bytes()
 	response := Echo{}

data/lib/generators/gomicroservice/scaffold/handlers/health.go.erb

@@ -3,58 +3,34 @@ package handlers
 import (
 	"encoding/json"
 	"net/http"
-	"log"
 
-	"<%= namespace %>/<%= application_name %>/logging"
+	log "github.com/Sirupsen/logrus"
 )
 
-// This is not particularlly a real world example it mearly shows how a builder or a factory could be injected
-// into the HealthHandler
-type HealthResponseBuilder struct {
-	statusMessage string
-}
-
-func (b *HealthResponseBuilder) SetStatusMessage(message string) *HealthResponseBuilder {
-	b.statusMessage = message
-	return b
-}
+const kTagHealth = "HealthHandler"
 
-func (b *HealthResponseBuilder) Build() HealthResponse {
-	var hr HealthResponse
-	hr.StatusMessage = b.statusMessage
-	return hr
+type HealthResponse struct {
+	StatusMessage string `json:"status_message"`
 }
 
-type HealthDependenciesContainer struct {
-	// if not specified will create singleton
-	SingletonBuilder *HealthResponseBuilder `inject:""`
-
-	// statsD interface must use a name type as injection cannot infer ducktypes
-	Stats logging.StatsD `inject:"statsd"`
-
-	// reference to the log writer
-	Log   *log.Logger     `inject:""`
-
-	// if not specified in the graph will automatically create private instance
-	PrivateBuilder *HealthResponseBuilder `inject:"private"`
+type healthHandlerDependencies struct {
+	logger *log.Logger
 }
 
-type HealthResponse struct {
-	StatusMessage string `json:"status_message"`
+type healthHandler struct {
+	deps healthHandlerDependencies
 }
 
-var HealthDependencies *HealthDependenciesContainer = &HealthDependenciesContainer{}
-const HHTAGNAME = "HealthHandler: "
-
-func HealthHandler(rw http.ResponseWriter, r *http.Request) {
+func (h *healthHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	// all HealthHandlerDependencies are automatically created by injection process
-	HealthDependencies.Stats.Increment(HEALTH_HANDLER + GET + CALLED)
-	HealthDependencies.Log.Printf("%v Called GET\n", HHTAGNAME)
+	h.deps.logger.WithField(kTagHealth, "Called GET")
 
-	response := HealthDependencies.SingletonBuilder.SetStatusMessage("OK").Build()
+	response := HealthResponse{StatusMessage: "OK"}
 
 	encoder := json.NewEncoder(rw)
 	encoder.Encode(&response)
+}
 
-	HealthDependencies.Stats.Increment(HEALTH_HANDLER + GET + SUCCESS)
+func newHealthHandler(deps healthHandlerDependencies) http.Handler {
+	return &healthHandler{deps}
 }

data/lib/generators/gomicroservice/scaffold/handlers/health_test.go.erb

@@ -1,65 +1,29 @@
 package handlers
 
 import (
-	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"testing"
-	"log"
-	"os"
-	"github.com/facebookgo/inject"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"<%= namespace %>/<%= application_name %>/mocks"
-)
-
-var healthStatsDMock *mocks.MockStatsD
-
-func healthTestSetup(t *testing.T) {
-	// create an injection graph containing the mocked elements we wish to replace
 
-	var g inject.Graph
+	log "github.com/Sirupsen/logrus"
 
-	healthStatsDMock = &mocks.MockStatsD{}
-	HealthDependencies = &HealthDependenciesContainer{}
-
-	err := g.Provide(
-		&inject.Object{Value: HealthDependencies},
-		&inject.Object{Value: healthStatsDMock, Name: "statsd"},
-		&inject.Object{Value: log.New(os.Stdout, "tester", log.Lshortfile)},
-	)
-
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	if err := g.Populate(); err != nil {
-		fmt.Println(err)
-	}
+	"github.com/stretchr/testify/assert"
+)
 
-	healthStatsDMock.Mock.On("Increment", mock.Anything).Return()
+func healthTestSetup(t *testing.T) http.Handler {
+	return newHealthHandler(healthHandlerDependencies{
+		logger: &log.Logger{},
+	})
 }
 
 // Simple test to show how we can use the ResponseRecorder to test our HTTP handlers
 func TestHealthHandler(t *testing.T) {
-	healthTestSetup(t)
+	handler := healthTestSetup(t)
 
 	var responseRecorder httptest.ResponseRecorder
 	var request http.Request
 
-	HealthHandler(&responseRecorder, &request)
+	handler.ServeHTTP(&responseRecorder, &request)
 
 	assert.Equal(t, 200, responseRecorder.Code)
 }
-
-func TestHealthHandlerSetStats(t *testing.T) {
-	healthTestSetup(t)
-
-	var responseRecorder httptest.ResponseRecorder
-	var request http.Request
-
-	HealthHandler(&responseRecorder, &request)
-
-	healthStatsDMock.Mock.AssertCalled(t, "Increment", HEALTH_HANDLER+GET+CALLED)
-	healthStatsDMock.Mock.AssertCalled(t, "Increment", HEALTH_HANDLER+GET+SUCCESS)
-}

data/lib/generators/gomicroservice/scaffold/handlers/middleware_requestvalidation.go.erb

@@ -2,41 +2,60 @@ package handlers
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 	"reflect"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/asaskevich/govalidator"
 	"github.com/gorilla/context"
-	"<%= namespace %>/<%= application_name %>/logging"
 )
 
-func requestValidationHandler(mainHandlerRef string, t reflect.Type, statsD logging.StatsD, next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-
-		request := reflect.New(t).Interface()
-
-		defer r.Body.Close()
-		data, _ := ioutil.ReadAll(r.Body)
-
-		err := json.Unmarshal(data, &request)
-		if err != nil {
-			http.Error(w, "Invalid Request", http.StatusBadRequest)
-			statsD.Increment(mainHandlerRef + BAD_REQUEST)
-			return
-		}
-
-		_, err = govalidator.ValidateStruct(request)
-		if err != nil {
-			fmt.Println("Validation Error:", err)
-			http.Error(w, "Invalid Request", http.StatusBadRequest)
-			statsD.Increment(mainHandlerRef + INVALID_REQUEST)
-			return
-		}
-
-		context.Set(r, "request", request)
-		statsD.Increment(mainHandlerRef + VALID_REQUEST)
-		next.ServeHTTP(w, r)
-	})
+const kRequestValidationTag = "RequestValidation"
+
+type validationRequestKey struct{}
+
+type requestValidationDependencies struct {
+	logger *log.Logger
+}
+
+type requestValidationHandler struct {
+	deps requestValidationDependencies
+	t    reflect.Type
+	next http.Handler
+}
+
+func (rv *requestValidationHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	rv.deps.logger.WithField(kRequestValidationTag, r.Method+" Called")
+
+	request := reflect.New(rv.t).Interface()
+
+	defer r.Body.Close()
+	data, _ := ioutil.ReadAll(r.Body)
+
+	err := json.Unmarshal(data, &request)
+	if err != nil {
+		rv.deps.logger.WithField(kRequestValidationTag, "Bad request")
+		http.Error(w, "Invalid Request", http.StatusBadRequest)
+		return
+	}
+
+	_, err = govalidator.ValidateStruct(request)
+	if err != nil {
+		rv.deps.logger.WithField(kRequestValidationTag, "Validation error")
+		http.Error(w, "Invalid Request", http.StatusBadRequest)
+		return
+	}
+
+	context.Set(r, "request", request)
+
+	rv.next.ServeHTTP(w, r)
+}
+
+func newRequestValidationHandler(deps requestValidationDependencies, t reflect.Type, next http.Handler) http.Handler {
+	return &requestValidationHandler{
+		deps: deps,
+		t:    t,
+		next: next,
+	}
 }

data/lib/generators/gomicroservice/scaffold/handlers/middleware_requestvalidation_test.go.erb

@@ -8,78 +8,71 @@ import (
 	"reflect"
 	"testing"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/context"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"<%= namespace %>/<%= application_name %>/mocks"
 )
 
 type mockType struct {
 	FirstName string `json:"first_name" valid:"alphanum,stringlength(1|255),required"`
 }
 
-var mockHandler *mocks.MockHandler
-var mockRequestStatsD *mocks.MockStatsD
+var mh *mockHandler
 
-func setupRequestValidationTests(t *testing.T) {
-	mockHandler = &mocks.MockHandler{}
-	mockRequestStatsD = &mocks.MockStatsD{}
+func setupRequestValidationTests(t *testing.T) http.Handler {
+	mh = &mockHandler{}
+	mh.Mock.On("ServeHTTP", mock.Anything, mock.Anything)
 
-	mockRequestStatsD.Mock.On("Increment", mock.Anything)
-	mockHandler.Mock.On("ServeHTTP", mock.Anything, mock.Anything)
+	validationHandler := newRequestValidationHandler(requestValidationDependencies{
+		logger: &log.Logger{},
+	},
+		reflect.TypeOf(mockType{}),
+		mh)
+
+	return validationHandler
 }
 
 func TestCallsNextOnSuccessfulValidation(t *testing.T) {
-	setupRequestValidationTests(t)
+	handler := setupRequestValidationTests(t)
 	var responseRecorder httptest.ResponseRecorder
 	var request http.Request
 	request.Body = ioutil.NopCloser(bytes.NewBufferString(`{"first_name": "Nic"}`))
 
-	handlerFunc := requestValidationHandler(HEALTH_HANDLER, reflect.TypeOf(mockType{}), mockRequestStatsD, mockHandler)
-
-	handlerFunc.ServeHTTP(&responseRecorder, &request)
+	handler.ServeHTTP(&responseRecorder, &request)
 
-	mockHandler.Mock.AssertCalled(t, "ServeHTTP", mock.Anything, mock.Anything)
-	mockRequestStatsD.Mock.AssertCalled(t, "Increment", HEALTH_HANDLER+VALID_REQUEST)
+	mh.Mock.AssertCalled(t, "ServeHTTP", mock.Anything, mock.Anything)
 }
 
 func TestSetsContextSuccessfully(t *testing.T) {
-	setupRequestValidationTests(t)
+	handler := setupRequestValidationTests(t)
 	var responseRecorder httptest.ResponseRecorder
 	var request http.Request
 	request.Body = ioutil.NopCloser(bytes.NewBufferString(`{"first_name": "Nic"}`))
 
-	handlerFunc := requestValidationHandler(HEALTH_HANDLER, reflect.TypeOf(mockType{}), mockRequestStatsD, mockHandler)
-
-	handlerFunc.ServeHTTP(&responseRecorder, &request)
+	handler.ServeHTTP(&responseRecorder, &request)
 	requestObj := context.Get(&request, "request").(*mockType)
 	assert.Equal(t, "Nic", requestObj.FirstName)
 }
 
 func TestReturnsBadRequestWhenNoObject(t *testing.T) {
-	setupRequestValidationTests(t)
+	handler := setupRequestValidationTests(t)
 	var responseRecorder httptest.ResponseRecorder
 	var request http.Request
 	request.Body = ioutil.NopCloser(bytes.NewBufferString(``))
 
-	handlerFunc := requestValidationHandler(HEALTH_HANDLER, reflect.TypeOf(mockType{}), mockRequestStatsD, mockHandler)
-
-	handlerFunc.ServeHTTP(&responseRecorder, &request)
+	handler.ServeHTTP(&responseRecorder, &request)
 
 	assert.Equal(t, http.StatusBadRequest, responseRecorder.Code)
-	mockRequestStatsD.Mock.AssertCalled(t, "Increment", HEALTH_HANDLER+BAD_REQUEST)
 }
 
 func TestReturnsBadRequestWhenRequestInvalid(t *testing.T) {
-	setupRequestValidationTests(t)
+	handler := setupRequestValidationTests(t)
 	var responseRecorder httptest.ResponseRecorder
 	var request http.Request
 	request.Body = ioutil.NopCloser(bytes.NewBufferString(`{"first_name": ""}`))
 
-	handlerFunc := requestValidationHandler(HEALTH_HANDLER, reflect.TypeOf(mockType{}), mockRequestStatsD, mockHandler)
-
-	handlerFunc.ServeHTTP(&responseRecorder, &request)
+	handler.ServeHTTP(&responseRecorder, &request)
 
 	assert.Equal(t, http.StatusBadRequest, responseRecorder.Code)
-	mockRequestStatsD.Mock.AssertCalled(t, "Increment", HEALTH_HANDLER+INVALID_REQUEST)
 }

data/lib/generators/gomicroservice/scaffold/handlers/mockHandler.go.erb

@@ -0,0 +1,12 @@
+package handlers
+
+import "net/http"
+import "github.com/stretchr/testify/mock"
+
+type mockHandler struct {
+	mock.Mock
+}
+
+func (m *mockHandler) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
+	m.Called(rw, r)
+}

data/lib/generators/gomicroservice/scaffold/handlers/xx_router.go.erb

@@ -1,34 +1,24 @@
 package handlers
 
 import (
-	"net/http"
 	"reflect"
 
+	log "github.com/Sirupsen/logrus"
 	"github.com/gorilla/pat"
-	"<%= namespace %>/<%= application_name %>/logging"
 )
 
-type RouterDependenciesContainer struct {
-	StatsD logging.StatsD `inject:"statsd"`
-}
-
-var RouterDependencies *RouterDependenciesContainer = &RouterDependenciesContainer{}
-
-func GetRouter() *pat.Router {
+func GetRouter(logger *log.Logger) *pat.Router {
 	r := pat.New()
 
-	r.Get("/v1/health", HealthHandler)
-
-	r.Add("POST", "/v1/echo", requestValidationHandler(
-		ECHO_HANDLER+POST,
+	echoHandler := newEchoHandler(echoHandlerDependencies{logger})
+	healthHandler := newHealthHandler(healthHandlerDependencies{logger})
+	validationHandler := newRequestValidationHandler(
+		requestValidationDependencies{logger},
 		reflect.TypeOf(Echo{}),
-		RouterDependencies.StatsD,
-		http.HandlerFunc(EchoHandler),
-	))
+		echoHandler)
 
-	//Add routing for static routes
-	s := http.StripPrefix("/swagger/", http.FileServer(http.Dir("/swagger")))
-	r.PathPrefix("/swagger/").Handler(s)
+	r.Add("GET", "/v1/health", healthHandler)
+	r.Add("POST", "/v1/echo", validationHandler)
 
 	return r
 }

data/lib/generators/gomicroservice/scaffold/main.go.erb

@@ -2,15 +2,14 @@ package main
 
 import (
 	"fmt"
+	"log/syslog"
 	"net/http"
 	"os"
-	"log"
-	"log/syslog"
+
+	log "github.com/Sirupsen/logrus"
+	logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
 	"<%= namespace %>/<%= application_name %>/global"
 	"<%= namespace %>/<%= application_name %>/handlers"
-
-	"github.com/facebookgo/inject"
-	"github.com/alexcesaro/statsd"
 )
 
 func main() {
@@ -19,50 +18,20 @@ func main() {
 
 	global.LoadConfig(config, rootfolder)
 
-	setupInjection()
 	setupHandlers()
 }
 
 func setupHandlers() {
-	http.Handle("/", handlers.GetRouter())
-
-	fmt.Println("Listening for connections on port", 8001)
-	http.ListenAndServe(fmt.Sprintf(":%v", 8001), nil)
-}
-
-func setupInjection() {
-	var g inject.Graph
-
-	var err error
-
-	statsdClient, err := statsd.New(statsd.Address(global.Config.StatsDServerIP)) // reference to a statsd client
+	logger := log.New()
+	hook, err := logrus_syslog.NewSyslogHook("udp", global.Config.SysLogIP, syslog.LOG_DEBUG, "")
 	if err != nil {
-		panic(fmt.Sprintln("Unable to create StatsD Client: ", err))
+		log.Fatal("Unable to create sylogger")
 	}
 
-	syslogWriter, err := syslog.Dial("udp", global.Config.SysLogIP, syslog.LOG_SYSLOG, "sorcery")
-	if err != nil {
-		panic(fmt.Sprintln("Unable to connect to syslog: ", err))
-	}
-
-	logWriter := log.New(syslogWriter, "<%= application_name %>: ", log.Lshortfile)
-
-	err = g.Provide(
-		&inject.Object{Value: handlers.RouterDependencies},
-		&inject.Object{Value: handlers.HealthDependencies},
-		&inject.Object{Value: handlers.EchoDependencies},
-		&inject.Object{Value: statsdClient, Name: "statsd"},
-		&inject.Object{Value: logWriter},
-	)
+	logger.Hooks.Add(hook)
 
-	if err != nil {
-		fmt.Println(err)
-	}
+	http.Handle("/", handlers.GetRouter(logger))
 
-	// Here the Populate call is creating instances of NameAPI &
-	// PlanetAPI, and setting the HTTPTransport on both to the
-	// http.DefaultTransport provided above:
-	if err := g.Populate(); err != nil {
-		fmt.Println(err)
-	}
+	fmt.Println("Listening for connections on port", 8001)
+	http.ListenAndServe(fmt.Sprintf(":%v", 8001), nil)
 }

data/lib/generators/gomicroservice/version.rb

@@ -1,7 +1,7 @@
 module Minke
   module Generators
     module GoMicroservice
-      VERSION = "0.8.7"
+      VERSION = "0.9.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minke-generator-go
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.9.1
 platform: ruby
 authors:
 - Nic Jackson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-05 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,40 +75,33 @@ files:
 - bin/setup
 - lib/generators/gomicroservice.rb
 - lib/generators/gomicroservice/scaffold/.gitignore.erb
-- lib/generators/gomicroservice/scaffold/_build/.gitignore
-- lib/generators/gomicroservice/scaffold/_build/Gemfile
-- lib/generators/gomicroservice/scaffold/_build/Rakefile
-- lib/generators/gomicroservice/scaffold/_build/config.yml.erb
-- lib/generators/gomicroservice/scaffold/_build/consul_keys.yml.erb
-- lib/generators/gomicroservice/scaffold/_build/dockercompose/<%= application_name
+- lib/generators/gomicroservice/scaffold/Makefile.erb
+- lib/generators/gomicroservice/scaffold/_minke/.gitignore
+- lib/generators/gomicroservice/scaffold/_minke/Gemfile
+- lib/generators/gomicroservice/scaffold/_minke/config.yml.erb
+- lib/generators/gomicroservice/scaffold/_minke/consul_keys.yml.erb
+- lib/generators/gomicroservice/scaffold/_minke/dockercompose/<%= application_name
+  %>/docker-compose-no-server.yml.erb
+- lib/generators/gomicroservice/scaffold/_minke/dockercompose/<%= application_name
   %>/docker-compose.yml.erb
-- lib/generators/gomicroservice/scaffold/_build/dockercompose/<%= application_name
-  %>/docker-no-server.yml.erb
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/Dockerfile.erb
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/config.ctmpl.erb
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/.s6-svscan/crash
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/.s6-svscan/finish
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/app/finish
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/app/run.erb
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/consul-template/finish
-- lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/consul-template/run.erb
-- lib/generators/gomicroservice/scaffold/_build/features/health.feature
-- lib/generators/gomicroservice/scaffold/_build/features/steps/http.rb
-- lib/generators/gomicroservice/scaffold/_build/features/support/env.rb.erb
-- lib/generators/gomicroservice/scaffold/_build/swagger_spec/swagger.yml.erb
+- lib/generators/gomicroservice/scaffold/_minke/dockerfile/<%= application_name %>/Dockerfile.erb
+- lib/generators/gomicroservice/scaffold/_minke/dockerfile/<%= application_name %>/config.ctmpl.erb
+- lib/generators/gomicroservice/scaffold/_minke/dockerfile/<%= application_name %>/entrypoint.sh.erb
+- lib/generators/gomicroservice/scaffold/_minke/features/health.feature
+- lib/generators/gomicroservice/scaffold/_minke/features/steps/http.rb
+- lib/generators/gomicroservice/scaffold/_minke/features/support/env.rb.erb
+- lib/generators/gomicroservice/scaffold/config.json
 - lib/generators/gomicroservice/scaffold/glide.yaml.erb
 - lib/generators/gomicroservice/scaffold/global/global.go
-- lib/generators/gomicroservice/scaffold/handlers/const.go.erb
 - lib/generators/gomicroservice/scaffold/handlers/echo.go.erb
 - lib/generators/gomicroservice/scaffold/handlers/echo_test.go.erb
 - lib/generators/gomicroservice/scaffold/handlers/health.go.erb
 - lib/generators/gomicroservice/scaffold/handlers/health_test.go.erb
 - lib/generators/gomicroservice/scaffold/handlers/middleware_requestvalidation.go.erb
 - lib/generators/gomicroservice/scaffold/handlers/middleware_requestvalidation_test.go.erb
+- lib/generators/gomicroservice/scaffold/handlers/mockHandler.go.erb
 - lib/generators/gomicroservice/scaffold/handlers/xx_router.go.erb
-- lib/generators/gomicroservice/scaffold/logging/StatsD.go
 - lib/generators/gomicroservice/scaffold/main.go.erb
-- lib/generators/gomicroservice/scaffold/mocks/mocks.go
 - lib/generators/gomicroservice/version.rb
 - minke-generator-go.gemspec
 homepage: https://github.com/nicholasjackson/minkie-generator-go
@@ -132,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Go microservice template for Minke

data/lib/generators/gomicroservice/scaffold/_build/Rakefile

@@ -1,4 +0,0 @@
-require 'minke'
-
-spec = Gem::Specification.find_by_name 'minke'
-Rake.add_rakelib "#{spec.gem_dir}/lib/minke/rake"

data/lib/generators/gomicroservice/scaffold/_build/consul_keys.yml.erb

@@ -1,13 +0,0 @@
----
-  <%= application_name %>:
-    Credentials:
-      mysql:
-        username: root
-        password: my-secret-pw
-    Settings:
-      environment: dev
-      mysql:
-        db_name: <%= application_name %>
-      statsd:
-        host: statsd
-        port: 8125

data/lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/.s6-svscan/crash

@@ -1 +0,0 @@
-#!/bin/sh

data/lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/.s6-svscan/finish

@@ -1 +0,0 @@
-#!/bin/sh

data/lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/app/finish

@@ -1 +0,0 @@
-#!/bin/sh

data/lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/app/run.erb

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /<%= application_name %>/<%= application_name %> /<%= application_name %>/config.json /<%= application_name %>

data/lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/consul-template/finish

@@ -1 +0,0 @@
-#!/bin/sh

data/lib/generators/gomicroservice/scaffold/_build/dockerfile/<%= application_name %>/s6-etc/consul-template/run.erb

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/consul-template -consul=$CONSUL -template "/<%= application_name %>/config.ctmpl:/<%= application_name %>/config.json:killall <%= application_name %>"

data/lib/generators/gomicroservice/scaffold/_build/swagger_spec/swagger.yml.erb

@@ -1,34 +0,0 @@
-swagger: '2.0'
-info:
-  title: <%= application_name %>
-  description: <%= application_name %> Description
-  version: 1.0.0
-host: api.test.com
-schemes:
-  - http
-basePath: /v1
-produces:
-  - application/json
-paths:
-  /health:
-    get:
-      summary: Health Check
-      description: |
-        The Health Check endpoint is used to determine the current status for the health of the api.
-        This endpoint will be used by other systems such as Consul and other service discovery systems.
-      tags:
-        - Health
-      responses:
-        '200':
-          description: Status message from server describing current health
-          schema:
-            type: array
-            items:
-              $ref: '#/definitions/HealthResponse'
-definitions:
-  HealthResponse:
-    type: object
-    properties:
-      status_message:
-        type: string
-        description: 'Plain text readable response corresponding to current health status'

data/lib/generators/gomicroservice/scaffold/handlers/const.go.erb

@@ -1,12 +0,0 @@
-package handlers
-
-const GET = ".get"
-const POST = ".post"
-const CALLED = ".called"
-const SUCCESS = ".success"
-const BAD_REQUEST = ".bad_request"
-const INVALID_REQUEST = ".invalid_request"
-const VALID_REQUEST = ".valid_request"
-
-const HEALTH_HANDLER = "<%= application_name %>.health_handler"
-const ECHO_HANDLER = "<%= application_name %>.echo_handler"

data/lib/generators/gomicroservice/scaffold/logging/StatsD.go

@@ -1,6 +0,0 @@
-package logging
-
-// StatsD interface is to allow the class .. to be injected as a DuckType
-type StatsD interface {
-	Increment(string)
-}

data/lib/generators/gomicroservice/scaffold/mocks/mocks.go

@@ -1,23 +0,0 @@
-package mocks
-
-import (
-	"net/http"
-
-	"github.com/stretchr/testify/mock"
-)
-
-type MockStatsD struct {
-	mock.Mock
-}
-
-func (m *MockStatsD) Increment(label string) {
-	_ = m.Mock.Called(label)
-}
-
-type MockHandler struct {
-	mock.Mock
-}
-
-func (m *MockHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	_ = m.Mock.Called(w, r)
-}