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

Enable prefix based routing (#2047)

Browse Source 
* Enable prefix based routing

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Optimize checking condition

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Disable few tests

* disable router modification for now

* run code generator

* Collect fission dump in CI

* Enable all tests back

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Remove unwanted code

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Add prefix support at more places and couple of todo's

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Few more changes

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Improve function trim support

* Support for prefix based urls in fission function test

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* multi route for fission function test

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Improve validations in trigger creations

* Adjust leading / in url from fission

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Change suburl to subpath for function test

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

Co-authored-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Harsh Thakur
2021-06-10 13:54:49 +05:30
committed by GitHub
co-authored by Sanket Sudake
parent f01de5c802
commit aa45703a99
20 changed files with 149 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/function/command.go
+2 -1
View File
@@ -43,7 +43,7 @@ func Commands() *cobra.Command {
flag.PkgSrcChecksum, flag.PkgDeployChecksum, flag.PkgInsecure,
flag.FnBuildCmd,
flag.HtUrl, flag.HtMethod,
flag.HtUrl, flag.HtPrefix, flag.HtMethod,
// flag for newdeploy to use.
flag.RunTimeMinCPU, flag.RunTimeMaxCPU, flag.RunTimeMinMemory,
@@ -150,6 +150,7 @@ func Commands() *cobra.Command {
// for getting log from log database if
// we failed to get logs from function pod.
flag.FnLogDBType,
flag.FnSubPath,
},
})
pkg/fission-cli/cmd/function/create.go
+5 -5
View File
@@ -18,7 +18,6 @@ package function
import (
"fmt"
"strings"
"github.com/pkg/errors"
uuid "github.com/satori/go.uuid"
@@ -339,13 +338,13 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
// Allow the user to specify an HTTP trigger while creating a function.
triggerUrl := input.String(flagkey.HtUrl)
if len(triggerUrl) == 0 {
prefix := input.String(flagkey.HtPrefix)
if len(triggerUrl) == 0 && len(prefix) == 0 {
return nil
}
if !strings.HasPrefix(triggerUrl, "/") {
triggerUrl = fmt.Sprintf("/%s", triggerUrl)
if len(prefix) != 0 && len(triggerUrl) > 0 {
console.Warn("Prefix will take precedence over URL/RelativeURL")
}
method, err := httptrigger.GetMethod(input.String(flagkey.HtMethod))
if err != nil {
return errors.Wrap(err, "error getting HTTP trigger method")
@@ -359,6 +358,7 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
},
Spec: fv1.HTTPTriggerSpec{
RelativeURL: triggerUrl,
Prefix: &prefix,
Method: method,
FunctionReference: fv1.FunctionReference{
Type: fv1.FunctionReferenceTypeFunctionName,
pkg/fission-cli/cmd/function/test.go
+9 -7
View File
@@ -18,7 +18,6 @@ package function
import (
"context"
"fmt"
"io/ioutil"
"net/http"
"net/url"
@@ -62,14 +61,17 @@ func (opts *TestSubCommand) do(input cli.Input) error {
if err != nil {
return err
}
routerURL = "127.0.0.1:" + localRouterPort
fnUri := m.Name
if m.Namespace != metav1.NamespaceDefault {
fnUri = fmt.Sprintf("%v/%v", m.Namespace, m.Name)
fnURL := "http://127.0.0.1:" + localRouterPort + util.UrlForFunction(m.Name, m.Namespace)
if input.IsSet(flagkey.FnSubPath) {
subPath := input.String(flagkey.FnSubPath)
if !strings.HasPrefix(subPath, "/") {
fnURL = fnURL + "/" + subPath
} else {
fnURL = fnURL + subPath
}
}
functionUrl, err := url.Parse(fmt.Sprintf("http://%s/fission-function/%s", routerURL, fnUri))
functionUrl, err := url.Parse(fnURL)
if err != nil {
return err
}
pkg/fission-cli/cmd/httptrigger/command.go
+4 -4
View File
@@ -30,10 +30,10 @@ func Commands() *cobra.Command {
RunE: wrapper.Wrapper(Create),
}
wrapper.SetFlags(createCmd, flag.FlagSet{
Required: []flag.Flag{flag.HtUrl, flag.HtFnName},
Optional: []flag.Flag{flag.HtName, flag.HtMethod, flag.HtIngress,
Required: []flag.Flag{flag.HtFnName},
Optional: []flag.Flag{flag.HtUrl, flag.HtName, flag.HtMethod, flag.HtIngress,
flag.HtIngressRule, flag.HtIngressAnnotation, flag.HtIngressTLS,
flag.HtFnWeight, flag.HtHost, flag.NamespaceFunction, flag.SpecSave, flag.SpecDry},
flag.HtFnWeight, flag.HtHost, flag.NamespaceFunction, flag.SpecSave, flag.SpecDry, flag.HtPrefix},
})
getCmd := &cobra.Command{
@@ -56,7 +56,7 @@ func Commands() *cobra.Command {
Required: []flag.Flag{flag.HtName},
Optional: []flag.Flag{flag.HtUrl, flag.HtFnName,
flag.HtMethod, flag.HtIngress, flag.HtIngressRule, flag.HtIngressAnnotation,
flag.HtIngressTLS, flag.HtFnWeight, flag.HtHost, flag.NamespaceTrigger},
flag.HtIngressTLS, flag.HtFnWeight, flag.HtHost, flag.NamespaceTrigger, flag.HtPrefix},
})
deleteCmd := &cobra.Command{
pkg/fission-cli/cmd/httptrigger/create.go
+20 -3
View File
@@ -19,6 +19,7 @@ package httptrigger
import (
"fmt"
"net/http"
"os"
"strings"
"github.com/pkg/errors"
@@ -87,10 +88,25 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
}
triggerUrl := input.String(flagkey.HtUrl)
if triggerUrl == "/" {
prefix := input.String(flagkey.HtPrefix)
if triggerUrl == "" && prefix == "" {
console.Error("You need to supply either Prefix or URL/RelativeURL")
os.Exit(1)
}
if triggerUrl != "" && prefix != "" {
console.Warn("Prefix will take precedence over URL/RelativeURL")
}
if triggerUrl == "/" || prefix == "/" {
return errors.New("url with only root path is not allowed")
} else if !strings.HasPrefix(triggerUrl, "/") {
triggerUrl = fmt.Sprintf("/%s", triggerUrl)
}
if triggerUrl != "" && !strings.HasPrefix(triggerUrl, "/") {
triggerUrl = "/" + triggerUrl
}
if prefix != "" && !strings.HasPrefix(prefix, "/") {
prefix = "/" + prefix
}
method, err := GetMethod(input.String(flagkey.HtMethod))
@@ -149,6 +165,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
FunctionReference: *functionRef,
CreateIngress: createIngress,
IngressConfig: *ingressConfig,
Prefix: &prefix,
},
}
pkg/fission-cli/cmd/httptrigger/update.go
+26 -3
View File
@@ -18,6 +18,7 @@ package httptrigger
import (
"fmt"
"strings"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -59,10 +60,26 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
return errors.Wrap(err, "error getting HTTP trigger")
}
if input.IsSet(flagkey.HtUrl) {
ht.Spec.RelativeURL = input.String(flagkey.HtUrl)
triggerUrl := input.String(flagkey.HtUrl)
prefix := input.String(flagkey.HtPrefix)
if triggerUrl != "" && prefix != "" {
console.Warn("Prefix will take precedence over URL/RelativeURL")
}
if triggerUrl == "/" || prefix == "/" {
return errors.New("url with only root path is not allowed")
}
if triggerUrl != "" && !strings.HasPrefix(triggerUrl, "/") {
triggerUrl = "/" + triggerUrl
}
if prefix != "" && !strings.HasPrefix(prefix, "/") {
prefix = "/" + prefix
}
ht.Spec.RelativeURL = triggerUrl
ht.Spec.Prefix = &prefix
if input.IsSet(flagkey.HtMethod) {
ht.Spec.Method = input.String(flagkey.HtMethod)
}
@@ -98,9 +115,15 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
}
if input.IsSet(flagkey.HtIngressRule) || input.IsSet(flagkey.HtIngressAnnotation) || input.IsSet(flagkey.HtIngressTLS) {
fallbackURL := ""
if ht.Spec.Prefix != nil && *ht.Spec.Prefix != "" {
fallbackURL = *ht.Spec.Prefix
} else {
fallbackURL = ht.Spec.RelativeURL
}
ingress, err := GetIngressConfig(
input.StringSlice(flagkey.HtIngressAnnotation), input.String(flagkey.HtIngressRule),
input.String(flagkey.HtIngressTLS), ht.Spec.RelativeURL, &ht.Spec.IngressConfig)
input.String(flagkey.HtIngressTLS), fallbackURL, &ht.Spec.IngressConfig)
if err != nil {
return errors.Wrap(err, "error parsing ingress configuration")
}
pkg/fission-cli/cmd/spec/list.go
+3 -1
View File
@@ -317,10 +317,12 @@ func ShowHTTPTriggers(hts []fv1.HTTPTrigger) {
host = trigger.Spec.IngressConfig.Host
}
path := trigger.Spec.RelativeURL
if trigger.Spec.Prefix != nil && *trigger.Spec.Prefix != "" {
path = *trigger.Spec.Prefix
}
if len(trigger.Spec.IngressConfig.Path) > 0 {
path = trigger.Spec.IngressConfig.Path
}
var msg []string
for k, v := range trigger.Spec.IngressConfig.Annotations {
msg = append(msg, fmt.Sprintf("%v: %v", k, v))
pkg/fission-cli/cmd/spec/spec.go
-5
View File
@@ -566,11 +566,6 @@ func (fr *FissionResources) ParseYaml(b []byte, loc *Location) error {
return errors.Wrap(err, fmt.Sprintf("Failed to parse %v in %v", tm.Kind, loc))
}
// TODO move to validator
if !strings.HasPrefix(v.Spec.RelativeURL, "/") {
v.Spec.RelativeURL = fmt.Sprintf("/%s", v.Spec.RelativeURL)
}
m = &v.ObjectMeta
fr.HttpTriggers = append(fr.HttpTriggers, v)
case "KubernetesWatchTrigger":