PR feedback

Author: john-david3

internal/config/config.go

@@ -889,7 +889,6 @@ func processOtlpReceivers(tlsConfig *OtlpTLSConfig) error {
 func resolveExtensions() Extensions {
 	var health *Health
 	var headersSetter *HeadersSetter
-	var tokenValue string
 
 	if isHealthExtensionSet() {
 		health = &Health{
@@ -919,16 +918,12 @@ func resolveExtensions() Extensions {
 	}
 
 	if headersSetter != nil {
-		tokenValue = headersSetter.Headers[0].Value
-	}
-
-	_, err := os.Stat(tokenValue)
-	if err == nil {
-		token, fileErr := file.ReadFromFile(tokenValue)
-		if fileErr != nil {
-			slog.Error("error reading from file", "error", fileErr)
+		token, err := getToken(headersSetter)
+		if err != nil {
+			slog.Error("error getting token from config", "error", err)
+		} else {
+			headersSetter.Headers[0].Value = token
 		}
-		headersSetter.Headers[0].Value = token
 	}
 
 	return Extensions{
@@ -937,6 +932,24 @@ func resolveExtensions() Extensions {
 	}
 }
 
+func getToken(headersSetter *HeadersSetter) (string, error) {
+	var err error
+
+	token := headersSetter.Headers[0].Value
+	if token == "" {
+		filePath := headersSetter.Headers[0].FilePath
+
+		token, err = file.ReadFromFile(filePath)
+		if err != nil {
+			return "", err
+		}
+
+		return token, nil
+	}
+
+	return token, nil
+}
+
 func isHealthExtensionSet() bool {
 	return viperInstance.IsSet(CollectorExtensionsHealthKey) ||
 		(viperInstance.IsSet(CollectorExtensionsHealthServerHostKey) &&

internal/config/config_test.go

@@ -641,22 +641,32 @@ func TestValidateYamlFile(t *testing.T) {
 func TestResolveExtensions(t *testing.T) {
 	tests := []struct {
 		name     string
-		input    string
+		token    string
+		path     string
 		expected string
 	}{
 		{
-			name:     "Test 1: Header value is a valid token",
-			input:    "super-secret-token",
+			name:     "Test 1: User includes only token value header",
+			token:    "super-secret-token",
+			path:     "",
 			expected: "super-secret-token",
 		},
 		{
-			name:     "Test 2: Header value is a valid token path",
-			input:    "testdata/nginx-token.crt",
+			name:     "Test 2: User includes only filepath header",
+			token:    "",
+			path:     "testdata/nginx-token.crt",
 			expected: "super-secret-token",
 		},
 		{
-			name:     "Test 3: Header value is empty",
-			input:    "",
+			name:     "Test 3: User includes both token and filepath header",
+			token:    "very-secret-token",
+			path:     "testdata/nginx-token.crt",
+			expected: "very-secret-token",
+		},
+		{
+			name:     "Test 4: User includes neither token nor filepath header",
+			token:    "",
+			path:     "",
 			expected: "",
 		},
 	}
@@ -669,7 +679,7 @@ func TestResolveExtensions(t *testing.T) {
 			tempFile := helpers.CreateFileWithErrorCheck(t, tempDir, "nginx-agent.conf")
 			defer helpers.RemoveFileWithErrorCheck(t, tempFile.Name())
 
-			confContent := []byte(conf.GetAgentConfigWithToken(tt.input))
+			confContent := []byte(conf.GetAgentConfigWithToken(tt.token, tt.path))
 			_, writeErr := tempFile.Write(confContent)
 			require.NoError(t, writeErr)
 

internal/config/types.go

@@ -139,6 +139,7 @@ type (
 		Value        string `yaml:"value"         mapstructure:"value"`
 		DefaultValue string `yaml:"default_value" mapstructure:"default_value"`
 		FromContext  string `yaml:"from_context"  mapstructure:"from_context"`
+		FilePath     string `yaml:"file_path"     mapstructure:"file_path"`
 	}
 
 	DebugExporter struct{}

test/config/agent/nginx-agent-with-token.conf

@@ -8,3 +8,4 @@ collector:
           - action: insert
             key: "authorization"
             value: %s
+            file_path: %s

test/config/nginx_config.go

@@ -59,6 +59,6 @@ func GetNginxConfigWithMultipleSSLCerts(errorLogFile, accessLogFile, certFile1,
 	return fmt.Sprintf(embedNginxConfWithMultipleSSLCerts, errorLogFile, accessLogFile, certFile1, certFile2)
 }
 
-func GetAgentConfigWithToken(token string) string {
-	return fmt.Sprintf(agentConfigWithToken, token)
+func GetAgentConfigWithToken(token, path string) string {
+	return fmt.Sprintf(agentConfigWithToken, token, path)
 }