refactor: move attestation initialization server side (#2193)

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

Author: migmartri

app/cli/cmd/workflow_create.go

@@ -51,6 +51,11 @@ func newWorkflowCreateCmd() *cobra.Command {
 				// Try to find it by name
 				c, err := action.NewWorkflowContractDescribe(actionOpts).Run(contractRef, 0)
 				if err != nil || c == nil {
+					_, err := action.LoadFileOrURL(contractRef)
+					if err != nil {
+						return fmt.Errorf("%q is not an existing contract name nor references a valid contract file or URL", contractRef)
+					}
+
 					createResp, err := action.NewWorkflowContractCreate(actionOpts).Run(fmt.Sprintf("%s-%s", project, workflowName), nil, contractRef)
 					if err != nil {
 						return err

app/cli/internal/action/attestation_init.go

@@ -28,8 +28,6 @@ import (
 	clientAPI "github.com/chainloop-dev/chainloop/pkg/attestation/crafter/api/attestation/v1"
 	"github.com/chainloop-dev/chainloop/pkg/policies"
 	"github.com/rs/zerolog"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 )
 
 type AttestationInitOpts struct {
@@ -102,39 +100,24 @@ func (action *AttestationInit) Run(ctx context.Context, opts *AttestationInitRun
 	action.Logger.Debug().Msg("Retrieving attestation definition")
 	client := pb.NewAttestationServiceClient(action.ActionsOpts.CPConnection)
 
-	// 0 - find or create the contract if we are creating the workflow (if any)
-	contractRef := opts.NewWorkflowContractRef
-	_, err := NewWorkflowDescribe(action.ActionsOpts).Run(ctx, opts.WorkflowName, opts.ProjectName)
-	if err != nil && status.Code(err) == codes.NotFound {
-		// Not found, let's see if we need to create the contract
-		if contractRef != "" {
-			// Try to find it by name
-			_, err := NewWorkflowContractDescribe(action.ActionsOpts).Run(contractRef, 0)
-			// An invalid argument might be raised if we use a file or URL in the "name" field, which must be DNS-1123
-			// TODO: validate locally before doing the query
-			if err != nil && (status.Code(err) == codes.NotFound || status.Code(err) == codes.InvalidArgument) {
-				// Check if it is a valid file or URL before trying to create it
-				_, err := loadFileOrURL(contractRef)
-				if err != nil {
-					return "", fmt.Errorf("%q is not an existing contract name nor references a valid contract file or URL", contractRef)
-				}
-
-				createResp, err := NewWorkflowContractCreate(action.ActionsOpts).Run(fmt.Sprintf("%s-%s", opts.ProjectName, opts.WorkflowName), nil, contractRef)
-				if err != nil {
-					return "", err
-				}
-
-				contractRef = createResp.Name
-			}
+	req := &pb.FindOrCreateWorkflowRequest{
+		ProjectName:  opts.ProjectName,
+		WorkflowName: opts.WorkflowName,
+	}
+
+	// contractRef can be either the name of an existing contract or a file or URL of a contract to be created or updated
+	// we'll try to figure out which one of those cases we are dealing with
+	if opts.NewWorkflowContractRef != "" {
+		raw, err := LoadFileOrURL(opts.NewWorkflowContractRef)
+		if err != nil {
+			req.ContractName = opts.NewWorkflowContractRef
+		} else {
+			req.ContractBytes = raw
 		}
 	}
 
 	// 1 - Find or create the workflow
-	workflowsResp, err := client.FindOrCreateWorkflow(ctx, &pb.FindOrCreateWorkflowRequest{
-		ProjectName:  opts.ProjectName,
-		WorkflowName: opts.WorkflowName,
-		ContractName: contractRef,
-	})
+	workflowsResp, err := client.FindOrCreateWorkflow(ctx, req)
 	if err != nil {
 		return "", err
 	}

app/cli/internal/action/plugin_actions.go

@@ -191,7 +191,7 @@ func (action *PluginInstall) Run(_ context.Context, opts *PluginInstallOptions)
 	}
 	defer tempFile.Close()
 
-	rawFileContents, err := loadFileOrURL(opts.File)
+	rawFileContents, err := LoadFileOrURL(opts.File)
 	if err != nil {
 		return nil, fmt.Errorf("failed to load file from a given URL: %w", err)
 	}

app/cli/internal/action/util.go

@@ -24,8 +24,8 @@ import (
 	"strings"
 )
 
-// loadFileOrURL loads a file from a local path or a URL
-func loadFileOrURL(fileRef string) ([]byte, error) {
+// LoadFileOrURL loads a file from a local path or a URL
+func LoadFileOrURL(fileRef string) ([]byte, error) {
 	parts := strings.SplitAfterN(fileRef, "://", 2)
 	if len(parts) == 2 {
 		scheme := parts[0]

app/cli/internal/action/workflow_contract_create.go

@@ -37,7 +37,7 @@ func (action *WorkflowContractCreate) Run(name string, description *string, cont
 	}
 
 	if contractPath != "" {
-		rawContract, err := loadFileOrURL(contractPath)
+		rawContract, err := LoadFileOrURL(contractPath)
 		if err != nil {
 			action.cfg.Logger.Debug().Err(err).Msg("loading the contract")
 			return nil, err

app/cli/internal/action/workflow_contract_update.go

@@ -34,7 +34,7 @@ func (action *WorkflowContractUpdate) Run(name string, description *string, cont
 
 	request := &pb.WorkflowContractServiceUpdateRequest{Name: name, Description: description}
 	if contractPath != "" {
-		rawContract, err := loadFileOrURL(contractPath)
+		rawContract, err := LoadFileOrURL(contractPath)
 		if err != nil {
 			action.cfg.Logger.Debug().Err(err).Msg("loading the contract")
 			return nil, err