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/canaryconfig/create.go
+6 -13
View File
@@ -24,27 +24,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"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
"github.com/fission/fission/pkg/types"
)
type CreateSubCommand struct {
client *client.Client
cmd.CommandActioner
canary *fv1.CanaryConfig
}
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 {
@@ -74,7 +67,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
}
// check that the trigger exists in the same namespace.
htTrigger, err := opts.client.HTTPTriggerGet(&metav1.ObjectMeta{
htTrigger, err := opts.Client().V1().HTTPTrigger().Get(&metav1.ObjectMeta{
Name: ht,
Namespace: fnNs,
})
@@ -100,7 +93,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
// check that the functions exist in the same namespace
fnList := []string{newFunc, oldFunc}
err = util.CheckFunctionExistence(opts.client, fnList, fnNs)
err = util.CheckFunctionExistence(opts.Client(), fnList, fnNs)
if err != nil {
return errors.Wrap(err, "error checking functions existence")
}
@@ -129,7 +122,7 @@ func (opts *CreateSubCommand) complete(input cli.Input) error {
}
func (opts *CreateSubCommand) run(input cli.Input) error {
_, err := opts.client.CanaryConfigCreate(opts.canary)
_, err := opts.Client().V1().CanaryConfig().Create(opts.canary)
if err != nil {
return errors.Wrap(err, "error creating canary config")
}
pkg/fission-cli/cmd/canaryconfig/delete.go
+4 -12
View File
@@ -22,25 +22,17 @@ 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"
)
type DeleteSubCommand struct {
client *client.Client
cmd.CommandActioner
}
func Delete(input cli.Input) error {
c, err := util.GetServer(input)
if err != nil {
return err
}
opts := DeleteSubCommand{
client: c,
}
return opts.run(input)
return (&DeleteSubCommand{}).run(input)
}
func (opts *DeleteSubCommand) run(input cli.Input) error {
@@ -49,7 +41,7 @@ func (opts *DeleteSubCommand) run(input cli.Input) error {
Namespace: input.String(flagkey.NamespaceCanary),
}
err := opts.client.CanaryConfigDelete(m)
err := opts.Client().V1().CanaryConfig().Delete(m)
if err != nil {
return errors.Wrap(err, "error deleting canary config")
}
pkg/fission-cli/cmd/canaryconfig/get.go
+4 -12
View File
@@ -24,29 +24,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"
)
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.run(input)
return (&GetSubCommand{}).run(input)
}
func (opts *GetSubCommand) run(input cli.Input) error {
canaryCfg, err := opts.client.CanaryConfigGet(&metav1.ObjectMeta{
canaryCfg, err := opts.Client().V1().CanaryConfig().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.CanaryName),
Namespace: input.String(flagkey.NamespaceCanary),
})
pkg/fission-cli/cmd/canaryconfig/list.go
+4 -12
View File
@@ -23,26 +23,18 @@ import (
"github.com/pkg/errors"
"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
namespace string
}
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 {
@@ -59,7 +51,7 @@ func (opts *ListSubCommand) complete(input cli.Input) error {
}
func (opts *ListSubCommand) run(input cli.Input) error {
canaryCfgs, err := opts.client.CanaryConfigList(opts.namespace)
canaryCfgs, err := opts.Client().V1().CanaryConfig().List(opts.namespace)
if err != nil {
return errors.Wrap(err, "error listing canary config")
}
pkg/fission-cli/cmd/canaryconfig/update.go
+5 -13
View File
@@ -24,26 +24,18 @@ 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 UpdateSubCommand struct {
client *client.Client
cmd.CommandActioner
canary *fv1.CanaryConfig
}
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 {
@@ -68,7 +60,7 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
return errors.Wrap(err, "error parsing time duration")
}
canaryCfg, err := opts.client.CanaryConfigGet(&metav1.ObjectMeta{
canaryCfg, err := opts.Client().V1().CanaryConfig().Get(&metav1.ObjectMeta{
Name: name,
Namespace: ns,
})
@@ -100,7 +92,7 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
}
func (opts *UpdateSubCommand) run(input cli.Input) error {
_, err := opts.client.CanaryConfigUpdate(opts.canary)
_, err := opts.Client().V1().CanaryConfig().Update(opts.canary)
if err != nil {
return errors.Wrap(err, "error updating canary config")
}