From 0d20988befe34a64fddc63635782e8f704bec046 Mon Sep 17 00:00:00 2001
From: Alice Groux <alice.grx@gmail.com>
Date: Thu, 5 Nov 2020 08:49:37 +0100
Subject: [PATCH] fix(rest): remove timeouts for all REST services (#4385)

---
 app/docker/rest/container.js                      | 4 ----
 app/docker/rest/image.js                          | 2 +-
 app/docker/rest/network.js                        | 1 -
 app/docker/rest/service.js                        | 1 -
 app/docker/rest/system.js                         | 3 +--
 app/docker/rest/task.js                           | 1 -
 app/docker/rest/volume.js                         | 2 +-
 app/integrations/storidge/rest/storidge.js        | 4 ++--
 app/kubernetes/component-status/rest.js           | 1 -
 app/kubernetes/endpoint/rest.js                   | 1 -
 app/kubernetes/horizontal-pod-auto-scaler/rest.js | 1 -
 app/kubernetes/ingress/rest.js                    | 1 -
 app/kubernetes/node/rest.js                       | 1 -
 app/kubernetes/rest/configMap.js                  | 1 -
 app/kubernetes/rest/controllerRevision.js         | 1 -
 app/kubernetes/rest/daemonSet.js                  | 1 -
 app/kubernetes/rest/deployment.js                 | 1 -
 app/kubernetes/rest/endpoint.js                   | 1 -
 app/kubernetes/rest/event.js                      | 1 -
 app/kubernetes/rest/health.js                     | 2 +-
 app/kubernetes/rest/namespace.js                  | 1 -
 app/kubernetes/rest/persistentVolumeClaim.js      | 1 -
 app/kubernetes/rest/pod.js                        | 1 -
 app/kubernetes/rest/replicaSet.js                 | 1 -
 app/kubernetes/rest/resourceQuota.js              | 1 -
 app/kubernetes/rest/secret.js                     | 1 -
 app/kubernetes/rest/service.js                    | 1 -
 app/kubernetes/rest/statefulSet.js                | 1 -
 app/kubernetes/rest/storage.js                    | 1 -
 29 files changed, 6 insertions(+), 34 deletions(-)

diff --git a/app/docker/rest/container.js b/app/docker/rest/container.js
index aae286f11..203d16201 100644
--- a/app/docker/rest/container.js
+++ b/app/docker/rest/container.js
@@ -19,7 +19,6 @@ angular.module('portainer.docker').factory('Container', [
           params: { all: 0, action: 'json', filters: '@filters' },
           isArray: true,
           interceptor: ContainersInterceptor,
-          timeout: 15000,
         },
         get: {
           method: 'GET',
@@ -48,20 +47,17 @@ angular.module('portainer.docker').factory('Container', [
         logs: {
           method: 'GET',
           params: { id: '@id', action: 'logs' },
-          timeout: 4500,
           ignoreLoadingBar: true,
           transformResponse: logsHandler,
         },
         stats: {
           method: 'GET',
           params: { id: '@id', stream: false, action: 'stats' },
-          timeout: 4500,
           ignoreLoadingBar: true,
         },
         top: {
           method: 'GET',
           params: { id: '@id', action: 'top' },
-          timeout: 4500,
           ignoreLoadingBar: true,
         },
         start: {
diff --git a/app/docker/rest/image.js b/app/docker/rest/image.js
index aa0d8a6a9..c1dbb9f90 100644
--- a/app/docker/rest/image.js
+++ b/app/docker/rest/image.js
@@ -16,7 +16,7 @@ angular.module('portainer.docker').factory('Image', [
         endpointId: EndpointProvider.endpointID,
       },
       {
-        query: { method: 'GET', params: { all: 0, action: 'json' }, isArray: true, interceptor: ImagesInterceptor, timeout: 15000 },
+        query: { method: 'GET', params: { all: 0, action: 'json' }, isArray: true, interceptor: ImagesInterceptor },
         get: { method: 'GET', params: { action: 'json' } },
         search: { method: 'GET', params: { action: 'search' } },
         history: { method: 'GET', params: { action: 'history' }, isArray: true },
diff --git a/app/docker/rest/network.js b/app/docker/rest/network.js
index 8c8480158..eb92ccdf6 100644
--- a/app/docker/rest/network.js
+++ b/app/docker/rest/network.js
@@ -18,7 +18,6 @@ angular.module('portainer.docker').factory('Network', [
           method: 'GET',
           isArray: true,
           interceptor: NetworksInterceptor,
-          timeout: 15000,
         },
         get: {
           method: 'GET',
diff --git a/app/docker/rest/service.js b/app/docker/rest/service.js
index aecd4acbe..d852e98c4 100644
--- a/app/docker/rest/service.js
+++ b/app/docker/rest/service.js
@@ -35,7 +35,6 @@ angular.module('portainer.docker').factory('Service', [
         logs: {
           method: 'GET',
           params: { id: '@id', action: 'logs' },
-          timeout: 4500,
           ignoreLoadingBar: true,
           transformResponse: logsHandler,
         },
diff --git a/app/docker/rest/system.js b/app/docker/rest/system.js
index fa69df952..917146c4f 100644
--- a/app/docker/rest/system.js
+++ b/app/docker/rest/system.js
@@ -18,10 +18,9 @@ angular.module('portainer.docker').factory('System', [
         info: {
           method: 'GET',
           params: { action: 'info' },
-          timeout: 15000,
           interceptor: InfoInterceptor,
         },
-        version: { method: 'GET', params: { action: 'version' }, timeout: 4500, interceptor: VersionInterceptor },
+        version: { method: 'GET', params: { action: 'version' }, interceptor: VersionInterceptor },
         events: {
           method: 'GET',
           params: { action: 'events', since: '@since', until: '@until' },
diff --git a/app/docker/rest/task.js b/app/docker/rest/task.js
index e2fa19603..dd818b861 100644
--- a/app/docker/rest/task.js
+++ b/app/docker/rest/task.js
@@ -17,7 +17,6 @@ angular.module('portainer.docker').factory('Task', [
         logs: {
           method: 'GET',
           params: { id: '@id', action: 'logs' },
-          timeout: 4500,
           ignoreLoadingBar: true,
           transformResponse: logsHandler,
         },
diff --git a/app/docker/rest/volume.js b/app/docker/rest/volume.js
index dd35f793b..76941ea5a 100644
--- a/app/docker/rest/volume.js
+++ b/app/docker/rest/volume.js
@@ -18,7 +18,7 @@ angular.module('portainer.docker').factory('Volume', [
         endpointId: EndpointProvider.endpointID,
       },
       {
-        query: { method: 'GET', interceptor: VolumesInterceptor, timeout: 15000 },
+        query: { method: 'GET', interceptor: VolumesInterceptor },
         get: { method: 'GET', params: { id: '@id' } },
         create: {
           method: 'POST',
diff --git a/app/integrations/storidge/rest/storidge.js b/app/integrations/storidge/rest/storidge.js
index 7e46d89d4..83a9b107c 100644
--- a/app/integrations/storidge/rest/storidge.js
+++ b/app/integrations/storidge/rest/storidge.js
@@ -12,9 +12,9 @@ angular.module('portainer.integrations.storidge').factory('Storidge', [
       {
         rebootCluster: { method: 'POST', params: { resource: 'clusters', action: 'reboot' } },
         shutdownCluster: { method: 'POST', params: { resource: 'clusters', action: 'shutdown' } },
-        queryEvents: { method: 'GET', params: { resource: 'clusters', action: 'events' }, timeout: 4500, ignoreLoadingBar: true, isArray: true },
+        queryEvents: { method: 'GET', params: { resource: 'clusters', action: 'events' }, ignoreLoadingBar: true, isArray: true },
         getVersion: { method: 'GET', params: { resource: 'clusters', action: 'version' } },
-        getInfo: { method: 'GET', params: { resource: 'clusters', action: 'info' }, timeout: 4500, ignoreLoadingBar: true },
+        getInfo: { method: 'GET', params: { resource: 'clusters', action: 'info' }, ignoreLoadingBar: true },
 
         queryNodes: { method: 'GET', params: { resource: 'nodes' } },
         getNode: { method: 'GET', params: { resource: 'nodes', id: '@id' } },
diff --git a/app/kubernetes/component-status/rest.js b/app/kubernetes/component-status/rest.js
index a286b584f..1e27343ed 100644
--- a/app/kubernetes/component-status/rest.js
+++ b/app/kubernetes/component-status/rest.js
@@ -14,7 +14,6 @@ angular.module('portainer.kubernetes').factory('KubernetesComponentStatus', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
         }
diff --git a/app/kubernetes/endpoint/rest.js b/app/kubernetes/endpoint/rest.js
index 9728d0414..68cf483ee 100644
--- a/app/kubernetes/endpoint/rest.js
+++ b/app/kubernetes/endpoint/rest.js
@@ -15,7 +15,6 @@ angular.module('portainer.kubernetes').factory('KubernetesEndpoints', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
         }
diff --git a/app/kubernetes/horizontal-pod-auto-scaler/rest.js b/app/kubernetes/horizontal-pod-auto-scaler/rest.js
index a6cdc4cb1..a0500ada1 100644
--- a/app/kubernetes/horizontal-pod-auto-scaler/rest.js
+++ b/app/kubernetes/horizontal-pod-auto-scaler/rest.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesHorizontalPodAutoScale
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/ingress/rest.js b/app/kubernetes/ingress/rest.js
index 98f2eea97..df335653b 100644
--- a/app/kubernetes/ingress/rest.js
+++ b/app/kubernetes/ingress/rest.js
@@ -15,7 +15,6 @@ function factory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
       {
         get: {
           method: 'GET',
-          timeout: 15000,
           ignoreLoadingBar: true,
         },
         getYaml: {
diff --git a/app/kubernetes/node/rest.js b/app/kubernetes/node/rest.js
index a145ae017..cbb804216 100644
--- a/app/kubernetes/node/rest.js
+++ b/app/kubernetes/node/rest.js
@@ -16,7 +16,6 @@ angular.module('portainer.kubernetes').factory('KubernetesNodes', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/configMap.js b/app/kubernetes/rest/configMap.js
index 62ad844dd..4b8772d18 100644
--- a/app/kubernetes/rest/configMap.js
+++ b/app/kubernetes/rest/configMap.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesConfigMaps', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/controllerRevision.js b/app/kubernetes/rest/controllerRevision.js
index fb8892c32..cd1cdd193 100644
--- a/app/kubernetes/rest/controllerRevision.js
+++ b/app/kubernetes/rest/controllerRevision.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesControllerRevisions',
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/daemonSet.js b/app/kubernetes/rest/daemonSet.js
index f2cfa025d..6019cb4d3 100644
--- a/app/kubernetes/rest/daemonSet.js
+++ b/app/kubernetes/rest/daemonSet.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesDaemonSets', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/deployment.js b/app/kubernetes/rest/deployment.js
index 44b2eb662..99439f665 100644
--- a/app/kubernetes/rest/deployment.js
+++ b/app/kubernetes/rest/deployment.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesDeployments', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/endpoint.js b/app/kubernetes/rest/endpoint.js
index 7fce22e41..71fde10b4 100644
--- a/app/kubernetes/rest/endpoint.js
+++ b/app/kubernetes/rest/endpoint.js
@@ -11,7 +11,6 @@ angular.module('portainer.kubernetes').factory('KubernetesEndpoints', function K
       {
         get: {
           method: 'GET',
-          timeout: 15000,
           ignoreLoadingBar: true,
         },
       }
diff --git a/app/kubernetes/rest/event.js b/app/kubernetes/rest/event.js
index 54f9b07a5..15393bf05 100644
--- a/app/kubernetes/rest/event.js
+++ b/app/kubernetes/rest/event.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesEvents', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/health.js b/app/kubernetes/rest/health.js
index cbfe3be73..bc41be4f3 100644
--- a/app/kubernetes/rest/health.js
+++ b/app/kubernetes/rest/health.js
@@ -7,7 +7,7 @@ angular.module('portainer.kubernetes').factory('KubernetesHealth', [
       API_ENDPOINT_ENDPOINTS + '/:id/kubernetes/healthz',
       {},
       {
-        ping: { method: 'GET', timeout: 15000, params: { id: 'id' } },
+        ping: { method: 'GET', params: { id: 'id' } },
       }
     );
   },
diff --git a/app/kubernetes/rest/namespace.js b/app/kubernetes/rest/namespace.js
index 843893d58..482ca4132 100644
--- a/app/kubernetes/rest/namespace.js
+++ b/app/kubernetes/rest/namespace.js
@@ -16,7 +16,6 @@ angular.module('portainer.kubernetes').factory('KubernetesNamespaces', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/persistentVolumeClaim.js b/app/kubernetes/rest/persistentVolumeClaim.js
index 25dd65177..e19529430 100644
--- a/app/kubernetes/rest/persistentVolumeClaim.js
+++ b/app/kubernetes/rest/persistentVolumeClaim.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesPersistentVolumeClaims
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/pod.js b/app/kubernetes/rest/pod.js
index 2726eadd3..000068e9c 100644
--- a/app/kubernetes/rest/pod.js
+++ b/app/kubernetes/rest/pod.js
@@ -18,7 +18,6 @@ angular.module('portainer.kubernetes').factory('KubernetesPods', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/replicaSet.js b/app/kubernetes/rest/replicaSet.js
index 45dbf6c2c..29b0440c6 100644
--- a/app/kubernetes/rest/replicaSet.js
+++ b/app/kubernetes/rest/replicaSet.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesReplicaSets', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/resourceQuota.js b/app/kubernetes/rest/resourceQuota.js
index c1eae1036..a2bf9e8c2 100644
--- a/app/kubernetes/rest/resourceQuota.js
+++ b/app/kubernetes/rest/resourceQuota.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesResourceQuotas', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/secret.js b/app/kubernetes/rest/secret.js
index 1767871aa..6595ce5d4 100644
--- a/app/kubernetes/rest/secret.js
+++ b/app/kubernetes/rest/secret.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesSecrets', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/service.js b/app/kubernetes/rest/service.js
index c483f13f2..1cbe21e75 100644
--- a/app/kubernetes/rest/service.js
+++ b/app/kubernetes/rest/service.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesServices', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/statefulSet.js b/app/kubernetes/rest/statefulSet.js
index 3fa962aa0..50551b87a 100644
--- a/app/kubernetes/rest/statefulSet.js
+++ b/app/kubernetes/rest/statefulSet.js
@@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesStatefulSets', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {
diff --git a/app/kubernetes/rest/storage.js b/app/kubernetes/rest/storage.js
index d3ef80d68..4a79439a5 100644
--- a/app/kubernetes/rest/storage.js
+++ b/app/kubernetes/rest/storage.js
@@ -16,7 +16,6 @@ angular.module('portainer.kubernetes').factory('KubernetesStorage', [
         {
           get: {
             method: 'GET',
-            timeout: 15000,
             ignoreLoadingBar: true,
           },
           getYaml: {