From 24e5dc1640b31c00614d68705bc5a203196dc08b Mon Sep 17 00:00:00 2001
From: rajithaalurims <110048715+rajithaalurims@users.noreply.github.com>
Date: Wed, 3 Apr 2024 10:50:11 -0500
Subject: [PATCH] App names changed to avoid collission on HP side (#3795)

---
 build/jobs/e2e-tests.yml                      | 24 +++++-----
 build/jobs/run-export-tests.yml               | 48 +++++++++----------
 .../TestApplications.cs                       | 12 ++---
 testauthenvironment.json                      | 12 ++---
 4 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/build/jobs/e2e-tests.yml b/build/jobs/e2e-tests.yml
index b0fdfed9f1..89a651b9a4 100644
--- a/build/jobs/e2e-tests.yml
+++ b/build/jobs/e2e-tests.yml
@@ -125,15 +125,15 @@ steps:
       'app_nativeClient_secret': $(app_nativeClient_secret)
       'app_wrongAudienceClient_id': $(app_wrongAudienceClient_id)
       'app_wrongAudienceClient_secret': $(app_wrongAudienceClient_secret)
-      'app_globalAdminUser_id': $(app_globalAdminUser_id)
-      'app_globalAdminUser_secret': $(app_globalAdminUser_secret)
-      'app_globalConverterUser_id': $(app_globalConverterUser_id)
-      'app_globalConverterUser_secret': $(app_globalConverterUser_secret)
-      'app_globalExporterUser_id': $(app_globalExporterUser_id)
-      'app_globalExporterUser_secret': $(app_globalExporterUser_secret)
-      'app_globalImporterUser_id': $(app_globalImporterUser_id)
-      'app_globalImporterUser_secret': $(app_globalImporterUser_secret)
-      'app_globalReaderUser_id': $(app_globalReaderUser_id)
-      'app_globalReaderUser_secret': $(app_globalReaderUser_secret)
-      'app_globalWriterUser_id': $(app_globalWriterUser_id)
-      'app_globalWriterUser_secret': $(app_globalWriterUser_secret)
+      'app_globalAdminUserApp_id': $(app_globalAdminUserApp_id)
+      'app_globalAdminUserApp_secret': $(app_globalAdminUserApp_secret)
+      'app_globalConverterUserApp_id': $(app_globalConverterUserApp_id)
+      'app_globalConverterUserApp_secret': $(app_globalConverterUserApp_secret)
+      'app_globalExporterUserApp_id': $(app_globalExporterUserApp_id)
+      'app_globalExporterUserApp_secret': $(app_globalExporterUserApp_secret)
+      'app_globalImporterUserApp_id': $(app_globalImporterUserApp_id)
+      'app_globalImporterUserApp_secret': $(app_globalImporterUserApp_secret)
+      'app_globalReaderUserApp_id': $(app_globalReaderUserApp_id)
+      'app_globalReaderUserApp_secret': $(app_globalReaderUserApp_secret)
+      'app_globalWriterUserApp_id': $(app_globalWriterUserApp_id)
+      'app_globalWriterUserApp_secret': $(app_globalWriterUserApp_secret)
diff --git a/build/jobs/run-export-tests.yml b/build/jobs/run-export-tests.yml
index cd6bbadff9..871aa4ef0a 100644
--- a/build/jobs/run-export-tests.yml
+++ b/build/jobs/run-export-tests.yml
@@ -95,18 +95,18 @@ jobs:
       'app_nativeClient_secret': $(app_nativeClient_secret)
       'app_wrongAudienceClient_id': $(app_wrongAudienceClient_id)
       'app_wrongAudienceClient_secret': $(app_wrongAudienceClient_secret)
-      'app_globalAdminUser_id': $(app_globalAdminUser_id)
-      'app_globalAdminUser_secret': $(app_globalAdminUser_secret)
-      'app_globalConverterUser_id': $(app_globalConverterUser_id)
-      'app_globalConverterUser_secret': $(app_globalConverterUser_secret)
-      'app_globalExporterUser_id': $(app_globalExporterUser_id)
-      'app_globalExporterUser_secret': $(app_globalExporterUser_secret)
-      'app_globalImporterUser_id': $(app_globalImporterUser_id)
-      'app_globalImporterUser_secret': $(app_globalImporterUser_secret)
-      'app_globalReaderUser_id': $(app_globalReaderUser_id)
-      'app_globalReaderUser_secret': $(app_globalReaderUser_secret)
-      'app_globalWriterUser_id': $(app_globalWriterUser_id)
-      'app_globalWriterUser_secret': $(app_globalWriterUser_secret)    
+      'app_globalAdminUserApp_id': $(app_globalAdminUserApp_id)
+      'app_globalAdminUserApp_secret': $(app_globalAdminUserApp_secret)
+      'app_globalConverterUserApp_id': $(app_globalConverterUserApp_id)
+      'app_globalConverterUserApp_secret': $(app_globalConverterUserApp_secret)
+      'app_globalExporterUserApp_id': $(app_globalExporterUserApp_id)
+      'app_globalExporterUserApp_secret': $(app_globalExporterUserApp_secret)
+      'app_globalImporterUserApp_id': $(app_globalImporterUserApp_id)
+      'app_globalImporterUserApp_secret': $(app_globalImporterUserApp_secret)
+      'app_globalReaderUserApp_id': $(app_globalReaderUserApp_id)
+      'app_globalReaderUserApp_secret': $(app_globalReaderUserApp_secret)
+      'app_globalWriterUserApp_id': $(app_globalWriterUserApp_id)
+      'app_globalWriterUserApp_secret': $(app_globalWriterUserApp_secret)    
 
 - job: 'sqlE2eTests'
   dependsOn: []
@@ -198,16 +198,16 @@ jobs:
       'app_nativeClient_secret': $(app_nativeClient_secret)
       'app_wrongAudienceClient_id': $(app_wrongAudienceClient_id)
       'app_wrongAudienceClient_secret': $(app_wrongAudienceClient_secret)
-      'app_globalAdminUser_id': $(app_globalAdminUser_id)
-      'app_globalAdminUser_secret': $(app_globalAdminUser_secret)
-      'app_globalConverterUser_id': $(app_globalConverterUser_id)
-      'app_globalConverterUser_secret': $(app_globalConverterUser_secret)
-      'app_globalExporterUser_id': $(app_globalExporterUser_id)
-      'app_globalExporterUser_secret': $(app_globalExporterUser_secret)
-      'app_globalImporterUser_id': $(app_globalImporterUser_id)
-      'app_globalImporterUser_secret': $(app_globalImporterUser_secret)
-      'app_globalReaderUser_id': $(app_globalReaderUser_id)
-      'app_globalReaderUser_secret': $(app_globalReaderUser_secret)
-      'app_globalWriterUser_id': $(app_globalWriterUser_id)
-      'app_globalWriterUser_secret': $(app_globalWriterUser_secret)
+      'app_globalAdminUserApp_id': $(app_globalAdminUserApp_id)
+      'app_globalAdminUserApp_secret': $(app_globalAdminUserApp_secret)
+      'app_globalConverterUserApp_id': $(app_globalConverterUserApp_id)
+      'app_globalConverterUserApp_secret': $(app_globalConverterUserApp_secret)
+      'app_globalExporterUserApp_id': $(app_globalExporterUserApp_id)
+      'app_globalExporterUserApp_secret': $(app_globalExporterUserApp_secret)
+      'app_globalImporterUserApp_id': $(app_globalImporterUserApp_id)
+      'app_globalImporterUserApp_secret': $(app_globalImporterUserApp_secret)
+      'app_globalReaderUserApp_id': $(app_globalReaderUserApp_id)
+      'app_globalReaderUserApp_secret': $(app_globalReaderUserApp_secret)
+      'app_globalWriterUserApp_id': $(app_globalWriterUserApp_id)
+      'app_globalWriterUserApp_secret': $(app_globalWriterUserApp_secret)
       
diff --git a/test/Microsoft.Health.Fhir.Shared.Tests.E2E.Common/TestApplications.cs b/test/Microsoft.Health.Fhir.Shared.Tests.E2E.Common/TestApplications.cs
index 571c4ccc9f..f5f1aaedd2 100644
--- a/test/Microsoft.Health.Fhir.Shared.Tests.E2E.Common/TestApplications.cs
+++ b/test/Microsoft.Health.Fhir.Shared.Tests.E2E.Common/TestApplications.cs
@@ -14,13 +14,13 @@ namespace Microsoft.Health.Fhir.Tests.E2E.Common
 
     public static class TestApplications
     {
-        public static TestApplication AdminUser { get; } = new TestApplication("globalAdminUser");
+        public static TestApplication AdminUser { get; } = new TestApplication("globalAdminUserApp");
 
-        public static TestApplication BulkImportUser { get; } = new TestApplication("globalImporterUser");
+        public static TestApplication BulkImportUser { get; } = new TestApplication("globalImporterUserApp");
 
-        public static TestApplication ConvertDataUser { get; } = new TestApplication("globalConverterUser");
+        public static TestApplication ConvertDataUser { get; } = new TestApplication("globalConverterUserApp");
 
-        public static TestApplication ExportUser { get; } = new TestApplication("globalExporterUser");
+        public static TestApplication ExportUser { get; } = new TestApplication("globalExporterUserApp");
 
         public static TestApplication GlobalAdminServicePrincipal { get; } = new TestApplication("globalAdminServicePrincipal");
 
@@ -28,9 +28,9 @@ public static class TestApplications
 
         public static TestApplication NativeClient { get; } = new TestApplication("nativeClient");
 
-        public static TestApplication ReadOnlyUser { get; } = new TestApplication("globalReaderUser");
+        public static TestApplication ReadOnlyUser { get; } = new TestApplication("globalReaderUserApp");
 
-        public static TestApplication ReadWriteUser { get; } = new TestApplication("globalWriterUser");
+        public static TestApplication ReadWriteUser { get; } = new TestApplication("globalWriterUserApp");
 
         public static TestApplication SmartUserClient { get; } = new TestApplication("smartUserClient");
 
diff --git a/testauthenvironment.json b/testauthenvironment.json
index ac0cb13388..70a9ed8e44 100644
--- a/testauthenvironment.json
+++ b/testauthenvironment.json
@@ -3,37 +3,37 @@
     ],
     "clientApplications": [
         {
-            "id": "globalReaderUser",
+            "id": "globalReaderUserApp",
             "roles": [
                 "globalReader"
             ]
         },
         {
-            "id": "globalWriterUser",
+            "id": "globalWriterUserApp",
             "roles": [
                 "globalWriter"
             ]
         },
         {
-            "id": "globalExporterUser",
+            "id": "globalExporterUserApp",
             "roles": [
                 "globalExporter"
             ]
         },
         {
-            "id": "globalConverterUser",
+            "id": "globalConverterUserApp",
             "roles": [
                 "globalConverter"
             ]
         },
         {
-            "id": "globalImporterUser",
+            "id": "globalImporterUserApp",
             "roles": [
                 "globalImporter"
             ]
         },
         {
-            "id": "globalAdminUser",
+            "id": "globalAdminUserApp",
             "roles": [
                 "globalAdmin"
             ]