Merge pull request #17 from bugout-dev/resource-update

Resource update support

Author: kompotkot

cmd/bugout/brood/resources.go

@@ -17,10 +17,11 @@ func GenerateResourcesCommand() *cobra.Command {
 	}
 
 	resourcesCreateCmd := GenerateResourceCreateCommand()
+	resourcesUpdateCmd := GenerateResourceUpdateCommand()
 	resourcesDeleteCmd := GenerateResourceDeleteCommand()
 	resourcesGetCmd := GenerateResourcesGetCommand()
 
-	resourcesCmd.AddCommand(resourcesCreateCmd, resourcesDeleteCmd, resourcesGetCmd)
+	resourcesCmd.AddCommand(resourcesCreateCmd, resourcesUpdateCmd, resourcesDeleteCmd, resourcesGetCmd)
 
 	return resourcesCmd
 }
@@ -62,6 +63,48 @@ func GenerateResourceCreateCommand() *cobra.Command {
 	return resourceCreateCmd
 }
 
+type resourceUpdateArg struct {
+	Update   interface{} `json:"update"`
+	DropKeys []string    `json:"drop_keys"`
+}
+
+func GenerateResourceUpdateCommand() *cobra.Command {
+	var token, resourceId string
+	resourceUpdateCmd := &cobra.Command{
+		Use:     "update [resource]",
+		Short:   "Update resource",
+		PreRunE: cmdutils.TokenArgPopulator,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			if len(args) != 1 {
+				return fmt.Errorf(`One resource argument as json string in format {"update": {"key": "value"}, drop_keys: ["key"]} must be specified`)
+			}
+			var resourceUpdateRaw resourceUpdateArg
+			err := json.Unmarshal([]byte(args[0]), &resourceUpdateRaw)
+			if err != nil {
+				return err
+			}
+
+			client, clientErr := bugout.ClientFromEnv()
+			if clientErr != nil {
+				return clientErr
+			}
+
+			resource, err := client.Brood.UpdateResource(token, resourceId, resourceUpdateRaw.Update, resourceUpdateRaw.DropKeys)
+			if err != nil {
+				return err
+			}
+
+			encodeErr := json.NewEncoder(cmd.OutOrStdout()).Encode(&resource)
+			return encodeErr
+		},
+	}
+
+	resourceUpdateCmd.Flags().StringVarP(&token, "token", "t", "", "Bugout access token to use for the request")
+	resourceUpdateCmd.Flags().StringVarP(&resourceId, "resource_id", "r", "", "Resource ID")
+
+	return resourceUpdateCmd
+}
+
 func GenerateResourceDeleteCommand() *cobra.Command {
 	var token, resourceId string
 	resourceDeleteCmd := &cobra.Command{

pkg/brood/client.go

@@ -33,6 +33,7 @@ type BroodCaller interface {
 	AddUserToGroup(token, groupID, username, role string) (UserGroup, error)
 	RemoveUserFromGroup(token, groupID, username string) (UserGroup, error)
 	CreateResource(token, applicationId string, resourceData interface{}) (Resource, error)
+	UpdateResource(token, resourceId string, update interface{}, dropKeys []string) (Resource, error)
 	GetResources(token, applicationId string, queryParameters map[string]string) (Resources, error)
 	DeleteResource(token, resourceId string) (Resource, error)
 	CreateApplication(token, groupId, name, description string) (Application, error)

pkg/brood/data.go

@@ -76,3 +76,8 @@ type resourceCreateRequest struct {
 	ApplicationId string      `json:"application_id"`
 	ResourceData  interface{} `json:"resource_data"`
 }
+
+type resourceUpdateRequest struct {
+	Update   interface{} `json:"update"`
+	DropKeys []string    `json:"drop_keys"`
+}

pkg/brood/resources.go

@@ -44,6 +44,46 @@ func (client BroodClient) CreateResource(token, applicationId string, resourceDa
 	return resource, decodeErr
 }
 
+func (client BroodClient) UpdateResource(token, resourceId string, update interface{}, dropKeys []string) (Resource, error) {
+	requestBody := resourceUpdateRequest{
+		Update:   make(map[string]interface{}),
+		DropKeys: []string{},
+	}
+	if update != nil {
+		requestBody.Update = update
+	}
+	if dropKeys != nil {
+		requestBody.DropKeys = dropKeys
+	}
+	requestBuffer := new(bytes.Buffer)
+	encodeErr := json.NewEncoder(requestBuffer).Encode(requestBody)
+	if encodeErr != nil {
+		return Resource{}, encodeErr
+	}
+	resourcesRoute := fmt.Sprintf("%s/%s", client.Routes.Resources, resourceId)
+	request, requestErr := http.NewRequest("PUT", resourcesRoute, requestBuffer)
+	if requestErr != nil {
+		return Resource{}, requestErr
+	}
+	request.Header.Add("Content-Type", "application/json")
+	request.Header.Add("Authorization", fmt.Sprintf("Bearer %s", token))
+
+	response, responseErr := client.HTTPClient.Do(request)
+	if responseErr != nil {
+		return Resource{}, responseErr
+	}
+	defer response.Body.Close()
+
+	statusErr := utils.HTTPStatusCheck(response)
+	if statusErr != nil {
+		return Resource{}, statusErr
+	}
+
+	var resource Resource
+	decodeErr := json.NewDecoder(response.Body).Decode(&resource)
+	return resource, decodeErr
+}
+
 func (client BroodClient) GetResources(token, applicationId string, queryParameters map[string]string) (Resources, error) {
 	resourcesRoute := client.Routes.Resources
 	request, requestErr := http.NewRequest("GET", resourcesRoute, nil)

pkg/version.go

@@ -1,3 +1,3 @@
 package bugout
 
-const Version string = "0.4.0"
+const Version string = "0.4.1"