Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Capitalize type names to prepare for moving them to the top level package

Browse Source
This commit is contained in:
Soam Vasani
2016-09-09 14:39:31 -07:00
parent 67ce88ebcc
commit 796a9810a4
7 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
router/functionHandler.go
+4 -4
View File
@@ -27,7 +27,7 @@ import (
type functionHandler struct {
fmap *functionServiceMap
poolManagerUrl string
function
Function
}
func (*functionHandler) getServiceForFunction() (*url.URL, error) {
@@ -35,20 +35,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
+2 -2
View File
@@ -48,11 +48,11 @@ func TestFunctionProxying(t *testing.T) {
backendURL := createBackendService(testResponseString)
log.Printf("Created backend svc at %v", backendURL)
fn := &function{name: "foo", uid: "xxx"}
fn := &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
+9 -9
View File
@@ -36,7 +36,7 @@ type functionServiceMapResponse struct {
error
}
type functionServiceMapRequest struct {
function
Function
serviceUrl url.URL
requestType
responseChannel chan<- functionServiceMapResponse
@@ -48,7 +48,7 @@ type functionServiceMapEntry struct {
type functionServiceMap struct {
// map (funcname, uid) -> url
svc map[function]functionServiceMapEntry
svc map[Function]functionServiceMapEntry
currentGeneration uint64
requestChannel chan *functionServiceMapRequest
}
@@ -56,7 +56,7 @@ type functionServiceMap struct {
func makeFunctionServiceMap() *functionServiceMap {
fmap := &functionServiceMap{}
fmap.requestChannel = make(chan *functionServiceMapRequest)
fmap.svc = make(map[function]functionServiceMapEntry)
fmap.svc = make(map[Function]functionServiceMapEntry)
go fmap.functionServiceMapWork()
return fmap
}
@@ -66,14 +66,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 +87,9 @@ func (fmap *functionServiceMap) functionServiceMapWork() {
}
}
func (fmap *functionServiceMap) lookup(f *function) (*url.URL, error) {
func (fmap *functionServiceMap) lookup(f *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 +98,8 @@ func (fmap *functionServiceMap) lookup(f *function) (*url.URL, error) {
}
}
func (fmap *functionServiceMap) assign(f *function, serviceUrl *url.URL) {
fmap.requestChannel <- &functionServiceMapRequest{function: *f, serviceUrl: *serviceUrl, requestType: ASSIGN}
func (fmap *functionServiceMap) assign(f *Function, serviceUrl *url.URL) {
fmap.requestChannel <- &functionServiceMapRequest{Function: *f, serviceUrl: *serviceUrl, requestType: ASSIGN}
}
func (fmap *functionServiceMap) nextGen() {
router/functionServiceMap_test.go
+2 -2
View File
@@ -23,7 +23,7 @@ import (
func TestFunctionServiceMap(t *testing.T) {
m := makeFunctionServiceMap()
fn := &function{name: "foo", uid: "012"}
fn := &Function{Name: "foo", Uid: "012"}
u, err := url.Parse("/foo012")
if err != nil {
t.Errorf("can't parse url")
@@ -39,7 +39,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
+4 -4
View File
@@ -25,11 +25,11 @@ type HTTPTriggerSet struct {
*mutableRouter
controllerUrl string
poolManagerUrl string
triggers []httptrigger
triggers []HTTPTrigger
}
func makeHTTPTriggerSet(fmap *functionServiceMap, controllerUrl string, poolManagerUrl string) *HTTPTriggerSet {
triggers := make([]httptrigger, 1)
triggers := make([]HTTPTrigger, 1)
return &HTTPTriggerSet{
functionServiceMap: fmap,
triggers: triggers,
@@ -49,10 +49,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
+8 -8
View File
@@ -47,14 +47,14 @@ import (
)
type (
function struct {
name string
uid string
Function struct {
Name string
Uid string
}
httptrigger struct {
urlPattern string
function
HTTPTrigger struct {
UrlPattern string
Function
}
options struct {
@@ -65,9 +65,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
+2 -2
View File
@@ -24,7 +24,7 @@ import (
func TestRouter(t *testing.T) {
fmap := makeFunctionServiceMap()
fn := &function{name: "foo", uid: "xxx"}
fn := &Function{Name: "foo", Uid: "xxx"}
testResponseString := "hi"
testServiceUrl := createBackendService(testResponseString)
@@ -33,7 +33,7 @@ func TestRouter(t *testing.T) {
triggers := makeHTTPTriggerSet(fmap, "", "")
triggerUrl := "/foo"
triggers.triggers = append(triggers.triggers, httptrigger{triggerUrl, *fn})
triggers.triggers = append(triggers.triggers, HTTPTrigger{triggerUrl, *fn})
port := 4242
go server(port, triggers)