Merge pull request #6 from platform9/top-level-package

Move some fission structs to top level package

router/functionHandler.go

@@ -22,12 +22,14 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+
+	"github.com/platform9/fission"
 )
 
 type functionHandler struct {
 	fmap           *functionServiceMap
 	poolManagerUrl string
-	function
+	fission.Function
 }
 
 func (*functionHandler) getServiceForFunction() (*url.URL, error) {
@@ -35,20 +37,20 @@ func (*functionHandler) getServiceForFunction() (*url.URL, error) {
 }
 
 func (fh *functionHandler) handler(responseWriter http.ResponseWriter, request *http.Request) {
-	serviceUrl, err := fh.fmap.lookup(&fh.function)
+	serviceUrl, err := fh.fmap.lookup(&fh.Function)
 	if err != nil {
 		// Cache miss: request the Pool Manager to make a new service.
 		serviceUrl, poolErr := fh.getServiceForFunction()
 		if poolErr != nil {
 			// now we're really screwed
 			log.Printf("Failed to get service for function (%v,%v): %v",
-				fh.function.name, fh.function.uid, poolErr)
+				fh.Function.Name, fh.Function.Uid, poolErr)
 			responseWriter.WriteHeader(500) // TODO: make this smarter based on the actual error
 			return
 		}
 
 		// add it to the map
-		fh.fmap.assign(&fh.function, serviceUrl)
+		fh.fmap.assign(&fh.Function, serviceUrl)
 	}
 
 	// Proxy off our request to the serviceUrl, and send the response back.

router/functionHandler_test.go

@@ -19,10 +19,11 @@ package router
 import (
 	"log"
 	"net/http"
-	"testing"
-	//	"net/http/httputil"
 	"net/http/httptest"
 	"net/url"
+	"testing"
+
+	"github.com/platform9/fission"
 )
 
 func createBackendService(testResponseString string) *url.URL {
@@ -48,11 +49,11 @@ func TestFunctionProxying(t *testing.T) {
 	backendURL := createBackendService(testResponseString)
 	log.Printf("Created backend svc at %v", backendURL)
 
-	fn := &function{name: "foo", uid: "xxx"}
+	fn := &fission.Function{Name: "foo", Uid: "xxx"}
 	fmap := makeFunctionServiceMap()
 	fmap.assign(fn, backendURL)
 
-	fh := &functionHandler{fmap: fmap, function: *fn}
+	fh := &functionHandler{fmap: fmap, Function: *fn}
 	functionHandlerServer := httptest.NewServer(http.HandlerFunc(fh.handler))
 	fhURL := functionHandlerServer.URL
 

router/functionServiceMap.go

@@ -20,6 +20,8 @@ import (
 	"errors"
 	"log"
 	"net/url"
+
+	"github.com/platform9/fission"
 )
 
 type requestType int
@@ -36,7 +38,7 @@ type functionServiceMapResponse struct {
 	error
 }
 type functionServiceMapRequest struct {
-	function
+	fission.Function
 	serviceUrl url.URL
 	requestType
 	responseChannel chan<- functionServiceMapResponse
@@ -48,7 +50,7 @@ type functionServiceMapEntry struct {
 
 type functionServiceMap struct {
 	// map (funcname, uid) -> url
-	svc               map[function]functionServiceMapEntry
+	svc               map[fission.Function]functionServiceMapEntry
 	currentGeneration uint64
 	requestChannel    chan *functionServiceMapRequest
 }
@@ -56,7 +58,7 @@ type functionServiceMap struct {
 func makeFunctionServiceMap() *functionServiceMap {
 	fmap := &functionServiceMap{}
 	fmap.requestChannel = make(chan *functionServiceMapRequest)
-	fmap.svc = make(map[function]functionServiceMapEntry)
+	fmap.svc = make(map[fission.Function]functionServiceMapEntry)
 	go fmap.functionServiceMapWork()
 	return fmap
 }
@@ -66,14 +68,14 @@ func (fmap *functionServiceMap) functionServiceMapWork() {
 		req := <-fmap.requestChannel
 		switch req.requestType {
 		case LOOKUP:
-			e, present := fmap.svc[req.function]
+			e, present := fmap.svc[req.Function]
 			if present {
 				req.responseChannel <- functionServiceMapResponse{serviceUrl: e.serviceUrl}
 			} else {
 				req.responseChannel <- functionServiceMapResponse{error: errors.New("not found")}
 			}
 		case ASSIGN:
-			fmap.svc[req.function] =
+			fmap.svc[req.Function] =
 				functionServiceMapEntry{serviceUrl: req.serviceUrl, generation: fmap.currentGeneration}
 			// no response
 		case NEXT_GEN:
@@ -87,9 +89,9 @@ func (fmap *functionServiceMap) functionServiceMapWork() {
 	}
 }
 
-func (fmap *functionServiceMap) lookup(f *function) (*url.URL, error) {
+func (fmap *functionServiceMap) lookup(f *fission.Function) (*url.URL, error) {
 	respChannel := make(chan functionServiceMapResponse)
-	fmap.requestChannel <- &functionServiceMapRequest{function: *f, requestType: LOOKUP, responseChannel: respChannel}
+	fmap.requestChannel <- &functionServiceMapRequest{Function: *f, requestType: LOOKUP, responseChannel: respChannel}
 	resp := <-respChannel
 	if resp.error != nil {
 		return nil, resp.error
@@ -98,8 +100,8 @@ func (fmap *functionServiceMap) lookup(f *function) (*url.URL, error) {
 	}
 }
 
-func (fmap *functionServiceMap) assign(f *function, serviceUrl *url.URL) {
+func (fmap *functionServiceMap) assign(f *fission.Function, serviceUrl *url.URL) {
-	fmap.requestChannel <- &functionServiceMapRequest{function: *f, serviceUrl: *serviceUrl, requestType: ASSIGN}
+	fmap.requestChannel <- &functionServiceMapRequest{Function: *f, serviceUrl: *serviceUrl, requestType: ASSIGN}
 }
 
 func (fmap *functionServiceMap) nextGen() {

router/functionServiceMap_test.go

@@ -19,11 +19,13 @@ package router
 import (
 	"net/url"
 	"testing"
+
+	"github.com/platform9/fission"
 )
 
 func TestFunctionServiceMap(t *testing.T) {
 	m := makeFunctionServiceMap()
-	fn := &function{name: "foo", uid: "012"}
+	fn := &fission.Function{Name: "foo", Uid: "012"}
 	u, err := url.Parse("/foo012")
 	if err != nil {
 		t.Errorf("can't parse url")
@@ -39,7 +41,7 @@ func TestFunctionServiceMap(t *testing.T) {
 		t.Errorf("Expected %#v, got %#v", u, v)
 	}
 
-	fn.name = "bar"
+	fn.Name = "bar"
 	_, err2 := m.lookup(fn)
 	if err2 == nil {
 		t.Errorf("No error on missing entry")

router/httpTriggers.go

@@ -18,6 +18,7 @@ package router
 
 import (
 	"github.com/gorilla/mux"
+	"github.com/platform9/fission"
 )
 
 type HTTPTriggerSet struct {
@@ -25,11 +26,11 @@ type HTTPTriggerSet struct {
 	*mutableRouter
 	controllerUrl  string
 	poolManagerUrl string
-	triggers       []httptrigger
+	triggers       []fission.HTTPTrigger
 }
 
 func makeHTTPTriggerSet(fmap *functionServiceMap, controllerUrl string, poolManagerUrl string) *HTTPTriggerSet {
-	triggers := make([]httptrigger, 1)
+	triggers := make([]fission.HTTPTrigger, 1)
 	return &HTTPTriggerSet{
 		functionServiceMap: fmap,
 		triggers:           triggers,
@@ -49,10 +50,10 @@ func (triggers *HTTPTriggerSet) getRouterFromTriggers() *mux.Router {
 	for _, trigger := range triggers.triggers {
 		fh := &functionHandler{
 			fmap:           triggers.functionServiceMap,
-			function:       trigger.function,
+			Function:       trigger.Function,
 			poolManagerUrl: triggers.poolManagerUrl,
 		}
-		muxRouter.HandleFunc(trigger.urlPattern, fh.handler)
+		muxRouter.HandleFunc(trigger.UrlPattern, fh.handler)
 	}
 	return muxRouter
 }

router/router.go

@@ -47,16 +47,6 @@ import (
 )
 
 type (
-	function struct {
-		name string
-		uid  string
-	}
-
-	httptrigger struct {
-		urlPattern string
-		function
-	}
-
 	options struct {
 		port           int
 		poolManagerUrl string
@@ -65,9 +55,9 @@ type (
 	}
 )
 
-// request url ---[mux]---> function(name,uid) ----[fmap]----> k8s service url
+// request url ---[mux]---> Function(name,uid) ----[fmap]----> k8s service url
 
-// request url ---[trigger]---> function(name, deployment) ----[deployment]----> function(name, uid) ----[pool mgr]---> k8s service url
+// request url ---[trigger]---> Function(name, deployment) ----[deployment]----> Function(name, uid) ----[pool mgr]---> k8s service url
 
 func router(httpTriggerSet *HTTPTriggerSet) *mutableRouter {
 	muxRouter := mux.NewRouter()

router/router_test.go

@@ -20,11 +20,13 @@ import (
 	"fmt"
 	"testing"
 	"time"
+
+	"github.com/platform9/fission"
 )
 
 func TestRouter(t *testing.T) {
 	fmap := makeFunctionServiceMap()
-	fn := &function{name: "foo", uid: "xxx"}
+	fn := &fission.Function{Name: "foo", Uid: "xxx"}
 
 	testResponseString := "hi"
 	testServiceUrl := createBackendService(testResponseString)
@@ -33,7 +35,7 @@ func TestRouter(t *testing.T) {
 
 	triggers := makeHTTPTriggerSet(fmap, "", "")
 	triggerUrl := "/foo"
-	triggers.triggers = append(triggers.triggers, httptrigger{triggerUrl, *fn})
+	triggers.triggers = append(triggers.triggers, fission.HTTPTrigger{triggerUrl, *fn})
 
 	port := 4242
 	go server(port, triggers)

types.go

@@ -0,0 +1,29 @@
+/*
+Copyright 2016 The Fission Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fission
+
+type (
+	Function struct {
+		Name string
+		Uid  string
+	}
+
+	HTTPTrigger struct {
+		UrlPattern string
+		Function
+	}
+)