feat: environment variable from file (#3)

* feat(httpprobe): enhance environment variable handling

* refactor(tests): Remove legacy validation, update random function

Author: mrfoh

.gitignore

@@ -4,4 +4,6 @@
 CLAUDE.md
 claude
 bin
-logs
+logs
+test-results.json
+.env

cmd/httpprobe/run_cmd.go

@@ -1,92 +1,14 @@
 package httpprobe
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/mrfoh/httpprobe/internal/logging"
 	"github.com/mrfoh/httpprobe/internal/runner"
 	"github.com/mrfoh/httpprobe/internal/tests"
 	"github.com/mrfoh/httpprobe/pkg/easyreq"
-	"github.com/olekukonko/tablewriter"
 	"github.com/spf13/cobra"
+	"go.uber.org/zap"
 )
 
-// displayResults outputs the test results in a formatted table grouped by test suite
-func displayResults(results map[string]tests.TestDefinitionExecResult) {
-	var totalTests, passedTests int
-
-	// First, organize data by definition and suite
-	for defName, defResult := range results {
-		fmt.Printf("\n[1m%s[0m\n", defName)
-
-		for suiteName, suiteResult := range defResult.Suites {
-			// Create a new table for each suite
-			fmt.Printf("\n  [1mSuite: %s[0m\n", suiteName)
-
-			table := tablewriter.NewWriter(os.Stdout)
-			table.SetHeader([]string{"Test Case", "Status", "Time (s)"})
-			table.SetBorder(false)
-			table.SetHeaderColor(
-				tablewriter.Colors{tablewriter.Bold},
-				tablewriter.Colors{tablewriter.Bold},
-				tablewriter.Colors{tablewriter.Bold},
-			)
-
-			// Track suite statistics
-			var suiteTotal, suitePassed int
-
-			// Add the test cases for this suite
-			for caseName, caseResult := range suiteResult.Cases {
-				totalTests++
-				suiteTotal++
-
-				status := "FAIL"
-				color := tablewriter.FgRedColor
-
-				if caseResult.Passed {
-					status = "PASS"
-					color = tablewriter.FgGreenColor
-					passedTests++
-					suitePassed++
-				}
-
-				// Format the time with 2 decimal places
-				timeStr := fmt.Sprintf("%.2f", caseResult.Timing)
-
-				table.Rich(
-					[]string{caseName, status, timeStr},
-					[]tablewriter.Colors{
-						{},
-						{color},
-						{},
-					},
-				)
-			}
-
-			table.Render()
-
-			// Print suite summary
-			suitePassRate := 0.0
-			if suiteTotal > 0 {
-				suitePassRate = (float64(suitePassed) / float64(suiteTotal)) * 100
-			}
-
-			fmt.Printf("  Suite Summary: %d/%d tests passed (%.1f%%)\n",
-				suitePassed, suiteTotal, suitePassRate)
-		}
-	}
-
-	// Print overall summary
-	overallPassRate := 0.0
-	if totalTests > 0 {
-		overallPassRate = (float64(passedTests) / float64(totalTests)) * 100
-	}
-
-	fmt.Printf("\n[1mOverall Summary:[0m %d/%d tests passed (%.1f%%)\n",
-		passedTests, totalTests, overallPassRate)
-}
-
 func NewRunCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "run",
