Show HTTP response code for Kubernetes errors

3 files changed, 43 insertions, 5 deletions

diff --git a/spec/services/clusters/applications/check_installation_progress_service_spec.rb b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
index 1a565bb734d..ea17f2bb423 100644
--- a/spec/services/clusters/applications/check_installation_progress_service_spec.rb
+++ b/spec/services/clusters/applications/check_installation_progress_service_spec.rb
@@ -19,6 +19,10 @@ describe Clusters::Applications::CheckInstallationProgressService do
   shared_examples 'a not yet terminated installation' do |a_phase|
     let(:phase) { a_phase }
 
+    before do
+      expect(service).to receive(:installation_phase).once.and_return(phase)
+    end
+
     context "when phase is #{a_phase}" do
       context 'when not timeouted' do
         it 'reschedule a new check' do
@@ -50,8 +54,6 @@ describe Clusters::Applications::CheckInstallationProgressService do
   end
 
   before do
-    expect(service).to receive(:installation_phase).once.and_return(phase)
-
     allow(service).to receive(:installation_errors).and_return(errors)
     allow(service).to receive(:remove_installation_pod).and_return(nil)
   end
@@ -60,6 +62,10 @@ describe Clusters::Applications::CheckInstallationProgressService do
     context 'when installation POD succeeded' do
       let(:phase) { Gitlab::Kubernetes::Pod::SUCCEEDED }
 
+      before do
+        expect(service).to receive(:installation_phase).once.and_return(phase)
+      end
+
       it_behaves_like 'a terminated installation'
 
       it 'make the application installed' do
@@ -76,6 +82,10 @@ describe Clusters::Applications::CheckInstallationProgressService do
       let(:phase) { Gitlab::Kubernetes::Pod::FAILED }
       let(:errors) { 'test installation failed' }
 
+      before do
+        expect(service).to receive(:installation_phase).once.and_return(phase)
+      end
+
       it_behaves_like 'a terminated installation'
 
       it 'make the application errored' do
@@ -87,5 +97,22 @@ describe Clusters::Applications::CheckInstallationProgressService do
     end
 
     RESCHEDULE_PHASES.each { |phase| it_behaves_like 'a not yet terminated installation', phase }
+
+    context 'when installation raises a Kubeclient::HttpError' do
+      let(:cluster) { create(:cluster, :provided_by_user, :project) }
+
+      before do
+        application.update!(cluster: cluster)
+
+        expect(service).to receive(:installation_phase).and_raise(Kubeclient::HttpError.new(401, 'Unauthorized', nil))
+      end
+
+      it 'shows the response code from the error' do
+        service.execute
+
+        expect(application).to be_errored
+        expect(application.status_reason).to eq('Kubernetes error: 401')
+      end
+    end
   end
 end
diff --git a/spec/services/clusters/applications/install_service_spec.rb b/spec/services/clusters/applications/install_service_spec.rb
index 4bd19f5bd79..2f801d019fe 100644
--- a/spec/services/clusters/applications/install_service_spec.rb
+++ b/spec/services/clusters/applications/install_service_spec.rb
@@ -42,7 +42,7 @@ describe Clusters::Applications::InstallService do
         service.execute
 
         expect(application).to be_errored
-        expect(application.status_reason).to match('Kubernetes error.')
+        expect(application.status_reason).to match('Kubernetes error: 500')
       end
     end
 
diff --git a/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb b/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb
index 4d1a6bb7b3a..a5806559b14 100644
--- a/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb
+++ b/spec/services/clusters/gcp/kubernetes/fetch_kubernetes_token_service_spec.rb
@@ -19,13 +19,16 @@ describe Clusters::Gcp::Kubernetes::FetchKubernetesTokenService do
 
     subject { described_class.new(kubeclient, service_account_token_name, namespace).execute }
 
+    before do
+      stub_kubeclient_discover(api_url)
+    end
+
     context 'when params correct' do
       let(:decoded_token) { 'xxx.token.xxx' }
       let(:token) { Base64.encode64(decoded_token) }
 
       context 'when gitlab-token exists' do
         before do
-          stub_kubeclient_discover(api_url)
           stub_kubeclient_get_secret(
             api_url,
             {
@@ -39,9 +42,17 @@ describe Clusters::Gcp::Kubernetes::FetchKubernetesTokenService do
         it { is_expected.to eq(decoded_token) }
       end
 
+      context 'when there is a 500 error' do
+        before do
+          stub_kubeclient_get_secret_error(api_url, service_account_token_name, namespace: namespace, status: 500)
+        end
+
+        it { expect { subject }.to raise_error(Kubeclient::HttpError) }
+      end
+
       context 'when gitlab-token does not exist' do
         before do
-          allow(kubeclient).to receive(:get_secret).and_raise(Kubeclient::HttpError.new(404, 'Not found', nil))
+          stub_kubeclient_get_secret_error(api_url, service_account_token_name, namespace: namespace, status: 404)
         end
 
         it { is_expected.to be_nil }