feat(resources): Add update resources cmd (#63)

* feat(resources): Add update resources cmd https://meroxa.atlassian.net/browse/PLATFORM-13 * Update Kind to Type * Remove fetching resource beforehand * Update to latest meroxa-go * Update credentials too * Use latest of meroxa-go
meroxa · Mar 11, 2021 · ba48451 · ba48451
1 parent 92932c5
commit ba48451
Show file tree

Hide file tree

Showing 53 changed files with 242 additions and 220 deletions.
diff --git a/cmd/add.go b/cmd/add.go
@@ -29,7 +29,7 @@ import (
 
 const clientTimeOut = 5 * time.Second
 
-var resName, resType, resURL, resCredentials, resMetadata string
+var resName, resType string
 
 var addCmd = &cobra.Command{
 	Use:   "add",
@@ -58,7 +58,7 @@ var addResourceCmd = &cobra.Command{
 			return err
 		}
 
-		r := meroxa.Resource{
+		r := meroxa.CreateResourceInput{
 			Type:     resType,
 			Name:     resName,
 			URL:      resURL,

diff --git a/cmd/root.go b/cmd/root.go
@@ -17,10 +17,11 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/pflag"
 	"os"
 	"strings"
 
+	"github.com/spf13/pflag"
+
 	"github.com/spf13/cobra"
 
 	homedir "github.com/mitchellh/go-homedir"
@@ -41,6 +42,9 @@ var (
 	cfgFile            string
 	source             string
 	destination        string
+	resURL             string
+	resMetadata        string
+	resCredentials     string
 	flagRootOutputJSON bool
 	cfg                *viper.Viper
 )

diff --git a/cmd/update.go b/cmd/update.go
@@ -2,10 +2,13 @@ package cmd
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"time"
 
+	"github.com/meroxa/meroxa-go"
+
 	"github.com/meroxa/cli/display"
 	"github.com/spf13/cobra"
 )
@@ -65,6 +68,82 @@ var updateConnectorCmd = &cobra.Command{
 	},
 }
 
+var updateResourceCmd = &cobra.Command{
+	Use:     "resource <resource-name>",
+	Short:   "Update a resource",
+	Long:    `Use the update command to update various Meroxa resources.`,
+	Aliases: []string{"resources"},
+	// TODO: Change the design so a new name for the resource could be set
+	// meroxa update resource <old-resource-name> --name <new-resource-name>
+	PreRunE: func(cmd *cobra.Command, args []string) error {
+		if len(args) < 1 || (resURL == "" && resMetadata == "" && resCredentials == "") {
+			return errors.New("requires a resource name and either `--metadata`, `--url` or `--credentials` to update the resource \n\nUsage:\n  meroxa update resource <resource-name> [--url <url> | --metadata <metadata> | --credentials <credentials>]")
+		}
+
+		return nil
+	},
+	RunE: func(cmd *cobra.Command, args []string) error {
+		// Resource Name
+		resName = args[0]
+		c, err := client()
+
+		if err != nil {
+			return err
+		}
+		ctx := context.Background()
+		ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+		defer cancel()
+
+		var res meroxa.UpdateResourceInput
+
+		// If url was provided, update it
+		if resURL != "" {
+			res.URL = resURL
+		}
+
+		// TODO: Figure out best way to handle creds and metadata
+		// Get credentials (expect a JSON string)
+		if resCredentials != "" {
+			var creds meroxa.Credentials
+			err = json.Unmarshal([]byte(resCredentials), &creds)
+			if err != nil {
+				return err
+			}
+
+			res.Credentials = &creds
+		}
+
+		// If metadata was provided, update it
+		if resMetadata != "" {
+			var metadata map[string]string
+			err = json.Unmarshal([]byte(resMetadata), &metadata)
+			if err != nil {
+				return err
+			}
+
+			res.Metadata = metadata
+		}
+
+		// call meroxa-go to update resource
+		if !flagRootOutputJSON {
+			fmt.Printf("Updating %s resource...\n", resName)
+		}
+
+		resource, err := c.UpdateResource(ctx, resName, res)
+		if err != nil {
+			return err
+		}
+
+		if flagRootOutputJSON {
+			display.JSONPrint(resource)
+		} else {
+			fmt.Printf("Resource %s successfully updated!\n", resName)
+		}
+
+		return nil
+	},
+}
+
 var updatePipelineCmd = &cobra.Command{
 	Use:     "pipeline <name> --state <pause|resume|restart>",
 	Aliases: []string{"pipelines"},
@@ -130,4 +209,11 @@ func init() {
 	updateCmd.AddCommand(updatePipelineCmd)
 	updatePipelineCmd.Flags().StringVarP(&state, "state", "", "", "pipeline state")
 	updatePipelineCmd.MarkFlagRequired("state")
+
+	updateCmd.AddCommand(updateResourceCmd)
+	RootCmd.AddCommand(updateCmd)
+
+	updateResourceCmd.Flags().StringVarP(&resURL, "url", "u", "", "resource url")
+	updateResourceCmd.Flags().StringVarP(&resMetadata, "metadata", "m", "", "resource metadata")
+	updateResourceCmd.Flags().StringVarP(&resCredentials, "credentials", "", "", "resource credentials")
 }
diff --git a/display/display.go b/display/display.go
@@ -70,17 +70,17 @@ func PrintResourcesTable(resources []*meroxa.Resource) {
 		table.Header = &simpletable.Header{
 			Cells: []*simpletable.Cell{
 				{Align: simpletable.AlignCenter, Text: "ID"},
-				{Align: simpletable.AlignCenter, Text: "TYPE"},
 				{Align: simpletable.AlignCenter, Text: "NAME"},
+				{Align: simpletable.AlignCenter, Text: "TYPE"},
 				{Align: simpletable.AlignCenter, Text: "URL"},
 			},
 		}
 
 		for _, res := range resources {
 			r := []*simpletable.Cell{
 				{Align: simpletable.AlignRight, Text: fmt.Sprintf("%d", res.ID)},
-				{Text: res.Type},
 				{Text: res.Name},
+				{Text: res.Type},
 				{Text: res.URL},
 			}
 

diff --git a/docs/commands/meroxa.md b/docs/commands/meroxa.md
@@ -36,6 +36,7 @@ meroxa list resource-types
 * [meroxa open](meroxa_open.md)	 - Open in a web browser
 * [meroxa remove](meroxa_remove.md)	 - Remove a component
 * [meroxa update](meroxa_update.md)	 - Update a component
+* [meroxa update](meroxa_update.md)	 - Update a component
 * [meroxa version](meroxa_version.md)	 - Display the Meroxa CLI version
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_add.md b/docs/commands/meroxa_add.md
@@ -20,4 +20,4 @@ Add a resource to your Meroxa resource catalog
 * [meroxa](meroxa.md)	 - The Meroxa CLI
 * [meroxa add resource](meroxa_add_resource.md)	 - Add a resource to your Meroxa resource catalog
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_add_resource.md b/docs/commands/meroxa_add_resource.md
@@ -42,4 +42,4 @@ meroxa add resource slack --type url -u $WEBHOOK_URL
 
 * [meroxa add](meroxa_add.md)	 - Add a resource to your Meroxa resource catalog
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_api.md b/docs/commands/meroxa_api.md
@@ -31,4 +31,4 @@ meroxa api POST /v1/endpoints '{"protocol": "HTTP", "stream": "resource-2-499379
 
 * [meroxa](meroxa.md)	 - The Meroxa CLI
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_billing.md b/docs/commands/meroxa_billing.md
@@ -23,4 +23,4 @@ meroxa billing [flags]
 
 * [meroxa](meroxa.md)	 - The Meroxa CLI
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_completion.md b/docs/commands/meroxa_completion.md
@@ -57,4 +57,4 @@ meroxa completion [bash|zsh|fish|powershell]
 
 * [meroxa](meroxa.md)	 - The Meroxa CLI
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_connect.md b/docs/commands/meroxa_connect.md
@@ -42,4 +42,4 @@ meroxa connect --from <resource-name> --to <resource-name> [flags]
 
 * [meroxa](meroxa.md)	 - The Meroxa CLI
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_create.md b/docs/commands/meroxa_create.md
@@ -27,4 +27,4 @@ including connectors.
 * [meroxa create endpoint](meroxa_create_endpoint.md)	 - Create an endpoint
 * [meroxa create pipeline](meroxa_create_pipeline.md)	 - Create a pipeline
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_create_connector.md b/docs/commands/meroxa_create_connector.md
@@ -38,4 +38,4 @@ meroxa create connector [<custom-connector-name>] --to pg2redshift --input order
 
 * [meroxa create](meroxa_create.md)	 - Create Meroxa pipeline components
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_create_endpoint.md b/docs/commands/meroxa_create_endpoint.md
@@ -36,4 +36,4 @@ meroxa create endpoint my-endpoint --protocol http --stream my-stream
 
 * [meroxa create](meroxa_create.md)	 - Create Meroxa pipeline components
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_create_pipeline.md b/docs/commands/meroxa_create_pipeline.md
@@ -24,4 +24,4 @@ meroxa create pipeline <name> [flags]
 
 * [meroxa create](meroxa_create.md)	 - Create Meroxa pipeline components
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_delete.md b/docs/commands/meroxa_delete.md
diff --git a/docs/commands/meroxa_delete_connector.md b/docs/commands/meroxa_delete_connector.md
diff --git a/docs/commands/meroxa_delete_pipeline.md b/docs/commands/meroxa_delete_pipeline.md
diff --git a/docs/commands/meroxa_delete_resource.md b/docs/commands/meroxa_delete_resource.md
diff --git a/docs/commands/meroxa_describe.md b/docs/commands/meroxa_describe.md
@@ -26,4 +26,4 @@ Describe a component of the Meroxa data platform, including resources and connec
 * [meroxa describe endpoint](meroxa_describe_endpoint.md)	 - Describe Endpoint
 * [meroxa describe resource](meroxa_describe_resource.md)	 - Describe resource
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_describe_connector.md b/docs/commands/meroxa_describe_connector.md
@@ -23,4 +23,4 @@ meroxa describe connector [name] [flags]
 
 * [meroxa describe](meroxa_describe.md)	 - Describe a component
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_describe_endpoint.md b/docs/commands/meroxa_describe_endpoint.md
@@ -23,4 +23,4 @@ meroxa describe endpoint <name> [flags]
 
 * [meroxa describe](meroxa_describe.md)	 - Describe a component
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_describe_resource.md b/docs/commands/meroxa_describe_resource.md
@@ -23,4 +23,4 @@ meroxa describe resource <name> [flags]
 
 * [meroxa describe](meroxa_describe.md)	 - Describe a component
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_list.md b/docs/commands/meroxa_list.md
@@ -30,4 +30,4 @@ List the components of the Meroxa platform, including pipelines,
 * [meroxa list resources](meroxa_list_resources.md)	 - List resources
 * [meroxa list transforms](meroxa_list_transforms.md)	 - List transforms
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_list_connectors.md b/docs/commands/meroxa_list_connectors.md
@@ -23,4 +23,4 @@ meroxa list connectors [flags]
 
 * [meroxa list](meroxa_list.md)	 - List components
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_list_endpoint.md b/docs/commands/meroxa_list_endpoint.md
@@ -23,4 +23,4 @@ meroxa list endpoint [flags]
 
 * [meroxa list](meroxa_list.md)	 - List components
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021
diff --git a/docs/commands/meroxa_list_pipelines.md b/docs/commands/meroxa_list_pipelines.md
@@ -23,4 +23,4 @@ meroxa list pipelines [flags]
 
 * [meroxa list](meroxa_list.md)	 - List components
 
-###### Auto generated by spf13/cobra on 8-Mar-2021
+###### Auto generated by spf13/cobra on 10-Mar-2021