chore: Add PACT_ prefix to all V2 engine env vars

Author: rholshausen

.github/workflows/build.yml

@@ -51,8 +51,8 @@ jobs:
         env:
           RUST_LOG: debug
           RUST_BACKTRACE: 1
-          MATCHING_ENGINE: v2
-          V2_MATCHING_LOG_EXECUTED_PLAN: 1
+          PACT_MATCHING_ENGINE: v2
+          PACT_V2_MATCHING_LOG_EXECUTED_PLAN: 1
 
   musl-build:
     runs-on: ubuntu-latest

rust/pact_matching/README.md

@@ -645,13 +645,13 @@ WS : [ \t\n\r] + -> skip ;
 
 ## V2 matching engine
 
-Version 2.0+ has a redesigned matching engine. To enable it, set the `MATCHING_ENGINE` environment variable to `v2`.
+Version 2.0+ has a redesigned matching engine. To enable it, set the `PACT_MATCHING_ENGINE` environment variable to `v2`.
 
-The machine engine now has two phases. The first phase builds a matching plan from the expected interaction as an 
-abstract syntax tree (AST), and then the second phase executes the AST against the actual request or response.
+The machine engine now has two phases. The first phase builds a matching plan from the expected interaction as a 
+tree (AST), and then the second phase executes the AST against the actual request or response.
 
 The following environment variables control the matching:
-* `MATCHING_ENGINE` - Engine to use: `v1` or `v2`.
-* `V2_MATCHING_COLOURED_OUTPUT` - Enables coloured output with the V2 engine.
-* `V2_MATCHING_LOG_PLAN_SUMMARY` - Displays a summary of the executed plan. Enabled by default.
-* `V2_MATCHING_LOG_EXECUTED_PLAN` - Logs the executed plan details (AST).
+* `PACT_MATCHING_ENGINE` - Engine to use: `v1` or `v2`.
+* `PACT_V2_MATCHING_COLOURED_OUTPUT` - Enables coloured output with the V2 engine.
+* `PACT_V2_MATCHING_LOG_PLAN_SUMMARY` - Displays a summary of the executed plan. Enabled by default.
+* `PACT_V2_MATCHING_LOG_EXECUTED_PLAN` - Logs the executed plan details (AST).

rust/pact_matching/src/engine/context.rs

@@ -24,19 +24,19 @@ pub struct MatchingConfiguration {
 
 impl MatchingConfiguration {
   /// Configures the matching engine configuration from environment variables:
-  /// * `V2_MATCHING_LOG_EXECUTED_PLAN` - Enable to log the executed plan.
-  /// * `V2_MATCHING_LOG_PLAN_SUMMARY` - Enable to log a summary of the executed plan.
-  /// * `V2_MATCHING_COLOURED_OUTPUT` - Enables coloured output.
+  /// * `PACT_V2_MATCHING_LOG_EXECUTED_PLAN` - Enable to log the executed plan.
+  /// * `PACT_V2_MATCHING_LOG_PLAN_SUMMARY` - Enable to log a summary of the executed plan.
+  /// * `PACT_V2_MATCHING_COLOURED_OUTPUT` - Enables coloured output.
   pub fn init_from_env() -> Self {
     let mut config = MatchingConfiguration::default();
 
-    if let Some(val) = env_var_set("V2_MATCHING_LOG_EXECUTED_PLAN") {
+    if let Some(val) = env_var_set("PACT_V2_MATCHING_LOG_EXECUTED_PLAN") {
       config.log_executed_plan = val;
     }
-    if let Some(val) = env_var_set("V2_MATCHING_LOG_PLAN_SUMMARY") {
+    if let Some(val) = env_var_set("PACT_V2_MATCHING_LOG_PLAN_SUMMARY") {
       config.log_plan_summary = val;
     }
-    if let Some(val) = env_var_set("V2_MATCHING_COLOURED_OUTPUT") {
+    if let Some(val) = env_var_set("PACT_V2_MATCHING_COLOURED_OUTPUT") {
       config.coloured_output = val;
     }
 

rust/pact_matching/src/lib.rs

@@ -1884,7 +1884,7 @@ pub async fn match_request<'a>(
   };
   trace!("plugin_data = {:?}", plugin_data);
 
-  let use_v2_engine = std::env::var("MATCHING_ENGINE")
+  let use_v2_engine = std::env::var("PACT_MATCHING_ENGINE")
     .map(|val| val.to_lowercase() == "v2")
     .unwrap_or(false);
   if use_v2_engine {