create/delete batch operations for all resource types

examples/seed.yaml

@@ -106,3 +106,44 @@ secrets:
 tags:
   - key: role
     value: test
+---
+kind: API
+name: post-hello
+enabled: true
+function: hello-py
+methods:
+  - POST
+protocols:
+  - https
+uris:
+  - /hello
+tags:
+  - key: role
+    value : test
+---
+kind: DriverType
+name: ticker
+image: kars7e/timer:latest
+tags:
+  - key: role
+    value : test
+---
+kind: Driver
+name: ticker
+type: ticker
+config:
+  - key: seconds
+    value: 2
+tags:
+  - key: role
+    value : test
+---
+kind: Subscription
+event-type: ticker.tick
+function: hello-py
+name: ticker-sub
+source-type: ticker
+tags:
+  - key: role
+    value : test
+---

pkg/dispatchcli/cmd/create.go

@@ -52,7 +52,7 @@ func resolveFileReference(ref string) (string, error) {
 	return ref, nil
 }
 
-func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []string, actionMap map[string]modelAction) error {
+func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []string, actionMap map[string]modelAction, actionName string) error {
 	fullPath := path.Join(workDir, file)
 	b, err := ioutil.ReadFile(fullPath)
 	if err != nil {
@@ -100,7 +100,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.APIs = append(o.APIs, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.BaseImageKind:
 			m := &v1.BaseImage{}
 			err = yaml.Unmarshal(doc, m)
@@ -112,7 +112,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.BaseImages = append(o.BaseImages, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.ImageKind:
 			m := &v1.Image{}
 			err = yaml.Unmarshal(doc, m)
@@ -131,7 +131,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.Images = append(o.Images, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.FunctionKind:
 			m := &v1.Function{}
 			err = yaml.Unmarshal(doc, m)
@@ -158,7 +158,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.Functions = append(o.Functions, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.DriverTypeKind:
 			m := &v1.EventDriverType{}
 			err = yaml.Unmarshal(doc, m)
@@ -170,7 +170,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.DriverTypes = append(o.DriverTypes, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.DriverKind:
 			m := &v1.EventDriver{}
 			err = yaml.Unmarshal(doc, m)
@@ -182,7 +182,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.Drivers = append(o.Drivers, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.SubscriptionKind:
 			m := &v1.Subscription{}
 			err = yaml.Unmarshal(doc, m)
@@ -194,7 +194,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.Subscriptions = append(o.Subscriptions, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.SecretKind:
 			m := &v1.Secret{}
 			err = yaml.Unmarshal(doc, m)
@@ -206,7 +206,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.Secrets = append(o.Secrets, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.PolicyKind:
 			m := &v1.Policy{}
 			err = yaml.Unmarshal(doc, m)
@@ -218,7 +218,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.Policies = append(o.Policies, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.ServiceInstanceKind:
 			m := &v1.ServiceInstance{}
 			err := yaml.Unmarshal(doc, m)
@@ -230,7 +230,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.ServiceInstances = append(o.ServiceInstances, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		case utils.ServiceAccountKind:
 			m := &v1.ServiceAccount{}
 			err = yaml.Unmarshal(doc, m)
@@ -242,7 +242,7 @@ func importFile(out io.Writer, errOut io.Writer, cmd *cobra.Command, args []stri
 				return err
 			}
 			o.ServiceAccounts = append(o.ServiceAccounts, m)
-			fmt.Fprintf(out, "Created %s: %s\n", docKind, *m.Name)
+			fmt.Fprintf(out, "%s %s: %s\n", actionName, docKind, *m.Name)
 		default:
 			continue
 		}
@@ -270,17 +270,22 @@ func NewCmdCreate(out io.Writer, errOut io.Writer) *cobra.Command {
 				runHelp(cmd, args)
 				return
 			}
-
 			createMap := map[string]modelAction{
 				utils.ImageKind:           CallCreateImage,
 				utils.BaseImageKind:       CallCreateBaseImage,
 				utils.FunctionKind:        CallCreateFunction,
 				utils.SecretKind:          CallCreateSecret,
 				utils.ServiceInstanceKind: CallCreateServiceInstance,
 				utils.PolicyKind:          CallCreatePolicy,
+				utils.ApplicationKind:     CallCreateApplication,
+				utils.ServiceAccountKind:  CallCreateServiceAccount,
+				utils.DriverTypeKind:      CallCreateEventDriverType,
+				utils.DriverKind:          CallCreateEventDriver,
+				utils.SubscriptionKind:    CallCreateSubscription,
+				utils.APIKind:             CallCreateAPI,
 			}
 
-			err := importFile(out, errOut, cmd, args, createMap)
+			err := importFile(out, errOut, cmd, args, createMap, "Created")
 			CheckErr(err)
 		},
 	}

pkg/dispatchcli/cmd/create_api.go

@@ -14,7 +14,7 @@ import (
 	"github.com/spf13/cobra"
 	"golang.org/x/net/context"
 
-	apiclient "github.com/vmware/dispatch/pkg/api-manager/gen/client/endpoint"
+	"github.com/vmware/dispatch/pkg/api-manager/gen/client/endpoint"
 	"github.com/vmware/dispatch/pkg/api/v1"
 	"github.com/vmware/dispatch/pkg/dispatchcli/i18n"
 )
@@ -64,6 +64,24 @@ func NewCmdCreateAPI(out io.Writer, errOut io.Writer) *cobra.Command {
 	return cmd
 }
 
+// CallCreateAPI makes the API call to create an API endpoint
+func CallCreateAPI(i interface{}) error {
+	client := apiManagerClient()
+	apiModel := i.(*v1.API)
+
+	params := &endpoint.AddAPIParams{
+		Body:    apiModel,
+		Context: context.Background(),
+	}
+
+	created, err := client.Endpoint.AddAPI(params, GetAuthInfoWriter())
+	if err != nil {
+		return formatAPIError(err, params)
+	}
+	*apiModel = *created.Payload
+	return nil
+}
+
 func createAPI(out, errOut io.Writer, cmd *cobra.Command, args []string) error {
 
 	apiName := args[0]
@@ -93,21 +111,15 @@ func createAPI(out, errOut io.Writer, cmd *cobra.Command, args []string) error {
 		})
 	}
 
-	params := &apiclient.AddAPIParams{
-		Body:    api,
-		Context: context.Background(),
-	}
-	client := apiManagerClient()
-
-	created, err := client.Endpoint.AddAPI(params, GetAuthInfoWriter())
+	err := CallCreateAPI(api)
 	if err != nil {
-		return formatAPIError(err, params)
+		return err
 	}
 	if dispatchConfig.JSON {
 		encoder := json.NewEncoder(out)
 		encoder.SetIndent("", "    ")
-		return encoder.Encode(*created.Payload)
+		return encoder.Encode(api)
 	}
-	fmt.Fprintf(out, "Created api: %s\n", *created.Payload.Name)
+	fmt.Fprintf(out, "Created api: %s\n", *api.Name)
 	return nil
 }

pkg/dispatchcli/cmd/create_eventdriver.go

@@ -17,7 +17,7 @@ import (
 
 	"github.com/vmware/dispatch/pkg/api/v1"
 	"github.com/vmware/dispatch/pkg/dispatchcli/i18n"
-	client "github.com/vmware/dispatch/pkg/event-manager/gen/client/drivers"
+	"github.com/vmware/dispatch/pkg/event-manager/gen/client/drivers"
 )
 
 var (
@@ -57,6 +57,24 @@ func NewCmdCreateEventDriver(out io.Writer, errOut io.Writer) *cobra.Command {
 	return cmd
 }
 
+// CallCreateEventDriver makes the API call to create an event driver
+func CallCreateEventDriver(i interface{}) error {
+	client := eventManagerClient()
+	driverModel := i.(*v1.EventDriver)
+
+	params := &drivers.AddDriverParams{
+		Body:    driverModel,
+		Context: context.Background(),
+	}
+
+	created, err := client.Drivers.AddDriver(params, GetAuthInfoWriter())
+	if err != nil {
+		return formatAPIError(err, params)
+	}
+	*driverModel = *created.Payload
+	return nil
+}
+
 func createEventDriver(out, errOut io.Writer, cmd *cobra.Command, args []string) error {
 
 	driverType := args[0]
@@ -93,20 +111,15 @@ func createEventDriver(out, errOut io.Writer, cmd *cobra.Command, args []string)
 		})
 	}
 
-	params := &client.AddDriverParams{
-		Body:    eventDriver,
-		Context: context.Background(),
-	}
-
-	created, err := eventManagerClient().Drivers.AddDriver(params, GetAuthInfoWriter())
+	err := CallCreateEventDriver(eventDriver)
 	if err != nil {
-		return formatAPIError(err, params)
+		return err
 	}
 	if dispatchConfig.JSON {
 		encoder := json.NewEncoder(out)
 		encoder.SetIndent("", "    ")
-		return encoder.Encode(*created.Payload)
+		return encoder.Encode(eventDriver)
 	}
-	fmt.Fprintf(out, "Created event driver: %s\n", *created.Payload.Name)
+	fmt.Fprintf(out, "Created event driver: %s\n", *eventDriver.Name)
 	return nil
 }

pkg/dispatchcli/cmd/create_eventdrivertype.go

@@ -16,7 +16,7 @@ import (
 
 	"github.com/vmware/dispatch/pkg/api/v1"
 	"github.com/vmware/dispatch/pkg/dispatchcli/i18n"
-	client "github.com/vmware/dispatch/pkg/event-manager/gen/client/drivers"
+	"github.com/vmware/dispatch/pkg/event-manager/gen/client/drivers"
 )
 
 var (
@@ -43,6 +43,24 @@ func NewCmdCreateEventDriverType(out io.Writer, errOut io.Writer) *cobra.Command
 	return cmd
 }
 
+// CallCreateEventDriverType makes the API call to create an event driver type
+func CallCreateEventDriverType(i interface{}) error {
+	client := eventManagerClient()
+	driverTypeModel := i.(*v1.EventDriverType)
+
+	params := &drivers.AddDriverTypeParams{
+		Body:    driverTypeModel,
+		Context: context.Background(),
+	}
+
+	created, err := client.Drivers.AddDriverType(params, GetAuthInfoWriter())
+	if err != nil {
+		return formatAPIError(err, params)
+	}
+	*driverTypeModel = *created.Payload
+	return nil
+}
+
 func createEventDriverType(out, errOut io.Writer, cmd *cobra.Command, args []string) error {
 
 	typeName := args[0]
@@ -60,21 +78,15 @@ func createEventDriverType(out, errOut io.Writer, cmd *cobra.Command, args []str
 		})
 	}
 
-	params := &client.AddDriverTypeParams{
-		Body:    eventDriverType,
-		Context: context.Background(),
-	}
-	client := eventManagerClient()
-
-	created, err := client.Drivers.AddDriverType(params, GetAuthInfoWriter())
+	err := CallCreateEventDriverType(eventDriverType)
 	if err != nil {
-		return formatAPIError(err, params)
+		return err
 	}
 	if dispatchConfig.JSON {
 		encoder := json.NewEncoder(out)
 		encoder.SetIndent("", "    ")
-		return encoder.Encode(*created.Payload)
+		return encoder.Encode(eventDriverType)
 	}
-	fmt.Fprintf(out, "Created event driver type: %s\n", *created.Payload.Name)
+	fmt.Fprintf(out, "Created event driver type: %s\n", *eventDriverType.Name)
 	return nil
 }