[infra-proxy-service] Add Data bag item update API (#3871)

Author: Vivek Singh

api/external/infra_proxy/infra_proxy.pb.go

@@ -184,6 +184,12 @@ service InfraProxy {
     option (chef.automate.api.iam.policy).resource = "infra:infraServers:{server_id}:orgs:{org_id}:data_bags";
     option (chef.automate.api.iam.policy).action = "infra:infraServers:update";
   };
+  rpc UpdateDataBagItem (infra_proxy.request.UpdateDataBagItem) returns (infra_proxy.response.UpdateDataBagItem) {
+    option (google.api.http).put = "/api/v0/infra/servers/{server_id}/orgs/{org_id}/data_bags/{name}/{item_id}";
+    option (google.api.http).body = "*";
+    option (chef.automate.api.iam.policy).resource = "infra:infraServers:{server_id}:orgs:{org_id}:data_bags";
+    option (chef.automate.api.iam.policy).action = "infra:infraServers:update";
+  };
 
   rpc GetEnvironments (infra_proxy.request.Environments) returns (infra_proxy.response.Environments) {
     option (google.api.http).get = "/api/v0/infra/servers/{server_id}/orgs/{org_id}/environments";

api/external/infra_proxy/infra_proxy.pb.gw.go

@@ -3,6 +3,8 @@ syntax = "proto3";
 package chef.automate.api.infra_proxy.request;
 option go_package = "github.com/chef/automate/api/external/infra_proxy/request";
 
+import "google/protobuf/struct.proto";
+
 message DataBags {
     // Chef organization ID.
     string org_id = 1;
@@ -39,6 +41,19 @@ message CreateDataBagItem {
     string server_id = 2;
     // Data bag name.
     string name = 3;
-    // Data bag item stringify data.
-    string data = 4;
+    // Data bag item JSON data.
+    google.protobuf.Struct data = 4;
+}
+
+message UpdateDataBagItem {
+    // Chef organization ID.
+    string org_id = 1;
+    // Chef Infra Server ID.
+    string server_id = 2;
+    // Data bag name.
+    string name = 3;
+    // Data bag item ID.
+    string item_id = 4;
+    // Data bag item JSON data.
+    google.protobuf.Struct data = 5;
 }

api/external/infra_proxy/infra_proxy.pb.policy.go

@@ -33,3 +33,10 @@ message CreateDataBagItem {
     // Data bag item ID.
     string id = 2;
 }
+
+message UpdateDataBagItem {
+    // Data bag name.
+    string name = 1;
+    // Data bag item ID.
+    string item_id = 2;
+}

api/external/infra_proxy/infra_proxy.proto

@@ -3,6 +3,8 @@ syntax = "proto3";
 package chef.automate.domain.infra_proxy.request;
 option go_package = "github.com/chef/automate/api/interservice/infra_proxy/request";
 
+import "google/protobuf/struct.proto";
+
 message DataBags {
     // Chef organization ID.
     string org_id = 1;
@@ -39,6 +41,19 @@ message CreateDataBagItem {
     string server_id = 2;
     // Data bag name.
     string name = 3;
-    // Data bag item stringify data.
-    string data = 4;
+    // Data bag item JSON data.
+    google.protobuf.Struct data = 4;
+}
+
+message UpdateDataBagItem {
+    // Chef organization ID.
+    string org_id = 1;
+    // Chef Infra Server ID.
+    string server_id = 2;
+    // Data bag name.
+    string name = 3;
+    // Data bag item ID.
+    string item_id = 4;
+    // Data bag item JSON data.
+    google.protobuf.Struct data = 5;
 }

api/external/infra_proxy/infra_proxy.swagger.json

@@ -34,3 +34,9 @@ message CreateDataBagItem {
     string id = 2;
 }
 
+message UpdateDataBagItem {
+    // Data bag name.
+    string name = 1;
+    // Data bag item ID.
+    string item_id = 2;
+}

api/external/infra_proxy/request/databags.pb.go

@@ -59,6 +59,7 @@ service InfraProxy {
     rpc CreateDataBag (chef.automate.domain.infra_proxy.request.CreateDataBag) returns (chef.automate.domain.infra_proxy.response.CreateDataBag) {};
     rpc CreateDataBagItem (chef.automate.domain.infra_proxy.request.CreateDataBagItem) returns (chef.automate.domain.infra_proxy.response.CreateDataBagItem) {};
     rpc DeleteDataBag (chef.automate.domain.infra_proxy.request.DataBag) returns (chef.automate.domain.infra_proxy.response.DataBag) {};
+    rpc UpdateDataBagItem (chef.automate.domain.infra_proxy.request.UpdateDataBagItem) returns (chef.automate.domain.infra_proxy.response.UpdateDataBagItem) {};
 
     rpc GetEnvironments (chef.automate.domain.infra_proxy.request.Environments) returns (chef.automate.domain.infra_proxy.response.Environments) {};
     rpc GetEnvironment (chef.automate.domain.infra_proxy.request.Environment) returns (chef.automate.domain.infra_proxy.response.Environment) {};

api/external/infra_proxy/request/databags.proto

@@ -101,6 +101,26 @@ func (a *InfraProxyServer) CreateDataBagItem(ctx context.Context, r *gwreq.Creat
 	}, nil
 }
 
+// UpdateDataBagItem updates a data bag item
+func (a *InfraProxyServer) UpdateDataBagItem(ctx context.Context, r *gwreq.UpdateDataBagItem) (*gwres.UpdateDataBagItem, error) {
+	req := &infra_req.UpdateDataBagItem{
+		OrgId:    r.OrgId,
+		ServerId: r.ServerId,
+		Name:     r.Name,
+		ItemId:   r.ItemId,
+		Data:     r.Data,
+	}
+	res, err := a.client.UpdateDataBagItem(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &gwres.UpdateDataBagItem{
+		Name:   res.GetName(),
+		ItemId: res.GetItemId(),
+	}, nil
+}
+
 func fromUpstreamDataBags(dbags []*infra_res.DataBagListItem) []*gwres.DataBagListItem {
 	ts := make([]*gwres.DataBagListItem, len(dbags))
 

api/external/infra_proxy/response/databags.pb.go

@@ -12,17 +12,28 @@ import (
 
 	"github.com/chef/automate/api/interservice/infra_proxy/request"
 	"github.com/chef/automate/api/interservice/infra_proxy/response"
+	"github.com/chef/automate/components/infra-proxy-service/validation"
 )
 
 // CreateDataBag creates a data bag
 func (s *Server) CreateDataBag(ctx context.Context, req *request.CreateDataBag) (*response.CreateDataBag, error) {
-	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
+	err := validation.New(validation.Options{
+		Target:  "databag",
+		Request: *req,
+		Rules: validation.Rules{
+			"OrgId":    []string{"required"},
+			"ServerId": []string{"required"},
+			"Name":     []string{"required"},
+		},
+	}).Validate()
+
 	if err != nil {
 		return nil, err
 	}
 
-	if req.Name == "" {
-		return nil, status.Error(codes.InvalidArgument, "must supply data bag name")
+	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
+	if err != nil {
+		return nil, err
 	}
 
 	_, err = c.client.DataBags.Create(
@@ -41,24 +52,31 @@ func (s *Server) CreateDataBag(ctx context.Context, req *request.CreateDataBag)
 
 // CreateDataBagItem creates a data bag item
 func (s *Server) CreateDataBagItem(ctx context.Context, req *request.CreateDataBagItem) (*response.CreateDataBagItem, error) {
-	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
+	err := validation.New(validation.Options{
+		Target:  "databag",
+		Request: *req,
+		Rules: validation.Rules{
+			"OrgId":    []string{"required"},
+			"ServerId": []string{"required"},
+			"Name":     []string{"required"},
+		},
+	}).Validate()
+
 	if err != nil {
 		return nil, err
 	}
 
-	if req.Name == "" {
-		return nil, status.Error(codes.InvalidArgument, "must supply data bag name")
+	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
+	if err != nil {
+		return nil, err
 	}
 
-	data := DefaultIfEmpty(req.Data)
-
-	var dataBagItem chef.DataBagItem
-	err = json.Unmarshal(json.RawMessage(data), &dataBagItem)
+	dataBagItem, err := StructToJSON(req.Data)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
-	err = c.client.DataBags.CreateItem(req.Name, dataBagItem)
+	err = c.client.DataBags.CreateItem(req.Name, &dataBagItem)
 	if err != nil {
 		return nil, ParseAPIError(err)
 	}
@@ -99,6 +117,21 @@ func (s *Server) GetDataBags(ctx context.Context, req *request.DataBags) (*respo
 
 // GetDataBagItem get data bag
 func (s *Server) GetDataBagItem(ctx context.Context, req *request.DataBag) (*response.DataBag, error) {
+	err := validation.New(validation.Options{
+		Target:  "databag",
+		Request: *req,
+		Rules: validation.Rules{
+			"OrgId":    []string{"required"},
+			"ServerId": []string{"required"},
+			"Name":     []string{"required"},
+			"Item":     []string{"required"},
+		},
+	}).Validate()
+
+	if err != nil {
+		return nil, err
+	}
+
 	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
 	if err != nil {
 		return nil, err
@@ -124,13 +157,23 @@ func (s *Server) GetDataBagItem(ctx context.Context, req *request.DataBag) (*res
 
 // DeleteDataBag delete the data bag and data bag item
 func (s *Server) DeleteDataBag(ctx context.Context, req *request.DataBag) (*response.DataBag, error) {
-	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
+	err := validation.New(validation.Options{
+		Target:  "databag",
+		Request: *req,
+		Rules: validation.Rules{
+			"OrgId":    []string{"required"},
+			"ServerId": []string{"required"},
+			"Name":     []string{"required"},
+		},
+	}).Validate()
+
 	if err != nil {
 		return nil, err
 	}
 
-	if req.Name == "" {
-		return nil, status.Error(codes.InvalidArgument, "must supply data bag name")
+	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
+	if err != nil {
+		return nil, err
 	}
 
 	if req.Item != "" {
@@ -156,6 +199,44 @@ func (s *Server) DeleteDataBag(ctx context.Context, req *request.DataBag) (*resp
 
 }
 
+// UpdateDataBagItem updates a data bag item
+func (s *Server) UpdateDataBagItem(ctx context.Context, req *request.UpdateDataBagItem) (*response.UpdateDataBagItem, error) {
+	err := validation.New(validation.Options{
+		Target:  "databag",
+		Request: *req,
+		Rules: validation.Rules{
+			"OrgId":    []string{"required"},
+			"ServerId": []string{"required"},
+			"Name":     []string{"required"},
+			"ItemId":   []string{"required"},
+		},
+	}).Validate()
+
+	if err != nil {
+		return nil, err
+	}
+
+	c, err := s.createClient(ctx, req.OrgId, req.ServerId)
+	if err != nil {
+		return nil, err
+	}
+
+	dataBagItem, err := StructToJSON(req.Data)
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
+	err = c.client.DataBags.UpdateItem(req.Name, req.ItemId, &dataBagItem)
+	if err != nil {
+		return nil, ParseAPIError(err)
+	}
+
+	return &response.UpdateDataBagItem{
+		Name:   req.Name,
+		ItemId: req.ItemId,
+	}, nil
+}
+
 // fromAPIToListDatabags a response.DataBags from a struct of DataBags
 func fromAPIToListDatabags(al chef.DataBagListResult) []*response.DataBagListItem {
 	cl := make([]*response.DataBagListItem, len(al))

api/external/infra_proxy/response/databags.proto

@@ -2,10 +2,13 @@ package server
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"net/url"
 
 	chef "github.com/go-chef/chef"
+	jsonpb "github.com/golang/protobuf/jsonpb"
+	structpb "github.com/golang/protobuf/ptypes/struct"
 	"github.com/pkg/errors"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -141,3 +144,14 @@ func DefaultIfEmpty(value string) string {
 
 	return value
 }
+
+// StructToJSON convert the structpb to JSON interface object.
+func StructToJSON(data *structpb.Struct) (interface{}, error) {
+	var v interface{}
+	m := jsonpb.Marshaler{}
+
+	jsonStr, _ := m.MarshalToString(data)
+	err := json.Unmarshal(json.RawMessage(jsonStr), &v)
+
+	return v, err
+}