Merge branch 'pnp-bust-cache' into 'master'

Add PnP feature flag to bust cache

See merge request gitlab-org/gitlab!52437

ee/app/services/fetch_subscription_plans_service.rb

@@ -42,7 +42,13 @@ class FetchSubscriptionPlansService
   end
 
   def cache_key
-    if Feature.enabled?(:subscription_plan_cache_key)
+    if Feature.enabled?(:pnp_subscription_plan_cache_key)
+      if @namespace_id.present?
+        "pnp-subscription-plan-#{@plan}-#{@namespace_id}"
+      else
+        "pnp-subscription-plan-#{@plan}"
+      end
+    elsif Feature.enabled?(:subscription_plan_cache_key)
       if @namespace_id.present?
         "subscription-plan-#{@plan}-#{@namespace_id}"
       else

ee/config/feature_flags/development/pnp_subscription_plan_cache_key.yml

+---
+name: pnp_subscription_plan_cache_key
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/52437
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/299068
+type: development
+group: group::fulfillment
+default_enabled: false

ee/spec/services/fetch_subscription_plans_service_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe FetchSubscriptionPlansService do
       it 'uses only the plan within the cache key name' do
         allow(Gitlab::HTTP).to receive(:get).and_return(response_mock)
 
-        expect(Rails.cache).to receive(:read).with("subscription-plan-#{plan}")
+        expect(Rails.cache).to receive(:read).with("pnp-subscription-plan-#{plan}")
 
         execute_service
       end
@@ -53,7 +53,7 @@ RSpec.describe FetchSubscriptionPlansService do
         it 'uses the namespace id within the cache key name' do
           allow(Gitlab::HTTP).to receive(:get).and_return(response_mock)
 
-          expect(Rails.cache).to receive(:read).with("subscription-plan-#{plan}-#{namespace_id}")
+          expect(Rails.cache).to receive(:read).with("pnp-subscription-plan-#{plan}-#{namespace_id}")
 
           execute_service
         end