Merge branch 'billing-page-when-customers-down' into 'master'

Render an Error on the Billing Page When CustomersDot is Unavailable

See merge request gitlab-org/gitlab!61060

ee/app/controllers/groups/billings_controller.rb

@@ -15,7 +15,12 @@ class Groups::BillingsController < Groups::ApplicationController
     @plans_data = GitlabSubscriptions::FetchSubscriptionPlansService
       .new(plan: current_plan, namespace_id: relevant_group.id)
       .execute
-    track_experiment_event(:contact_sales_btn_in_app, 'page_view:billing_plans:group')
-    record_experiment_user(:contact_sales_btn_in_app)
+
+    if @plans_data
+      track_experiment_event(:contact_sales_btn_in_app, 'page_view:billing_plans:group')
+      record_experiment_user(:contact_sales_btn_in_app)
+    else
+      render 'shared/billings/customers_dot_unavailable'
+    end
   end
 end

ee/app/controllers/profiles/billings_controller.rb

@@ -9,7 +9,12 @@ class Profiles::BillingsController < Profiles::ApplicationController
     @plans_data = GitlabSubscriptions::FetchSubscriptionPlansService
       .new(plan: current_user.namespace.plan_name_for_upgrading, namespace_id: current_user.namespace_id)
       .execute
-    track_experiment_event(:contact_sales_btn_in_app, 'page_view:billing_plans:profile')
-    record_experiment_user(:contact_sales_btn_in_app)
+
+    if @plans_data
+      track_experiment_event(:contact_sales_btn_in_app, 'page_view:billing_plans:profile')
+      record_experiment_user(:contact_sales_btn_in_app)
+    else
+      render 'shared/billings/customers_dot_unavailable'
+    end
   end
 end

ee/app/views/shared/billings/customers_dot_unavailable.html.haml

+- page_title _("Billing")
+
+.gl-alert.gl-alert-danger.gl-mb-5
+  = sprite_icon('error', size: 16, css_class: 'gl-icon gl-alert-icon')
+  .gl-alert-content
+    .gl-alert-title
+      = _('Subscription service outage')
+    .gl-alert-body
+      = html_escape(_("The GitLab subscription service (customers.gitlab.com) is currently experiencing an outage. You can monitor the status and get updates at %{linkStart}status.gitlab.com%{linkEnd}.")) % { linkStart: "<a href=\"#{::EE::GITLAB_COM_STATUS_URL}\">".html_safe, linkEnd: '</a>'.html_safe }

ee/lib/ee.rb

@@ -12,4 +12,5 @@ module EE
   SUBSCRIPTION_PORTAL_ADMIN_TOKEN = ENV.fetch('SUBSCRIPTION_PORTAL_ADMIN_TOKEN', 'customer_admin_token')
   CUSTOMER_SUPPORT_URL = 'https://support.gitlab.com'
   CUSTOMER_LICENSE_SUPPORT_URL = 'https://support.gitlab.com/hc/en-us/requests/new?ticket_form_id=360000071293'
+  GITLAB_COM_STATUS_URL = "https://status.gitlab.com"
 end

ee/spec/controllers/groups/billings_controller_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe Groups::BillingsController do
       before do
         add_group_owner
         allow_next_instance_of(GitlabSubscriptions::FetchSubscriptionPlansService) do |instance|
-          allow(instance).to receive(:execute)
+          allow(instance).to receive(:execute).and_return([])
         end
         allow(controller).to receive(:track_experiment_event)
       end
@@ -61,6 +61,30 @@ RSpec.describe Groups::BillingsController do
 
         get_index
       end
+
+      context 'when CustomersDot is unavailable' do
+        before do
+          allow_next_instance_of(GitlabSubscriptions::FetchSubscriptionPlansService) do |instance|
+            allow(instance).to receive(:execute).and_return(nil)
+          end
+        end
+
+        it 'does not track the page view for the contact_sales_btn_in_app experiment' do
+          expect(controller).not_to receive(:track_experiment_event)
+
+          get_index
+
+          expect(response).to render_template('shared/billings/customers_dot_unavailable')
+        end
+
+        it 'does not record the user for the contact_sales_btn_in_app experiment' do
+          expect(controller).not_to receive(:record_experiment_user)
+
+          get_index
+
+          expect(response).to render_template('shared/billings/customers_dot_unavailable')
+        end
+      end
     end
 
     context 'unauthorized' do

ee/spec/controllers/profiles/billings_controller_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Profiles::BillingsController do
       stub_application_setting(check_namespace_plan: true)
       allow(Gitlab).to receive(:com?) { true }
       allow_next_instance_of(GitlabSubscriptions::FetchSubscriptionPlansService) do |instance|
-        allow(instance).to receive(:execute)
+        allow(instance).to receive(:execute).and_return([])
       end
       allow(controller).to receive(:track_experiment_event)
     end
@@ -51,5 +51,29 @@ RSpec.describe Profiles::BillingsController do
 
       get_index
     end
