refactor: use typed struct for AgentDefinition parsing

Author: jcoscollanr

cmd/agent-metadata-action/main.go

@@ -243,16 +243,8 @@ func runAgentFlow(ctx context.Context, client metadataClient, workspace, agentTy
 		AgentControlDefinitions:  agentControl,
 	}
 	if agentDef != nil {
-		if b, ok := (*agentDef)["bindings"]; ok {
-			if bindings, ok := b.([]interface{}); ok {
-				metadata.Bindings = bindings
-			}
-		}
-		if bc, ok := (*agentDef)["breakingChange"]; ok {
-			if breakingChange, ok := bc.(string); ok {
-				metadata.BreakingChange = &breakingChange
-			}
-		}
+		metadata.Bindings = agentDef.Bindings
+		metadata.BreakingChange = agentDef.BreakingChange
 	}
 
 	printJSON(ctx, "Agent Metadata", metadata)

internal/loader/definitions.go

@@ -117,12 +117,10 @@ func ReadAgentDefinition(ctx context.Context, workspacePath string) (*models.Age
 		return nil, fmt.Errorf("failed to read agentDefinition.yml: %w", err)
 	}
 
-	var content map[string]interface{}
-	if err := yaml.Unmarshal(data, &content); err != nil {
+	var def models.AgentDefinition
+	if err := yaml.Unmarshal(data, &def); err != nil {
 		return nil, fmt.Errorf("failed to parse agentDefinition.yml: %w", err)
 	}
-
-	def := models.AgentDefinition(content)
 	return &def, nil
 }
 

internal/loader/definitions_test.go

@@ -1032,13 +1032,11 @@ breakingChange: "2.0.0"`
 	require.NoError(t, err)
 	require.NotNil(t, result)
 
-	assert.Equal(t, "2.0.0", (*result)["breakingChange"])
+	require.NotNil(t, result.BreakingChange)
+	assert.Equal(t, "2.0.0", *result.BreakingChange)
 
-	bindings, ok := (*result)["bindings"].([]interface{})
-	require.True(t, ok, "bindings should be a slice")
-	require.Len(t, bindings, 1)
-
-	binding := bindings[0].(map[string]interface{})
+	require.Len(t, result.Bindings, 1)
+	binding := result.Bindings[0].(map[string]interface{})
 	assert.Equal(t, "REQUIRES", binding["type"])
 	assert.Equal(t, "AGENT", binding["targetType"])
 	assert.Equal(t, "NrInfra", binding["target"])
@@ -1056,7 +1054,26 @@ func TestReadAgentDefinition_BreakingChangeOnly(t *testing.T) {
 	result, err := ReadAgentDefinition(context.Background(), tmpDir)
 	require.NoError(t, err)
 	require.NotNil(t, result)
-	assert.Equal(t, "1.5.0", (*result)["breakingChange"])
+	require.NotNil(t, result.BreakingChange)
+	assert.Equal(t, "1.5.0", *result.BreakingChange)
+	assert.Nil(t, result.Bindings)
+}
+
+func TestReadAgentDefinition_BreakingChangeUnquotedFloat(t *testing.T) {
+	tmpDir := t.TempDir()
+	configDir := filepath.Join(tmpDir, config.GetRootFolderForAgentRepo())
+	require.NoError(t, os.MkdirAll(configDir, 0755))
+
+	// Unquoted float — go-yaml coerces to string representation
+	yamlContent := `breakingChange: 2.0`
+	defFile := filepath.Join(configDir, "agentDefinition.yml")
+	require.NoError(t, os.WriteFile(defFile, []byte(yamlContent), 0644))
+
+	result, err := ReadAgentDefinition(context.Background(), tmpDir)
+	require.NoError(t, err)
+	require.NotNil(t, result)
+	require.NotNil(t, result.BreakingChange)
+	assert.Equal(t, "2.0", *result.BreakingChange)
 }
 
 func TestReadAgentDefinition_InvalidYAML(t *testing.T) {

internal/models/models.go

@@ -24,9 +24,12 @@ type Metadata map[string]interface{}
 // YAML fields are automatically translated to JSON.
 type AgentControlDefinition map[string]interface{}
 
-// AgentDefinition represents agent-level bindings and constraints declared in agentDefinition.yml.
-// It uses a map to allow any attributes (bindings, breakingChange, etc.) to pass through without code changes.
-type AgentDefinition map[string]interface{}
+// AgentDefinition is a typed view of agentDefinition.yml used for parsing.
+// Fields are promoted flat onto AgentMetadata for JSON serialization.
+type AgentDefinition struct {
+	Bindings       []interface{} `yaml:"bindings"`
+	BreakingChange *string       `yaml:"breakingChange"`
+}
 
 // ConfigFile represents the YAML file structure containing multiple configs
 type ConfigFile struct {