Merge remote-tracking branch 'origin/master' into helm-hub

SUSE · Sep 2, 2020 · 043c5fd · 043c5fd
2 parents 9dcdcce + 463a6fc
commit 043c5fd
Show file tree

Hide file tree

Showing 24 changed files with 418 additions and 296 deletions.
diff --git a/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts b/src/frontend/packages/suse-extensions/src/custom/kubernetes/kubernetes.testing.module.ts
@@ -5,6 +5,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
+import { TabNavService } from '../../../../core/tab-nav.service';
 import { AppTestModule } from '../../../../core/test-framework/core-test.helper';
 import { CATALOGUE_ENTITIES, EntityCatalogFeatureModule } from '../../../../store/src/entity-catalog.module';
 import { entityCatalog, TestEntityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
@@ -49,6 +50,7 @@ export const HelmReleaseProviders = [
   HelmReleaseHelperService,
   HelmReleaseActivatedRouteMock,
   HelmReleaseGuidMock,
+  TabNavService
 ];
 
 export const KubeBaseGuidMock = { provide: BaseKubeGuid, useValue: { guid: 'anything' } };
diff --git a/.../custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts b/.../custom/kubernetes/workloads/release/helm-release-tab-base/helm-release-socket-service.ts
@@ -0,0 +1,209 @@
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Subject, Subscription } from 'rxjs';
+import makeWebSocketObservable, { GetWebSocketResponses } from 'rxjs-websockets';
+import { catchError, map, share, switchMap } from 'rxjs/operators';
+
+import { LoggerService } from '../../../../../../../core/src/core/logger.service';
+import { SnackBarService } from '../../../../../../../core/src/shared/services/snackbar.service';
+import { AppState } from '../../../../../../../store/src/app-state';
+import { entityCatalog } from '../../../../../../../store/src/entity-catalog/entity-catalog';
+import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../../../../../store/src/types/request.types';
+import { kubeEntityCatalog } from '../../../kubernetes-entity-catalog';
+import { KubernetesPodExpandedStatusHelper } from '../../../services/kubernetes-expanded-state';
+import { KubernetesPod, KubeService } from '../../../store/kube.types';
+import { KubePaginationAction } from '../../../store/kubernetes.actions';
+import { HelmReleaseGraph, HelmReleasePod, HelmReleaseService } from '../../workload.types';
+import { workloadsEntityCatalog } from '../../workloads-entity-catalog';
+import { HelmReleaseHelperService } from '../tabs/helm-release-helper.service';
+
+
+enum SocketEventTypes {
+  PAUSE_TRUE = 20000,
+  PAUSE_FALSE = 20001,
+}
+
+interface SocketMessage {
+  type: SocketEventTypes
+}
+
+@Injectable()
+export class HelmReleaseSocketService {
+
+  private sub: Subscription;
+  private sendToSocket = new Subject<any>();
+
+  constructor(
+    private helmReleaseHelper: HelmReleaseHelperService,
+    private store: Store<AppState>,
+    private logService: LoggerService,
+    private snackbarService: SnackBarService,
+  ) {
+
+  }
+
+  public start() {
+    if (this.isStarted()) {
+      return;
+    }
+
+    const releaseRef = this.helmReleaseHelper.guidAsUrlFragment();
+    const host = window.location.host;
+    const protocol = window.location.protocol === 'https:' ? 'wss' : 'ws';
+    const streamUrl = (
+      `${protocol}://${host}/pp/v1/helm/releases/${releaseRef}/status`
+    );
+
+    const socket$ = makeWebSocketObservable(streamUrl).pipe(catchError(e => {
+      this.logService.error(
+        'Error while connecting to socket: ' + JSON.stringify(e)
+      );
+      return [];
+    }),
+      share(),
+    );
+
+    const messages = socket$.pipe(
+      switchMap((getResponses: GetWebSocketResponses) => {
+        return getResponses(this.sendToSocket);
+      }),
+      map((message: string) => message),
+      catchError(e => {
+        console.error('Workload WS error: ', e);
+        return [];
+      })
+    );
+
+    let prefix = '';
+    this.sub = messages.subscribe(jsonString => {
+      const messageObj = JSON.parse(jsonString);
+      if (messageObj) {
+        if (messageObj.kind === 'ReleasePrefix') {
+          prefix = messageObj.data;
+        } else if (messageObj.kind === 'Pods') {
+          const pods: KubernetesPod[] = messageObj.data || [];
+          const podsWithInfo: KubernetesPod[] = pods.map(pod => KubernetesPodExpandedStatusHelper.updatePodWithExpandedStatus(pod));
+          const releasePodsAction = kubeEntityCatalog.pod.actions.getInWorkload(
+            this.helmReleaseHelper.endpointGuid,
+            this.helmReleaseHelper.releaseTitle
+          );
+          this.populateList(releasePodsAction, podsWithInfo);
+        } else if (messageObj.kind === 'Graph') {
+          const graph: HelmReleaseGraph = messageObj.data;
+          graph.endpointId = this.helmReleaseHelper.endpointGuid;
+          graph.releaseTitle = this.helmReleaseHelper.releaseTitle;
+          const releaseGraphAction = workloadsEntityCatalog.graph.actions.get(graph.releaseTitle, graph.endpointId);
+          this.addResource(releaseGraphAction, graph);
+        } else if (messageObj.kind === 'Manifest' || messageObj.kind === 'Resources') {
+          // Store all of the services
+          const manifest = messageObj.data;
+          const svcs: KubeService[] = [];
+          // Store ALL resources for the release
+          manifest.forEach(resource => {
+            if (resource.kind === 'Service' && prefix) {
+              svcs.push(resource);
+            }
+          });
+          if (svcs.length > 0) {
+            const releaseServicesAction = kubeEntityCatalog.service.actions.getInWorkload(
+              this.helmReleaseHelper.releaseTitle,
+              this.helmReleaseHelper.endpointGuid,
+            );
+            this.populateList(releaseServicesAction, svcs);
+          }
+
+          // const resources = { ...manifest };
+          // kind === 'Resources' is an array, really they should go into a pagination section
+          messageObj.endpointId = this.helmReleaseHelper.endpointGuid;
+          messageObj.releaseTitle = this.helmReleaseHelper.releaseTitle;
+
+          const releaseResourceAction = workloadsEntityCatalog.resource.actions.get(
+            this.helmReleaseHelper.releaseTitle,
+            this.helmReleaseHelper.endpointGuid,
+          );
+          this.addResource(releaseResourceAction, messageObj);
+        } else if (messageObj.kind === 'ManifestErrors') {
+          if (messageObj.data) {
+            this.snackbarService.show('Errors were found when parsing this workload. Not all resources may be shown', 'Dismiss');
+          }
+        }
+      }
+    });
+  }
+
+  public stop() {
+    if (this.sub) {
+      this.sub.unsubscribe()
+      this.sub = null;
+    }
+  }
+
+  public enable(enable: boolean) {
+    if (enable) {
+      this.start()
+    } else {
+      this.stop()
+    }
+  }
+
+  public isStarted(): boolean {
+    return !!this.sub;
+  }
+
+  public pause(pause: boolean) {
+    if (pause != this.isPaused) {
+      const message: SocketMessage = {
+        type: pause ? SocketEventTypes.PAUSE_TRUE : SocketEventTypes.PAUSE_FALSE
+      }
+      this.sendToSocket.next(JSON.stringify(message));
+      this.isPaused = pause;
+    }
+  }
+
+  public isPaused = false;
+
+  ngOnDestroy() {
+    this.sub.unsubscribe();
+    this.snackbarService.hide();
+  }
+
+  private addResource(action: EntityRequestAction, data: any) {
+    const catalogEntity = entityCatalog.getEntity(action);
+    const response = {
+      entities: {
+        [catalogEntity.entityKey]: {
+          [action.guid]: data
+        }
+      },
+      result: [
+        action.guid
+      ]
+    };
+    const successWrapper = new WrapperRequestActionSuccess(response, action);
+    this.store.dispatch(successWrapper);
+  }
+
+  private populateList(action: KubePaginationAction, resources: any) {
+    const entity = entityCatalog.getEntity(action);
+    const newResources = {};
+    resources.forEach(resource => {
+      const newResource: HelmReleasePod | HelmReleaseService = {
+        endpointId: action.kubeGuid,
+        releaseTitle: this.helmReleaseHelper.releaseTitle,
+        ...resource
+      };
+      newResource.metadata.kubeId = action.kubeGuid;
+      // The service entity from manifest is missing this, but apply here to ensure any others are caught
+      newResource.metadata.namespace = this.helmReleaseHelper.namespace;
+      const entityId = action.entity[0].getId(resource);
+      newResources[entityId] = newResource;
+    });
+
+    const releasePods = {
+      entities: { [entity.entityKey]: newResources },
+      result: Object.keys(newResources)
+    };
+    const successWrapper = new WrapperRequestActionSuccess(releasePods, action, 'fetch', releasePods.result.length, 1);
+    this.store.dispatch(successWrapper);
+  }
+}