From b0607db73ab5d9d5fe6afa4ef84c0afd8f777471 Mon Sep 17 00:00:00 2001 From: Rosa Fox Date: Thu, 27 Jul 2023 17:31:29 +0100 Subject: [PATCH] Remove ES 6.7 50/50 AA test Removing AA test config as the test has expired. PR to implement the test: https://github.com/alphagov/govuk-cdn-config/pull/463 --- ab_tests/ab_tests.yaml | 3 -- configs/dictionaries/ab_test_expiries.yaml | 3 +- configs/dictionaries/active_ab_tests.yaml | 3 +- .../essixpointseven_percentages.yaml | 3 -- spec/test-outputs/www-eks-integration.out.vcl | 39 ------------------- spec/test-outputs/www-eks-production.out.vcl | 39 ------------------- spec/test-outputs/www-eks-staging.out.vcl | 39 ------------------- spec/test-outputs/www-eks-test.out.vcl | 39 ------------------- spec/test-outputs/www-integration.out.vcl | 39 ------------------- spec/test-outputs/www-production.out.vcl | 39 ------------------- spec/test-outputs/www-staging.out.vcl | 39 ------------------- spec/test-outputs/www-test.out.vcl | 39 ------------------- 12 files changed, 2 insertions(+), 322 deletions(-) delete mode 100644 configs/dictionaries/essixpointseven_percentages.yaml diff --git a/ab_tests/ab_tests.yaml b/ab_tests/ab_tests.yaml index be1df86c..a1dafbcc 100644 --- a/ab_tests/ab_tests.yaml +++ b/ab_tests/ab_tests.yaml @@ -5,8 +5,5 @@ - A - B - BankHolidaysTest: - - A - - B -- EsSixPointSeven: - A - B \ No newline at end of file diff --git a/configs/dictionaries/ab_test_expiries.yaml b/configs/dictionaries/ab_test_expiries.yaml index 3d4066a1..0e63e74b 100644 --- a/configs/dictionaries/ab_test_expiries.yaml +++ b/configs/dictionaries/ab_test_expiries.yaml @@ -6,5 +6,4 @@ # ExampleTest: 86400 --- Example: 86400 -BankHolidaysTest: 86400 -EsSixPointSeven: 604800 \ No newline at end of file +BankHolidaysTest: 86400 \ No newline at end of file diff --git a/configs/dictionaries/active_ab_tests.yaml b/configs/dictionaries/active_ab_tests.yaml index 97f7f353..982bc085 100644 --- a/configs/dictionaries/active_ab_tests.yaml +++ b/configs/dictionaries/active_ab_tests.yaml @@ -4,5 +4,4 @@ # bucket allocations. See example_percentages.yaml for format. --- Example: true -BankHolidaysTest: true -EsSixPointSeven: true \ No newline at end of file +BankHolidaysTest: true \ No newline at end of file diff --git a/configs/dictionaries/essixpointseven_percentages.yaml b/configs/dictionaries/essixpointseven_percentages.yaml deleted file mode 100644 index 3fa6144c..00000000 --- a/configs/dictionaries/essixpointseven_percentages.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -A: 50 -B: 50 diff --git a/spec/test-outputs/www-eks-integration.out.vcl b/spec/test-outputs/www-eks-integration.out.vcl index 16803fed..f19d597a 100644 --- a/spec/test-outputs/www-eks-integration.out.vcl +++ b/spec/test-outputs/www-eks-integration.out.vcl @@ -230,39 +230,6 @@ 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 @@ -424,12 +391,6 @@ 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 index 478bee19..c06d680b 100644 --- a/spec/test-outputs/www-eks-production.out.vcl +++ b/spec/test-outputs/www-eks-production.out.vcl @@ -402,39 +402,6 @@ 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 @@ -596,12 +563,6 @@ 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 index 478bee19..c06d680b 100644 --- a/spec/test-outputs/www-eks-staging.out.vcl +++ b/spec/test-outputs/www-eks-staging.out.vcl @@ -402,39 +402,6 @@ 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 @@ -596,12 +563,6 @@ 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 index 16803fed..f19d597a 100644 --- a/spec/test-outputs/www-eks-test.out.vcl +++ b/spec/test-outputs/www-eks-test.out.vcl @@ -230,39 +230,6 @@ 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 @@ -424,12 +391,6 @@ 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 index 16803fed..f19d597a 100644 --- a/spec/test-outputs/www-integration.out.vcl +++ b/spec/test-outputs/www-integration.out.vcl @@ -230,39 +230,6 @@ 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 @@ -424,12 +391,6 @@ 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 index f1eb4784..75dd1b16 100644 --- a/spec/test-outputs/www-production.out.vcl +++ b/spec/test-outputs/www-production.out.vcl @@ -394,39 +394,6 @@ 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 @@ -588,12 +555,6 @@ 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-staging.out.vcl b/spec/test-outputs/www-staging.out.vcl index 478bee19..c06d680b 100644 --- a/spec/test-outputs/www-staging.out.vcl +++ b/spec/test-outputs/www-staging.out.vcl @@ -402,39 +402,6 @@ 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 @@ -596,12 +563,6 @@ 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-test.out.vcl b/spec/test-outputs/www-test.out.vcl index 16803fed..f19d597a 100644 --- a/spec/test-outputs/www-test.out.vcl +++ b/spec/test-outputs/www-test.out.vcl @@ -230,39 +230,6 @@ 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 @@ -424,12 +391,6 @@ 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