apply sugestions

Signed-off-by: Jose I. Paris <jiparis@chainloop.dev>

Author: jiparis

app/cli/cmd/attestation_init.go

@@ -18,6 +18,8 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"slices"
+	"strings"
 
 	"github.com/chainloop-dev/chainloop/app/cli/cmd/output"
 	"github.com/chainloop-dev/chainloop/app/cli/pkg/action"
@@ -75,6 +77,12 @@ func newAttestationInitCmd() *cobra.Command {
 				return errors.New("project version is required when using --existing-version")
 			}
 
+			for _, c := range collectors {
+				if !slices.Contains(action.ValidCollectors, c) {
+					return fmt.Errorf("unknown collector %q, valid options: %s", c, strings.Join(action.ValidCollectors, ", "))
+				}
+			}
+
 			return nil
 		},
 		RunE: func(cmd *cobra.Command, _ []string) error {

app/cli/pkg/action/attestation_init.go

@@ -59,6 +59,9 @@ type AttestationInit struct {
 
 const aiConfigCollectorName = "aiconfig"
 
+// ValidCollectors is the list of known collector names accepted by --collectors.
+var ValidCollectors = []string{aiConfigCollectorName}
+
 // ErrAttestationAlreadyExist means that there is an attestation in progress
 var ErrAttestationAlreadyExist = errors.New("attestation already initialized")
 

internal/aiagentconfig/aiagentconfig.go

@@ -30,10 +30,10 @@ type GitContext struct {
 
 // ConfigFile represents a single discovered configuration file
 type ConfigFile struct {
-	Path          string `json:"path"`
-	SHA256        string `json:"sha256"`
-	Size          int64  `json:"size"`
-	Base64Content string `json:"base64_content"`
+	Path    string `json:"path"`
+	SHA256  string `json:"sha256"`
+	Size    int64  `json:"size"`
+	Content string `json:"content"`
 }
 
 // Evidence is the AI agent configuration payload

internal/aiagentconfig/builder.go

@@ -75,10 +75,10 @@ func Build(rootDir string, filePaths []string, gitCtx *GitContext) (*Evidence, e
 		hashes = append(hashes, fmt.Sprintf("%s:%s", relPath, hexHash))
 
 		configFiles = append(configFiles, ConfigFile{
-			Path:          relPath,
-			SHA256:        hexHash,
-			Size:          info.Size(),
-			Base64Content: base64.StdEncoding.EncodeToString(content),
+			Path:    relPath,
+			SHA256:  hexHash,
+			Size:    info.Size(),
+			Content: base64.StdEncoding.EncodeToString(content),
 		})
 	}
 
@@ -108,10 +108,12 @@ func computeCombinedHash(hashes []string) string {
 // ensureInsideDir verifies that filePath is inside dir. Both paths must be
 // already resolved (no symlinks). Returns an error if the file escapes.
 func ensureInsideDir(filePath, dir string) error {
-	cleanDir := filepath.Clean(dir) + string(filepath.Separator)
-	cleanFile := filepath.Clean(filePath)
+	rel, err := filepath.Rel(dir, filePath)
+	if err != nil {
+		return fmt.Errorf("path escapes root directory via symlink")
+	}
 
-	if !strings.HasPrefix(cleanFile, cleanDir) {
+	if rel == ".." || strings.HasPrefix(rel, ".."+string(filepath.Separator)) {
 		return fmt.Errorf("path escapes root directory via symlink")
 	}
 

internal/aiagentconfig/builder_test.go

@@ -68,7 +68,7 @@ func TestBuild(t *testing.T) {
 	assert.Equal(t, int64(len(file1Content)), cf1.Size)
 	hash1 := sha256.Sum256(file1Content)
 	assert.Equal(t, hex.EncodeToString(hash1[:]), cf1.SHA256)
-	assert.Equal(t, base64.StdEncoding.EncodeToString(file1Content), cf1.Base64Content)
+	assert.Equal(t, base64.StdEncoding.EncodeToString(file1Content), cf1.Content)
 
 	cf2 := data.ConfigFiles[1]
 	assert.Equal(t, ".claude/settings.json", cf2.Path)

internal/aiagentconfig/discover.go

@@ -33,22 +33,22 @@ var claudePatterns = []string{
 	".claude/skills/*/SKILL.md",
 }
 
-// Discover searches rootDir for AI agent configuration files.
-// It only looks in rootDir and its subdirectories, never in parent directories.
+// Discover searches basePath for AI agent configuration files.
+// It only looks in basePath and its subdirectories, never in parent directories.
 // Returns deduplicated relative paths sorted alphabetically.
-func Discover(rootDir string) ([]string, error) {
+func Discover(basePath string) ([]string, error) {
 	seen := make(map[string]struct{})
 	var results []string
 
 	for _, pattern := range claudePatterns {
-		absPattern := filepath.Join(rootDir, pattern)
+		absPattern := filepath.Join(basePath, pattern)
 		matches, err := filepath.Glob(absPattern)
 		if err != nil {
 			return nil, err
 		}
 
 		for _, match := range matches {
-			rel, err := filepath.Rel(rootDir, match)
+			rel, err := filepath.Rel(basePath, match)
 			if err != nil {
 				return nil, err
 			}

internal/schemavalidators/internal_schemas/aiagentconfig/ai-agent-config-0.1.schema.json

@@ -66,7 +66,7 @@
       "minItems": 1,
       "items": {
         "type": "object",
-        "required": ["path", "sha256", "size", "base64_content"],
+        "required": ["path", "sha256", "size", "content"],
         "properties": {
           "path": {
             "type": "string",
@@ -81,7 +81,7 @@
             "minimum": 0,
             "description": "File size in bytes"
           },
-          "base64_content": {
+          "content": {
             "type": "string",
             "description": "Base64-encoded file content"
           }

internal/schemavalidators/testdata/ai_agent_config_extra_fields.json

@@ -10,7 +10,7 @@
       "path": "CLAUDE.md",
       "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
       "size": 10,
-      "base64_content": "Y29udGVudA=="
+      "content": "Y29udGVudA=="
     }
   ],
   "unknown_field": "should fail"

internal/schemavalidators/testdata/ai_agent_config_minimal.json

@@ -8,9 +8,9 @@
   "config_files": [
     {
       "path": "CLAUDE.md",
-      "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
-      "size": 10,
-      "base64_content": "Y29udGVudA=="
+      "sha256": "ed7002b439e9ac845f22357d822bac1444730fbdb6016d3ec9432297b9ec9f73",
+      "size": 7,
+      "content": "Y29udGVudA=="
     }
   ]
 }

internal/schemavalidators/testdata/ai_agent_config_missing_agent.json

@@ -7,7 +7,7 @@
       "path": "CLAUDE.md",
       "sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
       "size": 10,
-      "base64_content": "Y29udGVudA=="
+      "content": "Y29udGVudA=="
     }
   ]
 }