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

Add controller API client interface (#1467)

Browse Source 
This PR adds an interface for controller API client, it allows us to
implement mock API client for unit testing with ease and we are
able to generate spec file without accessing the real Fission server.
This commit is contained in:
Ta-Ching Chen
2019-12-16 23:14:14 +08:00
committed by GitHub
parent 01bdc5bf89
commit bfbb80efcf
71 changed files with 1021 additions and 1025 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/httptrigger/create.go
+6 -13
View File
@@ -26,9 +26,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
"github.com/fission/fission/pkg/controller/client"
ferror "github.com/fission/fission/pkg/error"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/cmd/spec"
"github.com/fission/fission/pkg/fission-cli/console"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
@@ -36,19 +36,12 @@ import (
)
type CreateSubCommand struct {
client *client.Client
cmd.CommandActioner
trigger *fv1.HTTPTrigger
}
func Create(input cli.Input) error {
c, err := util.GetServer(input)
if err != nil {
return err
}
opts := CreateSubCommand{
client: c,
}
return opts.do(input)
return (&CreateSubCommand{}).do(input)
}
func (opts *CreateSubCommand) do(input cli.Input) error {
@@ -85,7 +78,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
Namespace: fnNamespace,
}
htTrigger, err := opts.client.HTTPTriggerGet(m)
htTrigger, err := opts.Client().V1().HTTPTrigger().Get(m)
if err != nil && !ferror.IsNotFound(err) {
return err
}
@@ -128,7 +121,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
}
}
} else {
err = util.CheckFunctionExistence(opts.client, functionList, fnNamespace)
err = util.CheckFunctionExistence(opts.Client(), functionList, fnNamespace)
if err != nil {
console.Warn(err.Error())
}
@@ -173,7 +166,7 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
return nil
}
_, err := opts.client.HTTPTriggerCreate(opts.trigger)
_, err := opts.Client().V1().HTTPTrigger().Create(opts.trigger)
if err != nil {
return errors.Wrap(err, "create HTTP trigger")
}
pkg/fission-cli/cmd/httptrigger/delete.go
+5 -13
View File
@@ -23,29 +23,21 @@ import (
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
"github.com/fission/fission/pkg/utils"
)
type DeleteSubCommand struct {
client *client.Client
cmd.CommandActioner
triggerName string
functionName string
namespace string
}
func Delete(input cli.Input) error {
c, err := util.GetServer(input)
if err != nil {
return err
}
opts := DeleteSubCommand{
client: c,
}
return opts.do(input)
return (&DeleteSubCommand{}).do(input)
}
func (opts *DeleteSubCommand) do(input cli.Input) error {
@@ -69,7 +61,7 @@ func (opts *DeleteSubCommand) complete(input cli.Input) error {
}
func (opts *DeleteSubCommand) run(input cli.Input) error {
triggers, err := opts.client.HTTPTriggerList(opts.namespace)
triggers, err := opts.Client().V1().HTTPTrigger().List(opts.namespace)
if err != nil {
return errors.Wrap(err, "error getting HTTP trigger list")
}
@@ -90,7 +82,7 @@ func (opts *DeleteSubCommand) run(input cli.Input) error {
errs := utils.MultiErrorWithFormat()
for _, name := range triggersToDelete {
err := opts.client.HTTPTriggerDelete(&metav1.ObjectMeta{
err := opts.Client().V1().HTTPTrigger().Delete(&metav1.ObjectMeta{
Name: name,
Namespace: opts.namespace,
})
pkg/fission-cli/cmd/httptrigger/get.go
+4 -12
View File
@@ -26,25 +26,17 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
)
type GetSubCommand struct {
client *client.Client
cmd.CommandActioner
}
func Get(input cli.Input) error {
c, err := util.GetServer(input)
if err != nil {
return err
}
opts := GetSubCommand{
client: c,
}
return opts.do(input)
return (&GetSubCommand{}).do(input)
}
func (opts *GetSubCommand) do(input cli.Input) error {
@@ -56,7 +48,7 @@ func (opts *GetSubCommand) run(input cli.Input) error {
Name: input.String(flagkey.HtName),
Namespace: input.String(flagkey.NamespaceFunction),
}
ht, err := opts.client.HTTPTriggerGet(m)
ht, err := opts.Client().V1().HTTPTrigger().Get(m)
if err != nil {
return errors.Wrap(err, "error getting http trigger")
}
pkg/fission-cli/cmd/httptrigger/list.go
+4 -12
View File
@@ -20,25 +20,17 @@ import (
"github.com/pkg/errors"
fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
)
type ListSubCommand struct {
client *client.Client
cmd.CommandActioner
}
func List(input cli.Input) error {
c, err := util.GetServer(input)
if err != nil {
return err
}
opts := ListSubCommand{
client: c,
}
return opts.do(input)
return (&ListSubCommand{}).do(input)
}
func (opts *ListSubCommand) do(input cli.Input) error {
@@ -46,7 +38,7 @@ func (opts *ListSubCommand) do(input cli.Input) error {
}
func (opts *ListSubCommand) run(input cli.Input) error {
hts, err := opts.client.HTTPTriggerList(input.String(flagkey.NamespaceTrigger))
hts, err := opts.Client().V1().HTTPTrigger().List(input.String(flagkey.NamespaceTrigger))
if err != nil {
return errors.Wrap(err, "error listing HTTP triggers")
}
pkg/fission-cli/cmd/httptrigger/update.go
+6 -13
View File
@@ -23,27 +23,20 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
fv1 "github.com/fission/fission/pkg/apis/fission.io/v1"
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
"github.com/fission/fission/pkg/fission-cli/cmd"
"github.com/fission/fission/pkg/fission-cli/console"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
)
type UpdateSubCommand struct {
client *client.Client
cmd.CommandActioner
trigger *fv1.HTTPTrigger
}
func Update(input cli.Input) error {
c, err := util.GetServer(input)
if err != nil {
return err
}
opts := UpdateSubCommand{
client: c,
}
return opts.do(input)
return (&UpdateSubCommand{}).do(input)
}
func (opts *UpdateSubCommand) do(input cli.Input) error {
@@ -58,7 +51,7 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
htName := input.String(flagkey.HtName)
triggerNamespace := input.String(flagkey.NamespaceTrigger)
ht, err := opts.client.HTTPTriggerGet(&metav1.ObjectMeta{
ht, err := opts.Client().V1().HTTPTrigger().Get(&metav1.ObjectMeta{
Name: htName,
Namespace: triggerNamespace,
})
@@ -77,7 +70,7 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
if input.IsSet(flagkey.HtFnName) {
// get the functions and their weights if specified
functionList := input.StringSlice(flagkey.HtFnName)
err := util.CheckFunctionExistence(opts.client, functionList, triggerNamespace)
err := util.CheckFunctionExistence(opts.Client(), functionList, triggerNamespace)
if err != nil {
console.Warn(err.Error())
}
@@ -120,7 +113,7 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
}
func (opts *UpdateSubCommand) run(input cli.Input) error {
_, err := opts.client.HTTPTriggerUpdate(opts.trigger)
_, err := opts.Client().V1().HTTPTrigger().Update(opts.trigger)
if err != nil {
return errors.Wrap(err, "error updating the HTTP trigger")
}