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/timetrigger/create.go
+7 -13
View File
@@ -18,6 +18,7 @@ package timetrigger
import (
"fmt"
"github.com/fission/fission/pkg/fission-cli/cmd"
"time"
"github.com/pkg/errors"
@@ -35,19 +36,12 @@ import (
)
type CreateSubCommand struct {
client *client.Client
cmd.CommandActioner
trigger *fv1.TimeTrigger
}
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 {
@@ -126,14 +120,14 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
return nil
}
_, err := opts.client.TimeTriggerCreate(opts.trigger)
_, err := opts.Client().V1().TimeTrigger().Create(opts.trigger)
if err != nil {
return errors.Wrap(err, "error creating Time trigger")
}
fmt.Printf("trigger '%v' created\n", opts.trigger.Metadata.Name)
t, err := getAPITimeInfo(opts.client)
t, err := getAPITimeInfo(opts.Client())
if err != nil {
return err
}
@@ -146,8 +140,8 @@ func (opts *CreateSubCommand) run(input cli.Input) error {
return nil
}
func getAPITimeInfo(client *client.Client) (time.Time, error) {
serverInfo, err := client.ServerInfo()
func getAPITimeInfo(client client.Interface) (time.Time, error) {
serverInfo, err := client.V1().Misc().ServerInfo()
if err != nil {
return time.Time{}, errors.Errorf("Error syncing server time information: %v", err)
}
pkg/fission-cli/cmd/timetrigger/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.do(input)
return (&DeleteSubCommand{}).do(input)
}
func (opts *DeleteSubCommand) do(input cli.Input) error {
@@ -49,7 +41,7 @@ func (opts *DeleteSubCommand) do(input cli.Input) error {
Namespace: input.String(flagkey.NamespaceTrigger),
}
err := opts.client.TimeTriggerDelete(m)
err := opts.Client().V1().TimeTrigger().Delete(m)
if err != nil {
return errors.Wrap(err, "error deleting trigger")
}
pkg/fission-cli/cmd/timetrigger/list.go
+7 -14
View File
@@ -21,31 +21,24 @@ import (
"os"
"text/tabwriter"
"github.com/fission/fission/pkg/controller/client"
"github.com/fission/fission/pkg/fission-cli/cliwrapper/cli"
flagkey "github.com/fission/fission/pkg/fission-cli/flag/key"
"github.com/fission/fission/pkg/fission-cli/util"
"github.com/pkg/errors"
"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"
)
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 {
ttNs := input.String(flagkey.NamespaceTrigger)
tts, err := opts.client.TimeTriggerList(ttNs)
tts, err := opts.Client().V1().TimeTrigger().List(ttNs)
if err != nil {
return errors.Wrap(err, "list Time triggers")
}
pkg/fission-cli/cmd/timetrigger/test.go
+4 -12
View File
@@ -19,25 +19,17 @@ package timetrigger
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 ShowSubCommand struct {
client *client.Client
cmd.CommandActioner
}
func Show(input cli.Input) error {
c, err := util.GetServer(input)
if err != nil {
return err
}
opts := ShowSubCommand{
client: c,
}
return opts.do(input)
return (&ShowSubCommand{}).do(input)
}
func (opts *ShowSubCommand) do(input cli.Input) error {
@@ -51,7 +43,7 @@ func (opts *ShowSubCommand) run(flaginput cli.Input) error {
return errors.New("need a cron spec like '0 30 * * * *', '@every 1h30m', or '@hourly'; use --cron")
}
t, err := getAPITimeInfo(opts.client)
t, err := getAPITimeInfo(opts.Client())
if err != nil {
return err
}
pkg/fission-cli/cmd/timetrigger/update.go
+6 -14
View File
@@ -23,26 +23,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
trigger *fv1.TimeTrigger
}
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 {
@@ -54,7 +46,7 @@ func (opts *UpdateSubCommand) do(input cli.Input) error {
}
func (opts *UpdateSubCommand) complete(input cli.Input) error {
tt, err := opts.client.TimeTriggerGet(&metav1.ObjectMeta{
tt, err := opts.Client().V1().TimeTrigger().Get(&metav1.ObjectMeta{
Name: input.String(flagkey.TtName),
Namespace: input.String(flagkey.NamespaceTrigger),
})
@@ -88,14 +80,14 @@ func (opts *UpdateSubCommand) complete(input cli.Input) error {
}
func (opts *UpdateSubCommand) run(input cli.Input) error {
_, err := opts.client.TimeTriggerUpdate(opts.trigger)
_, err := opts.Client().V1().TimeTrigger().Update(opts.trigger)
if err != nil {
return errors.Wrap(err, "error updating Time trigger")
}
fmt.Printf("trigger '%v' updated\n", opts.trigger.Metadata.Name)
t, err := getAPITimeInfo(opts.client)
t, err := getAPITimeInfo(opts.Client())
if err != nil {
return err
}