From f24c78da46e1d9cc5a43a91b6021fe28d6c86898 Mon Sep 17 00:00:00 2001 From: JonasABach Date: Tue, 19 Nov 2024 08:09:10 +0100 Subject: [PATCH 1/3] update for CI --- backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs | 1 + frontend/src/environmentVariables.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs b/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs index 195e8e6f4..fd51e25a9 100644 --- a/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs +++ b/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs @@ -21,6 +21,7 @@ public static void AddDcdCorsPolicy(this IServiceCollection services) "https://pro-s-portal-fqa.azurewebsites.net", "https://pro-s-portal-fprd.azurewebsites.net", "https://fusion-s-portal-ci.azurewebsites.net", + "https://fusion.ci.fusion-dev.net", "https://fusion-s-portal-fqa.azurewebsites.net", "https://fusion-s-portal-fprd.azurewebsites.net", "https://pr-3422.fusion-dev.net", diff --git a/frontend/src/environmentVariables.ts b/frontend/src/environmentVariables.ts index 82830ace6..caa7dcf48 100644 --- a/frontend/src/environmentVariables.ts +++ b/frontend/src/environmentVariables.ts @@ -13,6 +13,9 @@ const getEnv = (): string => { case "fusion-s-portal-ci.azurewebsites.net": return "CI" + case "fusion.ci.fusion-dev.net": + return "CI" + case "fusion.equinor.com": case "fusion-s-portal-fprd.azurewebsites.net": return "FPRD" From 5545733eb2431bc9c8debdd1b12e99ae51e92452 Mon Sep 17 00:00:00 2001 From: JonasABach Date: Tue, 19 Nov 2024 09:04:59 +0100 Subject: [PATCH 2/3] qa update --- backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs | 1 + frontend/src/environmentVariables.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs b/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs index fd51e25a9..dc3806a98 100644 --- a/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs +++ b/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs @@ -23,6 +23,7 @@ public static void AddDcdCorsPolicy(this IServiceCollection services) "https://fusion-s-portal-ci.azurewebsites.net", "https://fusion.ci.fusion-dev.net", "https://fusion-s-portal-fqa.azurewebsites.net", + "https://fusion.fqa.fusion-dev.net/", "https://fusion-s-portal-fprd.azurewebsites.net", "https://pr-3422.fusion-dev.net", "https://pr-*.fusion-dev.net" diff --git a/frontend/src/environmentVariables.ts b/frontend/src/environmentVariables.ts index caa7dcf48..cfa6a8e4f 100644 --- a/frontend/src/environmentVariables.ts +++ b/frontend/src/environmentVariables.ts @@ -10,6 +10,9 @@ const getEnv = (): string => { case "fusion-s-portal-fqa.azurewebsites.net": return "QA" + case "fusion.fqa.fusion-dev.net/": + return "QA" + case "fusion-s-portal-ci.azurewebsites.net": return "CI" From 414096d5d23c6204971cfcd350a5b5ff04cf4606 Mon Sep 17 00:00:00 2001 From: JonasABach Date: Tue, 19 Nov 2024 09:07:35 +0100 Subject: [PATCH 3/3] a --- .../api/StartupConfiguration/DcdCorsPolicyConfiguration.cs | 2 +- frontend/src/environmentVariables.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs b/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs index dc3806a98..67f5d074c 100644 --- a/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs +++ b/backend/api/StartupConfiguration/DcdCorsPolicyConfiguration.cs @@ -23,7 +23,7 @@ public static void AddDcdCorsPolicy(this IServiceCollection services) "https://fusion-s-portal-ci.azurewebsites.net", "https://fusion.ci.fusion-dev.net", "https://fusion-s-portal-fqa.azurewebsites.net", - "https://fusion.fqa.fusion-dev.net/", + "https://fusion.fqa.fusion-dev.net", "https://fusion-s-portal-fprd.azurewebsites.net", "https://pr-3422.fusion-dev.net", "https://pr-*.fusion-dev.net" diff --git a/frontend/src/environmentVariables.ts b/frontend/src/environmentVariables.ts index cfa6a8e4f..6f9075f6b 100644 --- a/frontend/src/environmentVariables.ts +++ b/frontend/src/environmentVariables.ts @@ -9,13 +9,11 @@ const getEnv = (): string => { switch (location.hostname) { case "fusion-s-portal-fqa.azurewebsites.net": return "QA" - - case "fusion.fqa.fusion-dev.net/": + case "fusion.fqa.fusion-dev.net": return "QA" case "fusion-s-portal-ci.azurewebsites.net": return "CI" - case "fusion.ci.fusion-dev.net": return "CI"