remove validation related to schema v2

Signed-off-by: Sylwester Piskozub <sylwesterpiskozub@gmail.com>

Author: Piskoo

app/cli/cmd/workflow_contract_apply.go

@@ -22,7 +22,7 @@ import (
 )
 
 func newWorkflowContractApplyCmd() *cobra.Command {
-	var filePath, name, description, projectName string
+	var contractPath, name, description, projectName string
 	var contractName string
 	var rawContract []byte
 
@@ -32,18 +32,7 @@ func newWorkflowContractApplyCmd() *cobra.Command {
 		Long: `Apply a contract from a file. This command will create the contract if it doesn't exist,
 or update it if it already exists.`,
 		Example: `  # Apply a contract from file
-  chainloop workflow contract apply --contract my-contract.yaml
-
-  # Apply to a specific project
-  chainloop workflow contract apply --contract my-contract.yaml --project my-project`,
-		PreRunE: func(_ *cobra.Command, _ []string) error {
-			var err error
-			rawContract, contractName, err = action.LoadSchemaAndExtractName(filePath, name)
-			if err != nil {
-				return err
-			}
-			return nil
-		},
+  chainloop workflow contract apply --contract my-contract.yaml --name my-contract --project my-project`,
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			var desc *string
 			if cmd.Flags().Changed("description") {
@@ -60,12 +49,13 @@ or update it if it already exists.`,
 		},
 	}
 
-	cmd.Flags().StringVarP(&filePath, "contract", "f", "", "workflow contract file path (optional)")
-	cmd.Flags().StringVar(&name, "name", "", "contract name (required if no contract file provided)")
-	cmd.Flags().StringVar(&description, "description", "", "contract description")
-	cmd.Flags().StringVar(&projectName, "project", "", "project name to scope the contract")
+	cmd.Flags().StringVar(&name, "name", "", "contract name")
+	err := cmd.MarkFlagRequired("name")
+	cobra.CheckErr(err)
 
-	cmd.MarkFlagsOneRequired("contract", "name")
+	cmd.Flags().StringVarP(&contractPath, "contract", "f", "", "path or URL to the contract schema")
+	cmd.Flags().StringVar(&description, "description", "", "description of the contract")
+	cmd.Flags().StringVar(&projectName, "project", "", "project name used to scope the contract, if not set the contract will be created in the organization")
 
 	return cmd
 }

app/cli/documentation/cli-reference.mdx

@@ -3308,20 +3308,17 @@ Examples
 
 ```
 Apply a contract from file
-chainloop workflow contract apply --contract my-contract.yaml
-
-Apply to a specific project
-chainloop workflow contract apply --contract my-contract.yaml --project my-project
+chainloop workflow contract apply --contract my-contract.yaml --name my-contract --project my-project
 ```
 
 Options
 
 ```
--f, --contract string      workflow contract file path (optional)
---description string   contract description
+-f, --contract string      path or URL to the contract schema
+--description string   description of the contract
 -h, --help                 help for apply
---name string          contract name (required if no contract file provided)
---project string       project name to scope the contract
+--name string          contract name
+--project string       project name used to scope the contract, if not set the contract will be created in the organization
 ```
 
 Options inherited from parent commands

app/cli/pkg/action/util.go

@@ -16,16 +16,12 @@
 package action
 
 import (
-	"encoding/json"
 	"errors"
-	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
-
-	"github.com/chainloop-dev/chainloop/app/controlplane/pkg/unmarshal"
 )
 
 // LoadFileOrURL loads a file from a local path or a URL
@@ -51,63 +47,3 @@ func LoadFileOrURL(fileRef string) ([]byte, error) {
 
 	return os.ReadFile(filepath.Clean(fileRef))
 }
-
-// SchemaBase represents the minimal structure of a schema with metadata containing a name
-type SchemaBase struct {
-	Metadata struct {
-		Name string `json:"name"`
-	} `json:"metadata"`
-}
-
-// ExtractNameFromRawSchema tries to extract the name from any schema with metadata
-func extractNameFromRawSchema(content []byte) (string, error) {
-	// Identify format
-	format, err := unmarshal.IdentifyFormat(content)
-	if err != nil {
-		return "", fmt.Errorf("failed to identify schema format: %w", err)
-	}
-
-	// Convert to JSON for consistent parsing
-	jsonData, err := unmarshal.LoadJSONBytes(content, "."+string(format))
-	if err != nil {
-		return "", fmt.Errorf("failed to convert to JSON: %w", err)
-	}
-
-	// Unmarshal to extract name
-	var schemaBase SchemaBase
-	if err := json.Unmarshal(jsonData, &schemaBase); err != nil {
-		// Unmarshalling error, don't fail, return empty name,
-		return "", nil
-	}
-
-	return schemaBase.Metadata.Name, nil
-}
-
-// LoadSchemaAndExtractName loads a schema from file path and extracts name from metadata if available
-func LoadSchemaAndExtractName(filePath, explicitName string) ([]byte, string, error) {
-	finalName := explicitName
-
-	if filePath != "" {
-		rawSchema, err := LoadFileOrURL(filePath)
-		if err != nil {
-			return nil, "", fmt.Errorf("failed to load schema file: %w", err)
-		}
-
-		// Extract name from the schema file content
-		extractedName, err := extractNameFromRawSchema(rawSchema)
-		if err != nil {
-			return nil, "", err
-		}
-
-		// Name is required
-		if extractedName == "" && explicitName == "" {
-			return nil, "", fmt.Errorf("name in schema not found, --name flag is required")
-		} else if extractedName != "" {
-			finalName = extractedName
-		}
-
-		return rawSchema, finalName, nil
-	}
-
-	return nil, finalName, nil
-}