#845

InseeFrLab · Aug 20, 2024 · fab1518 · fab1518
1 parent 32487de
commit fab1518
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 31 deletions.
diff --git a/web/src/core/adapters/onyxiaApi/default/ApiTypes.ts b/web/src/core/adapters/onyxiaApi/default/ApiTypes.ts
@@ -39,14 +39,14 @@ export type ApiTypes = {
                     tolerations?: unknown[];
                     nodeSelector?: Record<string, unknown>;
                     startupProbe:
-                        | {
-                              failureThreshold?: number;
-                              initialDelaySeconds?: number;
-                              periodSeconds?: number;
-                              successThreshold?: number;
-                              timeoutSeconds?: number;
-                          }
-                        | undefined;
+                    | {
+                        failureThreshold?: number;
+                        initialDelaySeconds?: number;
+                        periodSeconds?: number;
+                        successThreshold?: number;
+                        timeoutSeconds?: number;
+                    }
+                    | undefined;
                     sliders?: Record<
                         string,
                         {
@@ -77,6 +77,10 @@ export type ApiTypes = {
                     };
                     URL?: string;
                 };
+                openshiftSCC?: {
+                    scc: string;
+                    enabled: boolean;
+                };
             };
             data?: {
                 S3?: {
@@ -88,11 +92,11 @@ export type ApiTypes = {
                         URL?: string;
                         durationSeconds?: number;
                         role:
-                            | {
-                                  roleARN: string;
-                                  roleSessionName: string;
-                              }
-                            | undefined;
+                        | {
+                            roleARN: string;
+                            roleSessionName: string;
+                        }
+                        | undefined;
                         oidcConfiguration?: {
                             issuerURI?: string;
                             clientID: string;
@@ -101,17 +105,17 @@ export type ApiTypes = {
 
                     /** Ok to be undefined only if sts is undefined */
                     workingDirectory?:
-                        | {
-                              bucketMode: "shared";
-                              bucketName: string;
-                              prefix: string;
-                              prefixGroup: string;
-                          }
-                        | {
-                              bucketMode: "multi";
-                              bucketNamePrefix: string;
-                              bucketNamePrefixGroup: string;
-                          };
+                    | {
+                        bucketMode: "shared";
+                        bucketName: string;
+                        prefix: string;
+                        prefixGroup: string;
+                    }
+                    | {
+                        bucketMode: "multi";
+                        bucketNamePrefix: string;
+                        bucketNamePrefixGroup: string;
+                    };
                 };
             };
             vault?: {
@@ -140,10 +144,6 @@ export type ApiTypes = {
                 cacerts: string;
                 pathToCaBundle: string;
             };
-            openshiftSCC?: {
-                scc: string;
-                enabled: boolean;
-            };
         }[];
         oidcConfiguration?: {
             issuerURI: string;

diff --git a/web/src/core/adapters/onyxiaApi/default/default.ts b/web/src/core/adapters/onyxiaApi/default/default.ts
@@ -257,11 +257,11 @@ export function createOnyxiaApi(params: {
                                     ?.certManagerClusterIssuer
                         },
                         "openshiftSCC":
-                            apiRegion.openshiftSCC === undefined
+                            apiRegion.services.openshiftSCC === undefined
                                 ? undefined
                                 : {
-                                      "scc": apiRegion.openshiftSCC.scc,
-                                      "enabled": apiRegion.openshiftSCC.enabled
+                                      "scc": apiRegion.services.openshiftSCC.scc,
+                                      "enabled": apiRegion.services.openshiftSCC.enabled
                                   }
                     })
                 );