Merge pull request #467 from alphagov/reinstate-es-six-seven-aa-test

Reinstate ElasticSearch 6.7 AA test
alphagov · Aug 17, 2023 · 19cb40a · 19cb40a
2 parents 5bff7b9 + dc963f6
commit 19cb40a
Show file tree

Hide file tree

Showing 12 changed files with 323 additions and 3 deletions.
diff --git a/ab_tests/ab_tests.yaml b/ab_tests/ab_tests.yaml
@@ -6,4 +6,7 @@
   - B
 - BankHolidaysTest:
   - A
-  - B
+  - B
+- EsSixPointSeven:
+  - A
+  - B
diff --git a/configs/dictionaries/ab_test_expiries.yaml b/configs/dictionaries/ab_test_expiries.yaml
@@ -6,4 +6,5 @@
 # ExampleTest: 86400
 ---
 Example: 86400
-BankHolidaysTest: 86400
+BankHolidaysTest: 86400
+EsSixPointSeven: 604800
diff --git a/configs/dictionaries/active_ab_tests.yaml b/configs/dictionaries/active_ab_tests.yaml
@@ -4,4 +4,5 @@
 # bucket allocations. See example_percentages.yaml for format.
 ---
 Example: true
-BankHolidaysTest: true
+BankHolidaysTest: true
+EsSixPointSeven: true
diff --git a/configs/dictionaries/essixpointseven_percentages.yaml b/configs/dictionaries/essixpointseven_percentages.yaml
@@ -0,0 +1,3 @@
+---
+A: 50
+B: 50
diff --git a/spec/test-outputs/www-eks-integration.out.vcl b/spec/test-outputs/www-eks-integration.out.vcl
@@ -230,6 +230,39 @@ sub vcl_recv {
         }
       }
     }
+    if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+      if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+      } else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
+        # Set the value of the header to whatever decision was previously made
+        set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
+        set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
+      } else {
+        declare local var.denominator_EsSixPointSeven INTEGER;
+        declare local var.denominator_EsSixPointSeven_A INTEGER;
+        declare local var.nominator_EsSixPointSeven_A INTEGER;
+        set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
+        declare local var.denominator_EsSixPointSeven_B INTEGER;
+        declare local var.nominator_EsSixPointSeven_B INTEGER;
+        set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
+        set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
+        if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+        } else {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+        }
+      }
+    }
   }
   # End dynamic section
 
@@ -391,6 +424,12 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
       add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
     }
   }
+  if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+    if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
+      set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
+      add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
+    }
+  }
 }
   # End dynamic section
 

diff --git a/spec/test-outputs/www-eks-production.out.vcl b/spec/test-outputs/www-eks-production.out.vcl
@@ -402,6 +402,39 @@ sub vcl_recv {
         }
       }
     }
+    if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+      if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+      } else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
+        # Set the value of the header to whatever decision was previously made
+        set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
+        set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
+      } else {
+        declare local var.denominator_EsSixPointSeven INTEGER;
+        declare local var.denominator_EsSixPointSeven_A INTEGER;
+        declare local var.nominator_EsSixPointSeven_A INTEGER;
+        set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
+        declare local var.denominator_EsSixPointSeven_B INTEGER;
+        declare local var.nominator_EsSixPointSeven_B INTEGER;
+        set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
+        set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
+        if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+        } else {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+        }
+      }
+    }
   }
   # End dynamic section
 
@@ -563,6 +596,12 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
       add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
     }
   }
+  if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+    if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
+      set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
+      add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
+    }
+  }
 }
   # End dynamic section
 

diff --git a/spec/test-outputs/www-eks-staging.out.vcl b/spec/test-outputs/www-eks-staging.out.vcl
@@ -402,6 +402,39 @@ sub vcl_recv {
         }
       }
     }
+    if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+      if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+      } else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
+        # Set the value of the header to whatever decision was previously made
+        set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
+        set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
+      } else {
+        declare local var.denominator_EsSixPointSeven INTEGER;
+        declare local var.denominator_EsSixPointSeven_A INTEGER;
+        declare local var.nominator_EsSixPointSeven_A INTEGER;
+        set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
+        declare local var.denominator_EsSixPointSeven_B INTEGER;
+        declare local var.nominator_EsSixPointSeven_B INTEGER;
+        set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
+        set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
+        if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+        } else {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+        }
+      }
+    }
   }
   # End dynamic section
 
@@ -563,6 +596,12 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
       add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
     }
   }
+  if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+    if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
+      set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
+      add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
+    }
+  }
 }
   # End dynamic section
 

diff --git a/spec/test-outputs/www-eks-test.out.vcl b/spec/test-outputs/www-eks-test.out.vcl
@@ -230,6 +230,39 @@ sub vcl_recv {
         }
       }
     }
