Merge pull request #598 from votdev/improve_err_msg

glass: Improve error message.
aquarist-labs · Jul 1, 2021 · dec8909 · dec8909
2 parents 148d57d + 1c05bda
commit dec8909
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 7 deletions.
diff --git a/...p/pages/install-wizard/install-create-wizard-page/install-create-wizard-page.component.ts b/...p/pages/install-wizard/install-create-wizard-page/install-create-wizard-page.component.ts
@@ -25,7 +25,7 @@ import { InstallWizardContext } from '~/app/pages/install-wizard/models/install-
 import { StatusStageEnum } from '~/app/shared/services/api/local.service';
 import { LocalNodeService, NodeStatus } from '~/app/shared/services/api/local.service';
 import {
-  DeploymentBasicReply,
+  DeploymentStartReply,
   DeploymentStatusReply,
   NodesService,
   NodeStageEnum
@@ -214,13 +214,15 @@ export class InstallCreateWizardPageComponent implements OnInit {
         hostname: this.context.config.hostname
       })
       .subscribe({
-        next: (basicReplay: DeploymentBasicReply) => {
-          if (basicReplay.success) {
+        next: (startReplay: DeploymentStartReply) => {
+          if (startReplay.success) {
             this.context.stage = 'bootstrapping';
             this.blockUI.update(translate(TEXT('Please wait, bootstrapping in progress ...')));
             this.pollBootstrapStatus();
           } else {
-            this.handleError(TEXT('Failed to start bootstrapping the system.'));
+            this.handleError(
+              TEXT(`Failed to start bootstrapping the system: ${startReplay.error.message}`)
+            );
           }
         },
         error: (err) => {

diff --git a/src/glass/src/app/shared/services/api/nodes.service.ts b/src/glass/src/app/shared/services/api/nodes.service.ts
@@ -2,6 +2,20 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 
+export enum DeploymentErrorEnum {
+  none = 0,
+  cantBootstrap = 1,
+  nodeNotStarted = 2,
+  cantJoin = 3,
+  cantAssimilate = 4,
+  unknownError = 5
+}
+
+export type DeploymentError = {
+  code: DeploymentErrorEnum;
+  message?: string;
+};
+
 export type DeploymentStartRequest = {
   ntpaddr: string;
   hostname: string;
@@ -17,8 +31,9 @@ export type TokenReply = {
   token: string;
 };
 
-export type DeploymentBasicReply = {
+export type DeploymentStartReply = {
   success: boolean;
+  error: DeploymentError;
 };
 
 // eslint-disable-next-line no-shadow
@@ -98,8 +113,8 @@ export class NodesService {
   /**
    * Start node deployment.
    */
-  deploymentStart(request: DeploymentStartRequest): Observable<DeploymentBasicReply> {
-    return this.http.post<DeploymentBasicReply>(`${this.deploymentURL}/start`, request, {});
+  deploymentStart(request: DeploymentStartRequest): Observable<DeploymentStartReply> {
+    return this.http.post<DeploymentStartReply>(`${this.deploymentURL}/start`, request, {});
   }
 
   /**