Merge branch 'remove/ff-enable-redirects' into 'master'

refactor: remove FF_ENABLE_REDIRECTS feature flag

Closes #618

See merge request gitlab-org/gitlab-pages!582

3 files changed, 4 insertions, 35 deletions

diff --git a/internal/serving/disk/reader.go b/internal/serving/disk/reader.go
index 4f7d41d0..2aeeeb27 100644
--- a/internal/serving/disk/reader.go
+++ b/internal/serving/disk/reader.go
@@ -7,7 +7,6 @@ import (
 	"io"
 	"io/fs"
 	"net/http"
-	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -104,13 +103,8 @@ func (reader *Reader) tryFile(h serving.Handler) bool {
 	// Serve status of `_redirects` under `_redirects`
 	// We check if the final resolved path is `_redirects` after symlink traversal
 	if fullPath == redirects.ConfigFile {
-		if os.Getenv("FF_ENABLE_REDIRECTS") != "false" {
-			r := redirects.ParseRedirects(ctx, root)
-			reader.serveRedirectsStatus(h, r)
-			return true
-		}
-
-		h.Writer.WriteHeader(http.StatusForbidden)
+		r := redirects.ParseRedirects(ctx, root)
+		reader.serveRedirectsStatus(h, r)
 		return true
 	}
 
diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go
index fbcdf9f2..635498aa 100644
--- a/internal/serving/disk/serving.go
+++ b/internal/serving/disk/serving.go
@@ -1,8 +1,6 @@
 package disk
 
 import (
-	"os"
-
 	"gitlab.com/gitlab-org/gitlab-pages/internal/config"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/httperrors"
 	"gitlab.com/gitlab-org/gitlab-pages/internal/serving"
@@ -22,10 +20,8 @@ func (s *Disk) ServeFileHTTP(h serving.Handler) bool {
 		return true
 	}
 
-	if os.Getenv("FF_ENABLE_REDIRECTS") != "false" {
-		if s.reader.tryRedirects(h) {
-			return true
-		}
+	if s.reader.tryRedirects(h) {
+		return true
 	}
 
 	return false
diff --git a/test/acceptance/redirects_test.go b/test/acceptance/redirects_test.go
index 1ce7a0be..0cadea16 100644
--- a/test/acceptance/redirects_test.go
+++ b/test/acceptance/redirects_test.go
@@ -11,27 +11,6 @@ import (
 	redirects "gitlab.com/gitlab-org/gitlab-pages/internal/redirects"
 )
 
-func TestDisabledRedirects(t *testing.T) {
-	RunPagesProcess(t,
-		withListeners([]ListenSpec{httpListener}),
-		withEnv([]string{"FF_ENABLE_REDIRECTS=false", redirects.FFEnablePlaceholders + "=true"}),
-	)
-
-	// Test that redirects status page is forbidden
-	rsp, err := GetPageFromListener(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/_redirects")
-	require.NoError(t, err)
-	defer rsp.Body.Close()
-
-	require.Equal(t, http.StatusForbidden, rsp.StatusCode)
-
-	// Test that redirects are disabled
-	rsp, err = GetRedirectPage(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/redirect-portal.html")
-	require.NoError(t, err)
-	defer rsp.Body.Close()
-
-	require.Equal(t, http.StatusNotFound, rsp.StatusCode)
-}
-
 func TestRedirectStatusPage(t *testing.T) {
 	RunPagesProcess(t,
 		withListeners([]ListenSpec{httpListener}),