@@ -98,6 +20,13 @@ func NewRunCmd() *cobra.Command {
 			concurrency, _ := cmd.Flags().GetInt("concurrency")
 			verbose, _ := cmd.Flags().GetBool("verbose")
 			output, _ := cmd.Flags().GetString("output")
+			envFile, _ := cmd.Flags().GetString("envfile")
+
+			// Load environment variables from file
+			if err := tests.LoadEnvFile(envFile); err != nil {
+				cmd.PrintErrf("Error loading environment variables: %v\n", err)
+				return
+			}
 
 			var loggingLevel string
 
@@ -115,6 +44,10 @@ func NewRunCmd() *cobra.Command {
 				return
 			}
 
+			if envFile != "" {
+				logger.Debug("Loaded environment variables from file", zap.String("file", envFile))
+			}
+
 			httpClientOptions := easyreq.NewOptions().
 				WithLogger(logger)
 

docs/cli-usage.md

@@ -166,26 +166,74 @@ httpprobe run --verbose
 
 ## Environment Variables
 
-HttpProbe can load environment variables from a file specified with `--envfile`. These variables can be accessed in your test definitions using the `${ENV:VARIABLE_NAME}` syntax.
+HttpProbe can load environment variables from a file specified with `--envfile`. These variables can be accessed in your test definitions using the `${env:VARIABLE_NAME}` syntax.
 
-For example, if your `.env` file contains:
+### Configuration
 
+By default, HttpProbe looks for a file named `.env` in the current directory. You can specify a different file using the `--envfile` flag:
+
+```bash
+httpprobe run --envfile .env.production
 ```
+
+### Environment File Format
+
+The environment file should use the standard format of one variable per line, with `KEY=VALUE` pairs:
+
+```
+# Comments are supported
 API_KEY=secret-key
 BASE_URL=https://api.example.com
+TIMEOUT=30
+```
+
+Both single and double quotes are supported and will be stripped from the values:
+
 ```
+SECRET_KEY='this is a quoted string'
+API_TOKEN="another quoted string"
+```
+
+### Using Environment Variables in Tests
 
-You can reference these in your test definitions:
+Once loaded, environment variables can be accessed in your test definitions using the `${env:VARIABLE_NAME}` syntax:
 
 ```yaml
-- name: Get user profile
-  request:
-    url: ${ENV:BASE_URL}/profile
-    headers:
-      Authorization: Bearer ${ENV:API_KEY}
+name: API Tests with Environment Variables
+suites:
+  - name: Authentication Tests
+    cases:
+      - title: Test API key authentication
+        request:
+          url: ${env:BASE_URL}/auth
+          headers:
+            - key: Authorization
+              value: Bearer ${env:API_KEY}
+          body:
+            type: json
+            Data:
+              environment: ${env:ENV_NAME}
 ```
 
-This allows you to keep sensitive information out of your test files and change configurations based on environment.
+### Environment Switching
+
+This feature is particularly useful for switching between different environments (development, staging, production) without modifying your test files:
+
+```bash
+# Run tests against development environment
+httpprobe run --envfile .env.development
+
+# Run tests against production environment
+httpprobe run --envfile .env.production
+```
+
+### Best Practices
+
+1. **Sensitive Information**: Use environment variables for API keys, tokens, and other sensitive data
+2. **Environment-specific URLs**: Store base URLs and endpoints in environment variables
+3. **Credentials**: Keep usernames, passwords, and other credentials in environment variables
+4. **Multiple Environments**: Create separate .env files for different environments (.env.dev, .env.staging, .env.prod)
+5. **CI/CD Integration**: In CI/CD pipelines, use the appropriate environment file for each environment
 
 ## Exit Codes
 

internal/tests/suite.go

@@ -168,39 +168,3 @@ func validateWithAssertions(resp *easyreq.HttpResponse, assertionsData map[strin
 	return len(validationErrors) == 0, validationErrors, nil
 }
 
-// Legacy validation method for backward compatibility
-func validateResponse(resp *easyreq.HttpResponse, assertions ResponseAssertion, logger logging.Logger) (bool, []error, error) {
-	// Convert to new assertion format
-	assertionsMap := make(map[string]interface{})
-
-	// Add status assertion
-	if assertions.Status > 0 {
-		assertionsMap["status"] = assertions.Status
-	}
-
-	// Add header assertions
-	if len(assertions.Headers) > 0 {
-		headers := make(map[string]interface{})
-		for _, assertion := range assertions.Headers {
-			headers[assertion.Path] = assertion.Expected
-		}
-		assertionsMap["headers"] = headers
-	}
-
-	// Add body assertions
-	if len(assertions.Body) > 0 {
-		body := make(map[string]interface{})
-		for _, assertion := range assertions.Body {
-			// Handle operators by prefixing the expected value
-			if assertion.Operator != "" && assertion.Operator != "eq" && assertion.Operator != "equals" {
-				expectedStr := fmt.Sprintf("%s %v", assertion.Operator, assertion.Expected)
-				body[assertion.Path] = expectedStr
-			} else {
-				body[assertion.Path] = assertion.Expected
-			}
-		}
-		assertionsMap["body"] = body
-	}
-
-	return validateWithAssertions(resp, assertionsMap, logger)
-}

internal/tests/variables.go

@@ -1,6 +1,7 @@
 package tests
 
 import (
+	"bufio"
 	"fmt"
 	"os"
 	"regexp"
@@ -10,9 +11,66 @@ import (
 	"math/rand"
 )
 
-// init initializes the random number generator
-func init() {
-	rand.Seed(time.Now().UnixNano())
+// Define a global random source
+var randomSource = rand.NewSource(time.Now().UnixNano())
+var random = rand.New(randomSource)
+
+// LoadEnvFile loads environment variables from a file
+// Environment variables in the file should be in the format KEY=VALUE
+func LoadEnvFile(filePath string) error {
+	if filePath == "" {
+		return nil
+	}
+
+	file, err := os.Open(filePath)
+	if err != nil {
+		// If file doesn't exist, just return nil (not an error)
+		if os.IsNotExist(err) {
+			return nil
+		}
+		return fmt.Errorf("error opening env file: %w", err)
+	}
+	defer file.Close()
+
+	scanner := bufio.NewScanner(file)
+	lineNum := 0
+
+	for scanner.Scan() {
+		lineNum++
+		line := scanner.Text()
+
+		// Skip empty lines and comments
+		if line == "" || strings.HasPrefix(line, "#") {
+			continue
+		}
+
+		// Split on first equals sign
+		parts := strings.SplitN(line, "=", 2)
+		if len(parts) != 2 {
+			return fmt.Errorf("invalid format in env file at line %d: %s", lineNum, line)
+		}
+
+		key := strings.TrimSpace(parts[0])
+		value := strings.TrimSpace(parts[1])
+
+		// Remove quotes if present
+		if len(value) > 1 && (strings.HasPrefix(value, "\"") && strings.HasSuffix(value, "\"")) ||
+			(strings.HasPrefix(value, "'") && strings.HasSuffix(value, "'")) {
+			value = value[1 : len(value)-1]
+		}
+
+		// Set environment variable
+		err := os.Setenv(key, value)
+		if err != nil {
+			return fmt.Errorf("error setting environment variable %s: %w", key, err)
+		}
+	}
+
+	if err := scanner.Err(); err != nil {
+		return fmt.Errorf("error reading env file: %w", err)
+	}
+
+	return nil
 }
 
 // InterpolateVariables replaces variable references in the input string
@@ -91,7 +149,7 @@ func processRandomFunction(args []string) string {
 	const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 	result := make([]byte, length)
 	for i := range result {
-		result[i] = charset[rand.Intn(len(charset))]
+		result[i] = charset[random.Intn(len(charset))]
 	}
 
 	return string(result)

samples/.env.sample

@@ -0,0 +1,4 @@
+# Production environment variables
+API_KEY=api-key-12345
+BASE_URL=https://httpbin.org
+ENV_NAME=sample

samples/with_env_variables.test.yaml

@@ -0,0 +1,38 @@
+name: Sample with Environment Variables
+description: This test uses environment variables directly with ${env:VARIABLE_NAME} syntax
+suites:
+  - name: Environment Variable Tests
+    cases:
+      - title: Using ENV variables directly in the request
+        request:
+          method: POST
+          url: http://httpbin.org/post
+          headers:
+            - key: Authorization
+              value: Bearer ${env:API_KEY}
+            - key: X-Environment
+              value: ${env:ENV_NAME}
+          body:
+            type: json
+            data:
+              baseUrl: ${env:BASE_URL}
+              environment: ${env:ENV_NAME}
+          assertions:
+            status: 200
+            headers:
+              - path: content-type
+                operator: eq
+                expected: application/json
+            body:
+              - path: json.baseUrl
+                operator: eq
+                expected: https://api.example.com
+              - path: json.environment
+                operator: eq
+                expected: development
+              - path: headers.Authorization
+                operator: eq
+                expected: "Bearer test-api-key"
+              - path: headers.X-Environment
+                operator: eq
+                expected: "development"