Remove redundant code and simplify input parsing during HTTPTrigger creation (#2990)
* 去除environment创建操作中的注释及更新过程中存在的冗余代码 * Remove redundant code and simplify input parsing during HTTPTrigger creation --------- Co-authored-by: yufu huang <yufu.huang@gientech.com>
This commit is contained in:
@@ -107,9 +107,6 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
methods := input.StringSlice(flagkey.HtMethod)
|
methods := input.StringSlice(flagkey.HtMethod)
|
||||||
if len(methods) == 0 {
|
|
||||||
return errors.New("HTTP methods not mentioned")
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, method := range methods {
|
for _, method := range methods {
|
||||||
_, err := GetMethod(method)
|
_, err := GetMethod(method)
|
||||||
@@ -166,7 +163,6 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
createIngress := input.Bool(flagkey.HtIngress)
|
|
||||||
ingressConfig, err := GetIngressConfig(
|
ingressConfig, err := GetIngressConfig(
|
||||||
input.StringSlice(flagkey.HtIngressAnnotation), input.String(flagkey.HtIngressRule),
|
input.StringSlice(flagkey.HtIngressAnnotation), input.String(flagkey.HtIngressRule),
|
||||||
input.String(flagkey.HtIngressTLS), fallbackURL, nil)
|
input.String(flagkey.HtIngressTLS), fallbackURL, nil)
|
||||||
@@ -174,26 +170,20 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
|
|||||||
return errors.Wrap(err, "error parsing ingress configuration")
|
return errors.Wrap(err, "error parsing ingress configuration")
|
||||||
}
|
}
|
||||||
|
|
||||||
host := input.String(flagkey.HtHost)
|
|
||||||
|
|
||||||
opts.trigger = &fv1.HTTPTrigger{
|
opts.trigger = &fv1.HTTPTrigger{
|
||||||
ObjectMeta: m,
|
ObjectMeta: m,
|
||||||
Spec: fv1.HTTPTriggerSpec{
|
Spec: fv1.HTTPTriggerSpec{
|
||||||
Host: host,
|
Host: input.String(flagkey.HtHost),
|
||||||
RelativeURL: triggerUrl,
|
RelativeURL: triggerUrl,
|
||||||
Methods: methods,
|
Methods: methods,
|
||||||
FunctionReference: *functionRef,
|
FunctionReference: *functionRef,
|
||||||
CreateIngress: createIngress,
|
CreateIngress: input.Bool(flagkey.HtIngress),
|
||||||
IngressConfig: *ingressConfig,
|
IngressConfig: *ingressConfig,
|
||||||
Prefix: &prefix,
|
Prefix: &prefix,
|
||||||
KeepPrefix: input.Bool(flagkey.HtKeepPrefix),
|
KeepPrefix: input.Bool(flagkey.HtKeepPrefix),
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if input.IsSet(flagkey.HtKeepPrefix) {
|
|
||||||
opts.trigger.Spec.KeepPrefix = input.Bool(flagkey.HtKeepPrefix)
|
|
||||||
}
|
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user