PR feedback

Author: john-david3

internal/config/config.go

@@ -918,12 +918,7 @@ func resolveExtensions() Extensions {
 	}
 
 	if headersSetter != nil {
-		token, err := getToken(headersSetter)
-		if err != nil {
-			slog.Error("error getting token from config", "error", err)
-		} else {
-			headersSetter.Headers[0].Value = token
-		}
+		headersSetter.Headers = values(headersSetter.Headers)
 	}
 
 	return Extensions{
@@ -932,22 +927,26 @@ func resolveExtensions() Extensions {
 	}
 }
 
-func getToken(headersSetter *HeadersSetter) (string, error) {
+func values(headers []Header) []Header {
 	var err error
+	newHeaders := []Header{}
 
-	token := headersSetter.Headers[0].Value
-	if token == "" {
-		filePath := headersSetter.Headers[0].FilePath
+	for _, header := range headers {
+		value := header.Value
+		if value == "" {
+			filePath := header.FilePath
 
-		token, err = file.ReadFromFile(filePath)
-		if err != nil {
-			return "", err
+			value, err = file.ReadFromFile(filePath)
+			if err != nil {
+				slog.Error("Unable to read value from file path", "error", err, "file_path", filePath)
+			}
 		}
 
-		return token, nil
+		header.Value = value
+		newHeaders = append(newHeaders, header)
 	}
 
-	return token, nil
+	return newHeaders
 }
 
 func isHealthExtensionSet() bool {

internal/config/config_test.go

@@ -641,33 +641,97 @@ func TestValidateYamlFile(t *testing.T) {
 func TestResolveExtensions(t *testing.T) {
 	tests := []struct {
 		name     string
-		token    string
+		value    string
+		value2   string
 		path     string
-		expected string
+		path2    string
+		expected []string
 	}{
 		{
-			name:     "Test 1: User includes only token value header",
-			token:    "super-secret-token",
+			name:     "Test 1: User includes a single value header only",
+			value:    "super-secret-token",
 			path:     "",
-			expected: "super-secret-token",
+			expected: []string{"super-secret-token"},
 		},
 		{
-			name:     "Test 2: User includes only filepath header",
-			token:    "",
+			name:     "Test 2: User includes a single filepath header only",
+			value:    "",
 			path:     "testdata/nginx-token.crt",
-			expected: "super-secret-token",
+			expected: []string{"super-secret-token"},
 		},
 		{
-			name:     "Test 3: User includes both token and filepath header",
-			token:    "very-secret-token",
+			name:     "Test 3: User includes both a single token and a single filepath header",
+			value:    "very-secret-token",
 			path:     "testdata/nginx-token.crt",
-			expected: "very-secret-token",
+			expected: []string{"very-secret-token"},
 		},
 		{
 			name:     "Test 4: User includes neither token nor filepath header",
-			token:    "",
+			value:    "",
+			path:     "",
+			expected: []string{""},
+		},
+		{
+			name:     "Test 5: User includes multiple headers",
+			value:    "super-secret-token",
+			value2:   "very-secret-token",
+			path:     "",
+			path2:    "",
+			expected: []string{"super-secret-token", "very-secret-token"},
+		},
+	}
+
+	viperInstance = viper.NewWithOptions(viper.KeyDelimiter(KeyDelimiter))
+	tempDir := t.TempDir()
+	var confContent []byte
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			tempFile := helpers.CreateFileWithErrorCheck(t, tempDir, "nginx-agent.conf")
+			defer helpers.RemoveFileWithErrorCheck(t, tempFile.Name())
+
+			if len(tt.expected) == 1 {
+				confContent = []byte(conf.GetAgentConfigWithToken(tt.value, tt.path))
+			} else {
+				confContent = []byte(conf.AgentConfigWithMultipleHeaders(tt.value, tt.path, tt.value2, tt.path2))
+			}
+
+			_, writeErr := tempFile.Write(confContent)
+			require.NoError(t, writeErr)
+
+			err := loadPropertiesFromFile(tempFile.Name())
+			require.NoError(t, err)
+
+			extension := resolveExtensions()
+			require.NotNil(t, extension)
+
+			var result []string
+			for _, header := range extension.HeadersSetter.Headers {
+				result = append(result, header.Value)
+			}
+
+			assert.Equal(t, tt.expected, result)
+
+			err = tempFile.Close()
+			require.NoError(t, err)
+		})
+	}
+}
+
+func TestResolveExtensions_MultipleHeaders(t *testing.T) {
+	tests := []struct {
+		name     string
+		token    string
+		token2   string
+		path     string
+		path2    string
+		expected string
+	}{
+		{
+			name:     "Test 1: User includes a single value header only",
+			token:    "super-secret-token",
 			path:     "",
-			expected: "",
+			expected: "super-secret-token",
 		},
 	}
 

test/config/agent/nginx-agent-with-multiple-headers.conf

@@ -0,0 +1,17 @@
+log:
+  level: info
+  
+collector:
+    extensions:
+      headers_setter:
+        headers:
+          - action: insert
+            key: "authorization"
+            value: %s
+            file_path: %s
+            
+          - action: insert
+            key: "authorization"
+            value: %s
+            file_path: %s
+          

test/config/nginx_config.go

@@ -28,6 +28,9 @@ var embedNginxConfWithSSLCertsWithVariables string
 //go:embed agent/nginx-agent-with-token.conf
 var agentConfigWithToken string
 
+//go:embed agent/nginx-agent-with-multiple-headers.conf
+var agentConfigWithMultipleHeaders string
+
 func GetNginxConfigWithMultipleAccessLogs(
 	errorLogName,
 	accessLogName,
@@ -59,6 +62,10 @@ func GetNginxConfigWithMultipleSSLCerts(errorLogFile, accessLogFile, certFile1,
 	return fmt.Sprintf(embedNginxConfWithMultipleSSLCerts, errorLogFile, accessLogFile, certFile1, certFile2)
 }
 
-func GetAgentConfigWithToken(token, path string) string {
-	return fmt.Sprintf(agentConfigWithToken, token, path)
+func GetAgentConfigWithToken(value, path string) string {
+	return fmt.Sprintf(agentConfigWithToken, value, path)
+}
+
+func AgentConfigWithMultipleHeaders(value, path, value2, path2 string) string {
+	return fmt.Sprintf(agentConfigWithMultipleHeaders, value, path, value2, path2)
 }