Merge pull request #2 from Comcast/feature/scytale-2.0

Feature/scytale 2.0

.gitignore

@@ -11,16 +11,13 @@ src/vendor
 +src/scytale/output
 
  # config
--src/scytale/scytale.json
-+src/scytale/scytale.json
 +keys/*.private
 
 src/scytale/scytale
 src/scytale/debug
 src/scytale/output
 
 # config
-src/scytale/scytale.json
 keys/*.private
 
 # Vim

src/glide.yaml

@@ -1,14 +1,4 @@
 package: .
 import:
 - package: github.com/Comcast/webpa-common
-  subpackages:
-  - concurrent
-  - handler
-  - health
-  - logging
-  - secure
-  - server
-- package: github.com/gorilla/mux
-- package: github.com/justinas/alice
-- package: github.com/spf13/pflag
-- package: github.com/spf13/viper
+  version: 05094818a42ba3682b43c60c29a237d8e6995341

src/scytale/primaryHandler.go

@@ -0,0 +1,72 @@
+package main
+
+import (
+	"fmt"
+	"net/http"
+
+	"github.com/Comcast/webpa-common/wrp"
+	"github.com/Comcast/webpa-common/wrp/wrphttp"
+	"github.com/go-kit/kit/log"
+	gokithttp "github.com/go-kit/kit/transport/http"
+	"github.com/gorilla/mux"
+	"github.com/spf13/viper"
+)
+
+const (
+	baseURI = "/api"
+	version = "v2"
+)
+
+func NewPrimaryHandler(logger log.Logger, v *viper.Viper) (http.Handler, error) {
+	fanoutOptions := new(wrphttp.FanoutOptions)
+	if err := v.UnmarshalKey("fanout", fanoutOptions); err != nil {
+		return nil, err
+	}
+
+	fanoutOptions.Logger = logger
+	fanoutEndpoint, err := wrphttp.NewFanoutEndpoint(fanoutOptions)
+	if err != nil {
+		return nil, err
+	}
+
+	var (
+		router     = mux.NewRouter()
+		subrouter  = router.Path(fmt.Sprintf("%s/%s/device", baseURI, version)).Methods("POST", "PUT").Subrouter()
+		timeLayout = ""
+	)
+
+	subrouter.Headers(wrphttp.MessageTypeHeader, "").Handler(
+		gokithttp.NewServer(
+			fanoutEndpoint,
+			wrphttp.ServerDecodeRequestHeaders(logger),
+			wrphttp.ServerEncodeResponseHeaders(timeLayout),
+			gokithttp.ServerErrorEncoder(
+				wrphttp.ServerErrorEncoder(timeLayout),
+			),
+		),
+	)
+
+	subrouter.Headers("Content-Type", wrp.JSON.ContentType()).Handler(
+		gokithttp.NewServer(
+			fanoutEndpoint,
+			wrphttp.ServerDecodeRequestBody(logger, fanoutOptions.NewDecoderPool(wrp.JSON)),
+			wrphttp.ServerEncodeResponseBody(timeLayout, fanoutOptions.NewEncoderPool(wrp.JSON)),
+			gokithttp.ServerErrorEncoder(
+				wrphttp.ServerErrorEncoder(timeLayout),
+			),
+		),
+	)
+
+	subrouter.Headers("Content-Type", wrp.Msgpack.ContentType()).Handler(
+		gokithttp.NewServer(
+			fanoutEndpoint,
+			wrphttp.ServerDecodeRequestBody(logger, fanoutOptions.NewDecoderPool(wrp.Msgpack)),
+			wrphttp.ServerEncodeResponseBody(timeLayout, fanoutOptions.NewEncoderPool(wrp.Msgpack)),
+			gokithttp.ServerErrorEncoder(
+				wrphttp.ServerErrorEncoder(timeLayout),
+			),
+		),
+	)
+
+	return router, nil
+}