Move Function and HTTPTrigger types to top level 'fission' package

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
 }
@@ -87,7 +89,7 @@ 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}
 	resp := <-respChannel
@@ -98,7 +100,7 @@ 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}
 }