/*
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

import (
	"fmt"
)

func UrlForFunction(m *Metadata) string {
	prefix := "/fission-function"
	if len(m.Uid) > 0 {
		return fmt.Sprintf("%v/%v/%v", prefix, m.Name, m.Uid)
	} else {
		return fmt.Sprintf("%v/%v", prefix, m.Name)
	}
}

/*
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

import (
	"fmt"
)

func UrlForFunction(m *Metadata) string {
	// TODO this assumes the router's namespace is the same as whatever is hitting
	// this url -- so e.g. kubewatcher will have to run in the same ns as router.
	prefix := "http://router/fission-function"
	if len(m.Uid) > 0 {
		return fmt.Sprintf("%v/%v/%v", prefix, m.Name, m.Uid)
	} else {
		return fmt.Sprintf("%v/%v", prefix, m.Name)
	}
}

--- 
+++ 
@@ -21,9 +21,7 @@
 )
 
 func UrlForFunction(m *Metadata) string {
-	// TODO this assumes the router's namespace is the same as whatever is hitting
-	// this url -- so e.g. kubewatcher will have to run in the same ns as router.
-	prefix := "http://router/fission-function"
+	prefix := "/fission-function"
 	if len(m.Uid) > 0 {
 		return fmt.Sprintf("%v/%v/%v", prefix, m.Name, m.Uid)
 	} else {
Make internal urls relative (as before)
