chore: Fix agent control definitions based on new requirements (#23)

Co-authored-by: Claude <noreply@anthropic.com>

Author: mvicknr

CLAUDE.md

@@ -73,22 +73,32 @@ jobs:
 
 ### Configuration File Format (Agent Scenario)
 
-For the agent scenario, the action expects a YAML file at `.fleetControl/configurationDefinitions.yml` with the following structure:
+For the agent scenario, the action expects YAML files at 
+`.fleetControl/configurationDefinitions.yml` and
+`.fleetControl/agentControlDefinitions.yml`
+with the following structures:
 
 ```yaml
 configurationDefinitions:
-  - platform: "KUBERNETESCLUSTER"  # or "HOST" or "ALL" if there is no distinction
-    description: "Description of the configuration"
-    type: "agent-config"
-    version: "1.0.0" -- config schema version
-    format: "yml"   -- format of the agent config file
-    schema: "./schemas/config-schema.json"
+  - platform: KUBERNETESCLUSTER  # or "HOST" or "ALL" if there is no distinction
+    description: Description of the configuration
+    type: agent-config
+    version: 1.0.0 -- config schema version
+    format: yml   -- format of the agent config file
+    schema: ./schemas/config-schema.json
 ```
 
+```yaml
+agentControlDefinitions:
+  - platform: KUBERNETES  # "ALL" is not an option
+    supportFromAgent: 1.0.0
+    supportFromAgentControl: 1.0.0
+    content: ./agentControl/agent-schema-for-agent-control.yml
+```
 
 **Dec 2025 - schema temporarily optional until full functionality is ready
 
-**Schema paths must be relative to the `.fleetControl` directory and cannot use directory traversal (`..`) for security.
+**Paths must be relative to the `.fleetControl` directory and cannot use directory traversal (`..`) for security.
 
 ## Building
 

README.md

@@ -90,12 +90,13 @@ func runAgentFlow(ctx context.Context, client metadataClient, workspace, agentTy
 	}
 	fmt.Printf("::notice::Loaded %d configuration definitions\n", len(configs))
 
-	// Load agent control (optional)
-	agentControl, err := loader.LoadAndEncodeAgentControl(workspace)
+	// Load agent control definitions (optional)
+	agentControl, err := loader.ReadAgentControlDefinitions(workspace)
 	if err != nil {
-		fmt.Println("::warn::Unable to load agent control files - continuing without them")
+		fmt.Printf("::warn::Unable to load agent control definitions: %v - continuing without them\n", err)
+		agentControl = nil
 	} else {
-		fmt.Printf("::notice::Loaded %d agent control files\n", len(agentControl))
+		fmt.Printf("::notice::Loaded %d agent control definitions\n", len(agentControl))
 	}
 
 	// Build metadata

cmd/agent-metadata-action/main.go

@@ -387,6 +387,40 @@ version: 1.3.1
 	assert.Contains(t, outputStr, "::warn::Failed to send metadata")
 }
 
+func TestRunAgentFlow_AgentControlDefinitionsError(t *testing.T) {
+	workspace := t.TempDir()
+	fleetControlPath := filepath.Join(workspace, ".fleetControl")
+	require.NoError(t, os.MkdirAll(fleetControlPath, 0755))
+
+	// Create valid configurationDefinitions.yml
+	configFile := filepath.Join(fleetControlPath, "configurationDefinitions.yml")
+	configContent := `configurationDefinitions:
+  - name: test-config
+    type: string
+`
+	require.NoError(t, os.WriteFile(configFile, []byte(configContent), 0644))
+
+	// Create invalid agentControlDefinitions.yml (invalid YAML)
+	agentControlFile := filepath.Join(fleetControlPath, "agentControlDefinitions.yml")
+	require.NoError(t, os.WriteFile(agentControlFile, []byte("invalid: yaml: ["), 0644))
+
+	ctx := context.Background()
+	mockClient := &mockMetadataClient{}
+
+	getStdout, _ := testutil.CaptureOutput(t)
+
+	// method under test
+	err := runAgentFlow(ctx, mockClient, workspace, "java", "1.0.0")
+
+	// Should succeed despite agentControlDefinitions error
+	assert.NoError(t, err)
+
+	// Verify warning was logged
+	outputStr := getStdout()
+	assert.Contains(t, outputStr, "::warn::Unable to load agent control definitions")
+	assert.Contains(t, outputStr, "continuing without them")
+}
+
 func TestSendDocsMetadata(t *testing.T) {
 	tests := []struct {
 		name    string

cmd/agent-metadata-action/main_test.go

@@ -0,0 +1,5 @@
+agentControlDefinitions:
+  - platform: KUBERNETES
+    supportFromAgent: 1.0.0
+    supportFromAgentControl: 1.0.0
+    content: ./agentControl/agent-schema-for-agent-control.yml

integration-test/agent-flow/.fleetControl/agentControlDefinitions.yml

@@ -391,8 +391,8 @@ func TestSendMetadata_WithConfigurationDefinitionsAndAgentControl(t *testing.T)
 		},
 		AgentControlDefinitions: []models.AgentControlDefinition{
 			{
-				Platform: "all",
-				Content:  "base64content",
+				"platform": "all",
+				"content":  "base64content",
 			},
 		},
 	}

internal/client/instrumentation_test.go

@@ -16,9 +16,13 @@ func GetConfigurationDefinitionsFilename() string {
 	return "configurationDefinitions.yml"
 }
 
-// GetAgentControlFolderForAgentRepo loads the folder holding the agent control definitions
-func GetAgentControlFolderForAgentRepo() string {
-	return filepath.Join(GetRootFolderForAgentRepo(), "agentControl")
+// GetAgentControlDefinitionsFilepath returns the path to the agentControlDefinitions.yml file
+func GetAgentControlDefinitionsFilepath() string {
+	return filepath.Join(GetRootFolderForAgentRepo(), GetAgentControlDefinitionsFilename())
+}
+
+func GetAgentControlDefinitionsFilename() string {
+	return "agentControlDefinitions.yml"
 }
 
 func GetReleaseNotesDirectory() string {