+
+    context 'when CustomersDot is unavailable' do
+      before do
+        allow_next_instance_of(GitlabSubscriptions::FetchSubscriptionPlansService) do |instance|
+          allow(instance).to receive(:execute).and_return(nil)
+        end
+      end
+
+      it 'does not track the page view for the contact_sales_btn_in_app experiment' do
+        expect(controller).not_to receive(:track_experiment_event)
+
+        get_index
+
+        expect(response).to render_template('shared/billings/customers_dot_unavailable')
+      end
+
+      it 'does not record the user for the contact_sales_btn_in_app experiment' do
+        expect(controller).not_to receive(:record_experiment_user)
+
+        get_index
+
+        expect(response).to render_template('shared/billings/customers_dot_unavailable')
+      end
+    end
   end
 end

ee/spec/features/billings/billing_plans_spec.rb

@@ -315,6 +315,22 @@ RSpec.describe 'Billing plan pages', :feature, :js do
       it_behaves_like 'plan with subscription table'
       it_behaves_like 'does not display EoA banner'
     end
+
+    context 'when CustomersDot is unavailable' do
+      let(:plan) { ultimate_plan }
+      let!(:subscription) { create(:gitlab_subscription, namespace: namespace, hosted_plan: plan) }
+
+      before do
+        stub_full_request("#{EE::SUBSCRIPTIONS_URL}/gitlab_plans?plan=#{plan.name}&namespace_id=#{namespace.id}")
+          .to_raise("Connection refused")
+      end
+
+      it 'renders an error page' do
+        visit page_path
+
+        expect(page).to have_content("Subscription service outage")
+      end
+    end
   end
 
   context 'users profile billing page with a trial' do

ee/spec/features/groups/billing_spec.rb

@@ -18,80 +18,107 @@ RSpec.describe 'Groups > Billing', :js do
     '.subscription-table'
   end
 
-  before do
-    stub_eoa_eligibility_request(group.id)
-    stub_full_request("#{EE::SUBSCRIPTIONS_URL}/gitlab_plans?plan=#{plan}&namespace_id=#{group.id}")
-      .with(headers: { 'Accept' => 'application/json' })
-      .to_return(status: 200, body: File.new(Rails.root.join('ee/spec/fixtures/gitlab_com_plans.json')))
+  before_all do
+    group.add_owner(user)
+  end
 
+  before do
     allow(Gitlab).to receive(:com?).and_return(true)
     stub_application_setting(check_namespace_plan: true)
 
-    group.add_owner(user)
     sign_in(user)
   end
 
-  context 'with a free plan' do
-    let(:plan) { 'free' }
-
-    let!(:subscription) do
-      create(:gitlab_subscription, namespace: group, hosted_plan: nil, seats: 15)
+  context 'when CustomersDot is available' do
+    before do
+      stub_eoa_eligibility_request(group.id)
+      stub_full_request("#{EE::SUBSCRIPTIONS_URL}/gitlab_plans?plan=#{plan}&namespace_id=#{group.id}")
+        .with(headers: { 'Accept' => 'application/json' })
+        .to_return(status: 200, body: File.new(Rails.root.join('ee/spec/fixtures/gitlab_com_plans.json')))
     end
 
-    it 'shows the proper title and subscription data' do
-      visit group_billings_path(group)
+    context 'with a free plan' do
+      let(:plan) { 'free' }
 
-      expect(page).to have_content("#{group.name} is currently using the Free Plan")
-      within subscription_table do
-        expect(page).to have_content("start date #{formatted_date(subscription.start_date)}")
-        expect(page).to have_link("Upgrade", href: "#{EE::SUBSCRIPTIONS_URL}/subscriptions")
-        expect(page).not_to have_link("Manage")
+      let!(:subscription) do
+        create(:gitlab_subscription, namespace: group, hosted_plan: nil, seats: 15)
+      end
+
+      it 'shows the proper title and subscription data' do
+        visit group_billings_path(group)
+
+        expect(page).to have_content("#{group.name} is currently using the Free Plan")
+        within subscription_table do
+          expect(page).to have_content("start date #{formatted_date(subscription.start_date)}")
+          expect(page).to have_link("Upgrade", href: "#{EE::SUBSCRIPTIONS_URL}/subscriptions")
+          expect(page).not_to have_link("Manage")
+        end
       end
     end
-  end
 
-  context 'with a paid plan' do
-    let(:plan) { 'bronze' }
+    context 'with a paid plan' do
+      let(:plan) { 'bronze' }
 
-    let_it_be(:subscription) do
-      create(:gitlab_subscription, namespace: group, hosted_plan: bronze_plan, seats: 15)
+      let_it_be(:subscription) do
+        create(:gitlab_subscription, namespace: group, hosted_plan: bronze_plan, seats: 15)
+      end
+
+      it 'shows the proper title and subscription data' do
+        extra_seats_url = "#{EE::SUBSCRIPTIONS_URL}/gitlab/namespaces/#{group.id}/extra_seats"
+        renew_url = "#{EE::SUBSCRIPTIONS_URL}/gitlab/namespaces/#{group.id}/renew"
+        upgrade_url =
+          "#{EE::SUBSCRIPTIONS_URL}/gitlab/namespaces/#{group.id}/upgrade/bronze-external-id"
+
+        visit group_billings_path(group)
+
+        expect(page).to have_content("#{group.name} is currently using the Bronze Plan")
+        within subscription_table do
+          expect(page).to have_content("start date #{formatted_date(subscription.start_date)}")
+          expect(page).to have_link("Upgrade", href: upgrade_url)
+          expect(page).to have_link("Manage", href: "#{EE::SUBSCRIPTIONS_URL}/subscriptions")
+          expect(page).to have_link("Add seats", href: extra_seats_url)
+          expect(page).to have_link("Renew", href: renew_url)
+          expect(page).to have_link("See usage", href: group_seat_usage_path(group))
+        end
+      end
     end
 
