fix(controlplane): allow changing contract by name (#1065)

Signed-off-by: Miguel Martinez Trivino <[email protected]>

Author: migmartri

app/cli/cmd/workflow_update.go

@@ -23,7 +23,7 @@ import (
 )
 
 func newWorkflowUpdateCmd() *cobra.Command {
-	var name, description, project, team, contractID string
+	var name, description, project, team, contractName string
 	var public bool
 
 	cmd := &cobra.Command{
@@ -46,7 +46,7 @@ func newWorkflowUpdateCmd() *cobra.Command {
 			}
 
 			if cmd.Flags().Changed("contract") {
-				opts.ContractID = &contractID
+				opts.ContractName = &contractName
 			}
 
 			res, err := action.NewWorkflowUpdate(actionOpts).Run(context.Background(), name, opts)
@@ -66,7 +66,7 @@ func newWorkflowUpdateCmd() *cobra.Command {
 	cmd.Flags().StringVar(&team, "team", "", "team name")
 	cmd.Flags().StringVar(&project, "project", "", "project name")
 	cmd.Flags().BoolVar(&public, "public", false, "is the workflow public")
-	cmd.Flags().StringVar(&contractID, "contract", "", "the ID of an existing contract")
+	cmd.Flags().StringVar(&contractName, "contract", "", "the name of an existing contract")
 
 	return cmd
 }

app/cli/internal/action/workflow_update.go

@@ -30,19 +30,19 @@ func NewWorkflowUpdate(cfg *ActionsOpts) *WorkflowUpdate {
 }
 
 type WorkflowUpdateOpts struct {
-	Description, Project, Team, ContractID *string
-	Public                                 *bool
+	Description, Project, Team, ContractName *string
+	Public                                   *bool
 }
 
 func (action *WorkflowUpdate) Run(ctx context.Context, name string, opts *WorkflowUpdateOpts) (*WorkflowItem, error) {
 	client := pb.NewWorkflowServiceClient(action.cfg.CPConnection)
 	resp, err := client.Update(ctx, &pb.WorkflowServiceUpdateRequest{
-		Name:        name,
-		Description: opts.Description,
-		Project:     opts.Project,
-		Team:        opts.Team,
-		Public:      opts.Public,
-		SchemaId:    opts.ContractID,
+		Name:         name,
+		Description:  opts.Description,
+		Project:      opts.Project,
+		Team:         opts.Team,
+		Public:       opts.Public,
+		ContractName: opts.ContractName,
 	})
 
 	if err != nil {

app/controlplane/api/controlplane/v1/workflow.pb.go

@@ -69,7 +69,13 @@ message WorkflowServiceUpdateRequest {
   optional string team = 4;
   optional bool public = 5;
   optional string description = 6;
-  optional string schema_id = 7;
+  optional string contract_name = 7 [(buf.validate.field) = {
+    cel: {
+      message: "must contain only lowercase letters, numbers, and hyphens.",
+      expression: "this.matches('^[a-z0-9]([-a-z0-9]*[a-z0-9])?$')",
+      id: "name.dns-1123",
+    },
+  }];
 }
 
 message WorkflowServiceUpdateResponse {

app/controlplane/api/controlplane/v1/workflow.proto

@@ -28,13 +28,15 @@ type WorkflowService struct {
 	pb.UnimplementedWorkflowServiceServer
 	*service
 
-	useCase *biz.WorkflowUseCase
+	useCase    *biz.WorkflowUseCase
+	contractUC *biz.WorkflowContractUseCase
 }
 
-func NewWorkflowService(uc *biz.WorkflowUseCase, opts ...NewOpt) *WorkflowService {
+func NewWorkflowService(uc *biz.WorkflowUseCase, wfuc *biz.WorkflowContractUseCase, opts ...NewOpt) *WorkflowService {
 	return &WorkflowService{
-		service: newService(opts...),
-		useCase: uc,
+		service:    newService(opts...),
+		useCase:    uc,
+		contractUC: wfuc,
 	}
 }
 
@@ -73,12 +75,25 @@ func (s *WorkflowService) Update(ctx context.Context, req *pb.WorkflowServiceUpd
 		return nil, handleUseCaseErr(err, s.log)
 	}
 
+	var contractID *string
+	if req.ContractName != nil {
+		c, err := s.contractUC.FindByNameInOrg(ctx, currentOrg.ID, *req.ContractName)
+		if err != nil {
+			return nil, handleUseCaseErr(err, s.log)
+		} else if c == nil {
+			return nil, biz.NewErrNotFound("contract")
+		}
+
+		cid := c.ID.String()
+		contractID = &cid
+	}
+
 	updateOpts := &biz.WorkflowUpdateOpts{
 		Project:     req.Project,
 		Team:        req.Team,
 		Public:      req.Public,
 		Description: req.Description,
-		ContractID:  req.SchemaId,
+		ContractID:  contractID,
 	}
 
 	p, err := s.useCase.Update(ctx, currentOrg.ID, wf.ID.String(), updateOpts)