+    if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+      if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+      } else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
+        # Set the value of the header to whatever decision was previously made
+        set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
+        set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
+      } else {
+        declare local var.denominator_EsSixPointSeven INTEGER;
+        declare local var.denominator_EsSixPointSeven_A INTEGER;
+        declare local var.nominator_EsSixPointSeven_A INTEGER;
+        set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
+        declare local var.denominator_EsSixPointSeven_B INTEGER;
+        declare local var.nominator_EsSixPointSeven_B INTEGER;
+        set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
+        set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
+        if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+        } else {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+        }
+      }
+    }
   }
   # End dynamic section
 
@@ -391,6 +424,12 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
       add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
     }
   }
+  if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+    if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
+      set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
+      add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
+    }
+  }
 }
   # End dynamic section
 

diff --git a/spec/test-outputs/www-integration.out.vcl b/spec/test-outputs/www-integration.out.vcl
@@ -230,6 +230,39 @@ sub vcl_recv {
         }
       }
     }
+    if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+      if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+      } else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
+        # Set the value of the header to whatever decision was previously made
+        set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
+        set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
+      } else {
+        declare local var.denominator_EsSixPointSeven INTEGER;
+        declare local var.denominator_EsSixPointSeven_A INTEGER;
+        declare local var.nominator_EsSixPointSeven_A INTEGER;
+        set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
+        declare local var.denominator_EsSixPointSeven_B INTEGER;
+        declare local var.nominator_EsSixPointSeven_B INTEGER;
+        set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
+        set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
+        if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+        } else {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+        }
+      }
+    }
   }
   # End dynamic section
 
@@ -391,6 +424,12 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
       add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
     }
   }
+  if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+    if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
+      set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
+      add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
+    }
+  }
 }
   # End dynamic section
 

diff --git a/spec/test-outputs/www-production.out.vcl b/spec/test-outputs/www-production.out.vcl
@@ -394,6 +394,39 @@ sub vcl_recv {
         }
       }
     }
+    if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+      if (req.http.User-Agent ~ "^GOV\.UK Crawler Worker") {
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=A(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+      } else if (req.url ~ "[\?\&]ABTest-EsSixPointSeven=B(&|$)") {
+        # Some users, such as remote testers, will be given a URL with a query string
+        # to place them into a specific bucket.
+        set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+      } else if (req.http.Cookie ~ "ABTest-EsSixPointSeven") {
+        # Set the value of the header to whatever decision was previously made
+        set req.http.GOVUK-ABTest-EsSixPointSeven = req.http.Cookie:ABTest-EsSixPointSeven;
+        set req.http.GOVUK-ABTest-EsSixPointSeven-Cookie = "sent_in_request";
+      } else {
+        declare local var.denominator_EsSixPointSeven INTEGER;
+        declare local var.denominator_EsSixPointSeven_A INTEGER;
+        declare local var.nominator_EsSixPointSeven_A INTEGER;
+        set var.nominator_EsSixPointSeven_A = std.atoi(table.lookup(essixpointseven_percentages, "A"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_A;
+        declare local var.denominator_EsSixPointSeven_B INTEGER;
+        declare local var.nominator_EsSixPointSeven_B INTEGER;
+        set var.nominator_EsSixPointSeven_B = std.atoi(table.lookup(essixpointseven_percentages, "B"));
+        set var.denominator_EsSixPointSeven += var.nominator_EsSixPointSeven_B;
+        set var.denominator_EsSixPointSeven_A = var.denominator_EsSixPointSeven;
+        if (randombool(var.nominator_EsSixPointSeven_A, var.denominator_EsSixPointSeven_A)) {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "A";
+        } else {
+          set req.http.GOVUK-ABTest-EsSixPointSeven = "B";
+        }
+      }
+    }
   }
   # End dynamic section
 
@@ -555,6 +588,12 @@ if (req.http.Usage-Cookies-Opt-In == "true" && req.http.User-Agent !~ "^GOV\.UK
       add resp.http.Set-Cookie = "ABTest-BankHolidaysTest=" req.http.GOVUK-ABTest-BankHolidaysTest "; secure; expires=" var.expiry "; path=/";
     }
   }
+  if (table.lookup(active_ab_tests, "EsSixPointSeven") == "true") {
+    if (req.http.GOVUK-ABTest-EsSixPointSeven-Cookie != "sent_in_request" || req.url ~ "[\?\&]ABTest-EsSixPointSeven") {
+      set var.expiry = time.add(now, std.integer2time(std.atoi(table.lookup(ab_test_expiries, "EsSixPointSeven"))));
+      add resp.http.Set-Cookie = "ABTest-EsSixPointSeven=" req.http.GOVUK-ABTest-EsSixPointSeven "; secure; expires=" var.expiry "; path=/";
+    }
+  }
 }
   # End dynamic section