From 21ba95871e6196f6340cee4b1ce3384931c0a000 Mon Sep 17 00:00:00 2001 From: Eric Eastwood Date: Wed, 7 Oct 2020 00:10:50 -0500 Subject: [PATCH] Enable redirects by default - Part of https://gitlab.com/gitlab-org/gitlab-pages/-/issues/24 - Original feature added in https://gitlab.com/gitlab-org/gitlab-pages/-/merge_requests/336 - Feature was verified working in in production: https://ops.gitlab.net/gitlab-cookbooks/chef-repo/-/merge_requests/4247#note_92527 - Feature toggle docs being removed in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42759 --- acceptance_test.go | 4 ++-- internal/serving/disk/reader.go | 2 +- internal/serving/disk/serving.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/acceptance_test.go b/acceptance_test.go index 87cd307cf..83f09cdf1 100644 --- a/acceptance_test.go +++ b/acceptance_test.go @@ -525,7 +525,7 @@ func TestDisabledRedirects(t *testing.T) { func TestRedirectStatusPage(t *testing.T) { skipUnlessEnabled(t) - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{"FF_ENABLE_REDIRECTS=true"}) + teardown := RunPagesProcess(t, *pagesBinary, listeners, "") defer teardown() rsp, err := GetPageFromListener(t, httpListener, "group.redirects.gitlab-example.com", "/project-redirects/_redirects") @@ -542,7 +542,7 @@ func TestRedirectStatusPage(t *testing.T) { func TestRedirect(t *testing.T) { skipUnlessEnabled(t) - teardown := RunPagesProcessWithEnvs(t, true, *pagesBinary, listeners, "", []string{"FF_ENABLE_REDIRECTS=true"}) + teardown := RunPagesProcess(t, *pagesBinary, listeners, "") defer teardown() // Test that serving a file still works with redirects enabled diff --git a/internal/serving/disk/reader.go b/internal/serving/disk/reader.go index 559d332c4..6afe7947b 100644 --- a/internal/serving/disk/reader.go +++ b/internal/serving/disk/reader.go @@ -95,7 +95,7 @@ func (reader *Reader) tryFile(h serving.Handler) error { // 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") == "true" { + if os.Getenv("FF_ENABLE_REDIRECTS") != "false" { r := redirects.ParseRedirects(ctx, root) return reader.serveRedirectsStatus(h, r) } diff --git a/internal/serving/disk/serving.go b/internal/serving/disk/serving.go index bb9b40d2f..11b1689e3 100644 --- a/internal/serving/disk/serving.go +++ b/internal/serving/disk/serving.go @@ -21,7 +21,7 @@ func (s *Disk) ServeFileHTTP(h serving.Handler) bool { return true } - if os.Getenv("FF_ENABLE_REDIRECTS") == "true" { + if os.Getenv("FF_ENABLE_REDIRECTS") != "false" { if s.reader.tryRedirects(h) == nil { return true } -- GitLab