Use yaml.Unmarshal

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

AGENTS.md

@@ -277,7 +277,7 @@ if err != nil {
 }
 
 // For YAML errors, use formatted output
-if err := yaml.UnmarshalWithOptions(data, &raw); err != nil {
+if err := yaml.Unmarshal(data, &raw); err != nil {
     return nil, fmt.Errorf("parsing config:\n%s", yaml.FormatError(err, true, true))
 }
 

pkg/agentfile/resolver_test.go

@@ -487,13 +487,13 @@ func TestResolveAgentFile_OCIRef_HasAVersion(t *testing.T) {
 	require.NoError(t, err)
 	assert.NotEmpty(t, resolved)
 
-	content, err := os.ReadFile(resolved)
+	storedContent, err := os.ReadFile(resolved)
 	require.NoError(t, err)
 	assert.Equal(t, `version: "2"
 agents:
   root:
     model: auto
     description: Test OCI agent
     instruction: You are a test OCI agent
-`, string(content))
+`, string(storedContent))
 }

pkg/config/config.go

@@ -28,7 +28,7 @@ func LoadConfigBytes(ctx context.Context, data []byte) (*latest.Config, error) {
 	var raw struct {
 		Version string `yaml:"version,omitempty"`
 	}
-	if err := yaml.UnmarshalWithOptions(data, &raw); err != nil {
+	if err := yaml.Unmarshal(data, &raw); err != nil {
 		return nil, fmt.Errorf("looking for version in config file\n%s", yaml.FormatError(err, true, true))
 	}
 	if raw.Version == "" {

pkg/oci/package.go

@@ -47,7 +47,7 @@ func PackageFileAsOCIToStore(ctx context.Context, filePath, artifactRef string,
 	var raw struct {
 		Version string `yaml:"version,omitempty"`
 	}
-	if err := yaml.UnmarshalWithOptions(data, &raw); err != nil {
+	if err := yaml.Unmarshal(data, &raw); err != nil {
 		return "", fmt.Errorf("looking for version in config file\n%s", yaml.FormatError(err, true, true))
 	}
 	// Make sure we push a yaml with a version (Use latest if missing)