-    it 'shows the proper title and subscription data' do
-      extra_seats_url = "#{EE::SUBSCRIPTIONS_URL}/gitlab/namespaces/#{group.id}/extra_seats"
-      renew_url = "#{EE::SUBSCRIPTIONS_URL}/gitlab/namespaces/#{group.id}/renew"
-      upgrade_url =
-        "#{EE::SUBSCRIPTIONS_URL}/gitlab/namespaces/#{group.id}/upgrade/bronze-external-id"
+    context 'with a legacy paid plan' do
+      let(:plan) { 'bronze' }
 
-      visit group_billings_path(group)
+      let!(:subscription) do
+        create(:gitlab_subscription, end_date: 1.week.ago, namespace: group, hosted_plan: bronze_plan, seats: 15)
+      end
 
-      expect(page).to have_content("#{group.name} is currently using the Bronze Plan")
-      within subscription_table do
-        expect(page).to have_content("start date #{formatted_date(subscription.start_date)}")
-        expect(page).to have_link("Upgrade", href: upgrade_url)
-        expect(page).to have_link("Manage", href: "#{EE::SUBSCRIPTIONS_URL}/subscriptions")
-        expect(page).to have_link("Add seats", href: extra_seats_url)
-        expect(page).to have_link("Renew", href: renew_url)
-        expect(page).to have_link("See usage", href: group_seat_usage_path(group))
+      it 'shows the proper title and subscription data' do
+        visit group_billings_path(group)
+
+        expect(page).to have_content("#{group.name} is currently using the Bronze Plan")
+        within subscription_table do
+          expect(page).not_to have_link("Upgrade")
+          expect(page).to have_link("Manage", href: "#{EE::SUBSCRIPTIONS_URL}/subscriptions")
+        end
       end
     end
   end
 
-  context 'with a legacy paid plan' do
+  context 'when CustomersDot is unavailable' do
+    before do
+      stub_full_request("#{EE::SUBSCRIPTIONS_URL}/gitlab_plans?plan=#{plan}&namespace_id=#{group.id}")
+        .with(headers: { 'Accept' => 'application/json' })
+        .to_raise("Connection refused")
+    end
+
     let(:plan) { 'bronze' }
 
-    let!(:subscription) do
-      create(:gitlab_subscription, end_date: 1.week.ago, namespace: group, hosted_plan: bronze_plan, seats: 15)
+    let_it_be(:subscription) do
+      create(:gitlab_subscription, namespace: group, hosted_plan: bronze_plan, seats: 15)
     end
 
-    it 'shows the proper title and subscription data' do
+    it 'renders an error page' do
       visit group_billings_path(group)
 
-      expect(page).to have_content("#{group.name} is currently using the Bronze Plan")
-      within subscription_table do
-        expect(page).not_to have_link("Upgrade")
-        expect(page).to have_link("Manage", href: "#{EE::SUBSCRIPTIONS_URL}/subscriptions")
-      end
+      expect(page).to have_content("Subscription service outage")
     end
   end
 end

ee/spec/services/gitlab_subscriptions/fetch_subscription_plans_service_spec.rb

@@ -88,6 +88,18 @@ RSpec.describe GitlabSubscriptions::FetchSubscriptionPlansService do
       it 'returns nil' do
         is_expected.to be_nil
       end
+
+      it 'does not cache the result' do
+        service = described_class.new(plan: plan)
+
+        Rails.cache.with_local_cache do
+          service.execute
+
+          expect(Gitlab::HTTP).to receive(:get)
+
+          service.execute
+        end
+      end
     end
   end
 end

locale/gitlab.pot

@@ -31070,6 +31070,9 @@ msgstr ""
 msgid "Subscription deletion failed."
 msgstr ""
 
+msgid "Subscription service outage"
+msgstr ""
+
 msgid "Subscription successfully applied to \"%{group_name}\""
 msgstr ""
 
@@ -31974,6 +31977,9 @@ msgstr ""
 msgid "The Compliance Dashboard gives you the ability to see a group's merge request activity by providing a high-level view for all projects in the group."
 msgstr ""
 
+msgid "The GitLab subscription service (customers.gitlab.com) is currently experiencing an outage. You can monitor the status and get updates at %{linkStart}status.gitlab.com%{linkEnd}."
+msgstr ""
+
 msgid "The GitLab user to which the Jira user %{jiraDisplayName} will be mapped"
 msgstr ""