Use reverse proxy to redirect to containers

GitOrigin-RevId: 864979e9920a95e565bd74bba30aac7caba47ddc
CentraleSupelec · Dec 4, 2024 · a0c0890 · a0c0890
1 parent 6e87a12
commit a0c0890
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 2 deletions.
diff --git a/front/CHANGELOG.md b/front/CHANGELOG.md
@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+
+### Added
+- Redirect to containers through reverse proxy
+
 ## 2.24.6
 ### Fixed
 - Hide autoscaling column when deployment_enabled is false

diff --git a/front/src/app/app-config.ts b/front/src/app/app-config.ts
@@ -8,7 +8,7 @@ export interface IAppConfig {
     login_url: string;
     logout_url: string;
   };
-  deployment_enabled: boolean
+  deployment_enabled: boolean;
 }
 
 export const APP_CONFIG = new InjectionToken<IAppConfig>('config');

diff --git a/front/src/app/modules/display-container/display-container.module.ts b/front/src/app/modules/display-container/display-container.module.ts
@@ -12,6 +12,7 @@ import { FlexLayoutModule } from "@angular/flex-layout";
 import { RouterModule } from "@angular/router";
 import { SnackNotificationModule } from "../utils/snack-notification/snack-notification.module";
 import { DisplayCustomContainerPortComponent } from './display-custom-container-port/display-custom-container-port.component';
+import { MatTooltipModule } from '@angular/material/tooltip';
 
 
 
@@ -29,6 +30,7 @@ import { DisplayCustomContainerPortComponent } from './display-custom-container-
     MatInputModule,
     MatButtonModule,
     MatIconModule,
+    MatTooltipModule,
     FlexLayoutModule,
     RouterModule,
     SnackNotificationModule,

diff --git a/.../app/modules/display-container/http-connection-guide/http-connection-guide.component.html b/.../app/modules/display-container/http-connection-guide/http-connection-guide.component.html
@@ -3,7 +3,16 @@
     <span *ngIf="containerPort?.description !== 'default'">à "{{ containerPort?.description }}"</span>:&nbsp;
   </strong>
   <div fxLayout="row" fxLayoutAlign="start center" style="margin-left: 15px">
-    <a mat-raised-button color="primary" href="http://{{ ipAddress }}:{{ containerPort?.portMapTo }}" target="_blank" rel="noopener noreferrer" style="margin-top: 5px">
+    <a 
+      mat-raised-button
+      color="primary"
+      href="{{ getContainerUrl() }}"
+      target="_blank"
+      rel="noopener noreferrer"
+      style="margin-top: 5px"
+      matTooltip="http://{{ ipAddress }}:{{ containerPort?.portMapTo }}"
+      matTooltipShowDelay=1500
+    >
       Connexion à l'interface
     </a>
   </div>

diff --git a/...rc/app/modules/display-container/http-connection-guide/http-connection-guide.component.ts b/...rc/app/modules/display-container/http-connection-guide/http-connection-guide.component.ts
@@ -9,4 +9,8 @@ import { IContainerPort } from "../../shell/interfaces/container-port";
 export class HttpConnectionGuideComponent {
   @Input() containerPort: IContainerPort | null = null;
   @Input() ipAddress: string | undefined = '';
+
+  getContainerUrl(): string {
+    return this.containerPort?.hostname ? "https://" + this.containerPort?.hostname: "http://" + this.ipAddress + ':' + this.containerPort?.portMapTo
+  }
 }
diff --git a/front/src/app/modules/ports-form/interfaces/port.ts b/front/src/app/modules/ports-form/interfaces/port.ts
@@ -3,6 +3,7 @@ export interface IPort {
   mapPort: number;
   connectionType: ConnectionType;
   requiredToAccessContainer: boolean;
+  hostname: string;
 }
 
 export enum ConnectionType {