From 236bf3115db7ab91bb4d4d8e4c75a28c72b2ac4f Mon Sep 17 00:00:00 2001
From: ngala <ngala@gitlab.com>
Date: Thu, 22 Feb 2024 19:29:39 +0530
Subject: [PATCH] Enable feature flag bydefault - domain redirect, cookie path

- FF_ENABLE_DOMAIN_REDIRECT
- FF_ENABLE_PROJECT_PREFIX_COOKIE_PATH

Related issues:
- https://gitlab.com/gitlab-org/gitlab-pages/-/issues/1087+
- https://gitlab.com/gitlab-org/gitlab-pages/-/issues/1091+

Changelog: other
---
 internal/feature/feature.go            | 4 ++--
 internal/redirects/matching_test.go    | 1 +
 internal/redirects/validations_test.go | 3 +++
 test/acceptance/redirects_test.go      | 3 ++-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/internal/feature/feature.go b/internal/feature/feature.go
index 1b97e935a..89735b708 100644
--- a/internal/feature/feature.go
+++ b/internal/feature/feature.go
@@ -35,13 +35,13 @@ var HandleReadErrors = Feature{
 // ProjectPrefixCookiePath enables support for path in session cookie
 var ProjectPrefixCookiePath = Feature{
 	EnvVariable:    "FF_ENABLE_PROJECT_PREFIX_COOKIE_PATH",
-	defaultEnabled: false,
+	defaultEnabled: true,
 }
 
 // DomainRedirects enables support for domain level redirects
 var DomainRedirects = Feature{
 	EnvVariable:    "FF_ENABLE_DOMAIN_REDIRECT",
-	defaultEnabled: false,
+	defaultEnabled: true,
 }
 
 // RateLimiterCloseConnection enables support for rate limiter close connection
diff --git a/internal/redirects/matching_test.go b/internal/redirects/matching_test.go
index 3938b6803..b022c984f 100644
--- a/internal/redirects/matching_test.go
+++ b/internal/redirects/matching_test.go
@@ -315,6 +315,7 @@ func testMatchesRule(t *testing.T) {
 }
 
 func Test_matchesRule(t *testing.T) {
+	t.Setenv(feature.DomainRedirects.EnvVariable, "false")
 	testMatchesRule(t)
 }
 
diff --git a/internal/redirects/validations_test.go b/internal/redirects/validations_test.go
index 13f115cd3..a295fb438 100644
--- a/internal/redirects/validations_test.go
+++ b/internal/redirects/validations_test.go
@@ -75,6 +75,7 @@ func TestRedirectsValidateFromUrl(t *testing.T) {
 
 func TestRedirectsValidateToUrl(t *testing.T) {
 	t.Setenv(feature.RedirectsPlaceholders.EnvVariable, "true")
+	t.Setenv(feature.DomainRedirects.EnvVariable, "false")
 
 	tests := map[string]struct {
 		url         string
@@ -162,6 +163,7 @@ func TestRedirectsValidateUrlNoPlaceholders(t *testing.T) {
 
 func TestRedirectsValidateRule(t *testing.T) {
 	t.Setenv(feature.RedirectsPlaceholders.EnvVariable, "true")
+	t.Setenv(feature.DomainRedirects.EnvVariable, "false")
 
 	tests := map[string]struct {
 		rule        string
@@ -208,6 +210,7 @@ func TestRedirectsValidateRule(t *testing.T) {
 
 func TestRedirectsValidateFromUrl_DomainRedirect_Enabled(t *testing.T) {
 	t.Setenv(feature.RedirectsPlaceholders.EnvVariable, "true")
+	t.Setenv(feature.DomainRedirects.EnvVariable, "true")
 
 	tests := map[string]struct {
 		url         string
diff --git a/test/acceptance/redirects_test.go b/test/acceptance/redirects_test.go
index 5c7f765ae..6f8b75929 100644
--- a/test/acceptance/redirects_test.go
+++ b/test/acceptance/redirects_test.go
@@ -64,7 +64,8 @@ func testRedirect(t *testing.T, tests []rewrite) {
 	}
 }
 
-func TestRedirect(t *testing.T) {
+func TestRedirect_DomainRedirects_Disabled(t *testing.T) {
+	t.Setenv(feature.DomainRedirects.EnvVariable, "false")
 	tests := []rewrite{
 		// Project domain
 		{
-- 
GitLab