WIP

elastic · Oct 1, 2021 · eb5c8da · eb5c8da
1 parent bcda761
commit eb5c8da
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 24 deletions.
diff --git a/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts b/x-pack/plugins/upgrade_assistant/public/application/lib/api.ts
@@ -116,6 +116,7 @@ export class ApiService {
       body: {
         settings: JSON.stringify(settings),
       },
+      errorInterceptors: this.errorInterceptors,
     });
 
     return result;
@@ -126,6 +127,7 @@ export class ApiService {
       path: `${API_BASE_PATH}/ml_snapshots`,
       method: 'post',
       body,
+      errorInterceptors: this.errorInterceptors,
     });
 
     return result;
@@ -135,6 +137,7 @@ export class ApiService {
     const result = await this.sendRequest({
       path: `${API_BASE_PATH}/ml_snapshots/${jobId}/${snapshotId}`,
       method: 'delete',
+      errorInterceptors: this.errorInterceptors,
     });
 
     return result;
@@ -150,36 +153,41 @@ export class ApiService {
     return await this.sendRequest({
       path: `${API_BASE_PATH}/ml_snapshots/${jobId}/${snapshotId}`,
       method: 'get',
+      errorInterceptors: this.errorInterceptors,
+    });
+  }
+
+  public useLoadMlUpgradeMode() {
+    return this.useRequest<{
+      mlUpgradeModeEnabled: boolean;
+    }>({
+      path: `${API_BASE_PATH}/ml_upgrade_mode`,
+      method: 'get',
+      errorInterceptors: this.errorInterceptors,
     });
   }
 
   public async getReindexStatus(indexName: string) {
     return await this.sendRequest({
       path: `${API_BASE_PATH}/reindex/${indexName}`,
       method: 'get',
+      errorInterceptors: this.errorInterceptors,
     });
   }
 
   public async startReindexTask(indexName: string) {
     return await this.sendRequest({
       path: `${API_BASE_PATH}/reindex/${indexName}`,
       method: 'post',
+      errorInterceptors: this.errorInterceptors,
     });
   }
 
   public async cancelReindexTask(indexName: string) {
     return await this.sendRequest({
       path: `${API_BASE_PATH}/reindex/${indexName}/cancel`,
       method: 'post',
-    });
-  }
-
-  public useLoadMlUpgradeMode() {
-    return this.useRequest<{
-      mlUpgradeModeEnabled: boolean;
-    }>({
-      path: `${API_BASE_PATH}/ml_upgrade_mode`,
-      method: 'get',
+      errorInterceptors: this.errorInterceptors,
     });
   }
 }

diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_version_precheck.ts
@@ -102,24 +102,24 @@ export const esVersionCheck = async (
 };
 
 export const versionCheckHandlerWrapper =
-  <P, Q, B>(handler: RequestHandler<P, Q, B>, isFailure) =>
+  <P, Q, B>(handler: RequestHandler<P, Q, B>, /*isFailure*/) =>
   async (
     ctx: RequestHandlerContext,
     request: KibanaRequest<P, Q, B>,
     response: KibanaResponseFactory
   ) => {
-    if (isFailure) {
-      return response.customError({
-        // 426 means "Upgrade Required" and is used when semver compatibility is not met.
-        statusCode: 426,
-        body: {
-          message: 'There are some nodes running a different version of Elasticsearch',
-          attributes: {
-            allNodesUpgraded: false,
-          },
-        },
-      });
-    }
+    // if (isFailure) {
+    //   return response.customError({
+    //     // 426 means "Upgrade Required" and is used when semver compatibility is not met.
+    //     statusCode: 426,
+    //     body: {
+    //       message: 'There are some nodes running a different version of Elasticsearch',
+    //       attributes: {
+    //         allNodesUpgraded: false,
+    //       },
+    //     },
+    //   });
+    // }
     const errorResponse = await esVersionCheck(ctx, response);
     if (errorResponse) {
       return errorResponse;

diff --git a/x-pack/plugins/upgrade_assistant/server/routes/app.ts b/x-pack/plugins/upgrade_assistant/server/routes/app.ts
@@ -74,8 +74,7 @@ export function registerAppRoutes({
         } catch (error) {
           return handleEsError({ error, response });
         }
-      },
-      true
+      }
     )
   );
 }