[WIP] Remove HTTP feature flags

alphagov · Sep 6, 2023 · dc92468 · dc92468
1 parent dae4e22
commit dc92468
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 201 deletions.
diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb
@@ -31,7 +31,6 @@ def show
     elsif is_history_page?
       show_history_page
     else
-      set_use_recommended_related_links_header
       set_access_control_allow_origin_header if request.format.atom?
       set_guide_draft_access_token if @content_item.is_a?(GuidePresenter)
       render_template
@@ -139,9 +138,7 @@ def set_guide_draft_access_token
 
   def load_content_item
     content_item = Services.content_store.content_item(content_item_path)
-    if Services.feature_toggler.use_recommended_related_links?(content_item["links"], request.headers)
-      content_item["links"]["ordered_related_items"] = content_item["links"].fetch("suggested_ordered_related_items", [])
-    end
+    content_item["links"]["ordered_related_items"] = content_item["links"].fetch("suggested_ordered_related_items", [])
 
     @content_item = PresenterBuilder.new(
       content_item,
@@ -205,14 +202,6 @@ def set_access_control_allow_origin_header
     response.headers["Access-Control-Allow-Origin"] = "*"
   end
 
-  def set_use_recommended_related_links_header
-    response.headers["Vary"] = [response.headers["Vary"], FeatureFlagNames.recommended_related_links].compact.join(", ")
-
-    related_links_request_header = RequestHelper.get_header(FeatureFlagNames.recommended_related_links, request.headers)
-    required_header_value = Services.feature_toggler.feature_flags.get_feature_flag(FeatureFlagNames.recommended_related_links)
-    response.headers[FeatureFlagNames.recommended_related_links] = (related_links_request_header == required_header_value).to_s
-  end
-
   def set_expiry
     expires_in(
       @content_item.cache_control_max_age(request.format),

diff --git a/app/lib/services.rb b/app/lib/services.rb
@@ -12,12 +12,6 @@ def self.content_store
     )
   end
 
-  def self.feature_toggler
-    @feature_toggler ||= FeatureToggler.new(
-      HttpFeatureFlags.instance,
-    )
-  end
-
   def self.publishing_api
     @publishing_api ||= GdsApi::PublishingApi.new(
       Plek.find("publishing-api"),

diff --git a/app/models/feature_toggler.rb b/app/models/feature_toggler.rb
diff --git a/app/models/http_feature_flags.rb b/app/models/http_feature_flags.rb
diff --git a/config/initializers/feature_flags.rb b/config/initializers/feature_flags.rb
diff --git a/test/models/feature_toggler_test.rb b/test/models/feature_toggler_test.rb
diff --git a/test/models/http_feature_flags_test.rb b/test/models/http_feature_flags_test.rb