updated app_env

Priyanka-Microsoft · Priyanka-Microsoft · commit 737e4cf100c5 · 2025-07-31T00:40:51.000+05:30
diff --git a/App/backend-api/Microsoft.GS.DPS.Host/AppConfiguration/AppConfiguration.cs b/App/backend-api/Microsoft.GS.DPS.Host/AppConfiguration/AppConfiguration.cs
@@ -12,12 +12,13 @@ public static void Config(IHostApplicationBuilder builder)
             //Read ServiceConfiguration files - appsettings.json / appsettings.Development.json
             //builder.Configuration.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true);
             //builder.Configuration.AddJsonFile($"appsettings.{builder.Environment.EnvironmentName}.json", optional: true, reloadOnChange: true);
-
+            var servicesConfig = builder.Configuration.GetSection("Application:Services").Get<Services>();
+            string appEnv = servicesConfig?.APP_ENV;
 
             //Read AppConfiguration with managed Identity
             builder.Configuration.AddAzureAppConfiguration(options =>
             {
-                options.Connect(new Uri(builder.Configuration["ConnectionStrings:AppConfig"]), AzureCredentialHelper.GetAzureCredential());
+                options.Connect(new Uri(builder.Configuration["ConnectionStrings:AppConfig"]), AzureCredentialHelper.GetAzureCredential(appEnv));
             });
 
             //Read ServiceConfiguration
diff --git a/App/backend-api/Microsoft.GS.DPS.Host/AppConfiguration/Services.cs b/App/backend-api/Microsoft.GS.DPS.Host/AppConfiguration/Services.cs
@@ -6,6 +6,7 @@ public class Services
         public KernelMemoryConfig KernelMemory { get; set; }
         public PersistentStorageConfig PersistentStorage { get; set; }
         public AzureAISearchConfig AzureAISearch { get; set; }
+        public string APP_ENV { get; set; }
 
         public class AzureAISearchConfig
         {
diff --git a/App/backend-api/Microsoft.GS.DPS.Host/Helpers/azure_credential_utils.cs b/App/backend-api/Microsoft.GS.DPS.Host/Helpers/azure_credential_utils.cs
@@ -7,11 +7,12 @@ namespace Microsoft.GS.DPSHost.Helpers
 {
     public static class AzureCredentialHelper
     {
-        public static TokenCredential GetAzureCredential(string clientId = null)
+        public static TokenCredential GetAzureCredential(string appEnv = "prod", string clientId = null)
         {
-            var env = Environment.GetEnvironmentVariable("APP_ENV") ?? "prod";
+            //var env = Environment.GetEnvironmentVariable("APP_ENV") ?? "prod";
+            Console.WriteLine($"Current APP_ENV: {appEnv}");
 
-            if (string.Equals(env, "dev", StringComparison.OrdinalIgnoreCase))
+            if (string.Equals(appEnv, "dev", StringComparison.OrdinalIgnoreCase))
             {
                 return new DefaultAzureCredential(); // For local development
             }
@@ -23,9 +24,9 @@ public static TokenCredential GetAzureCredential(string clientId = null)
             }
         }
 
-        public static Task<TokenCredential> GetAzureCredentialAsync(string clientId = null)
+        public static Task<TokenCredential> GetAzureCredentialAsync(string appEnv = "prod", string clientId = null)
         {
-            return Task.FromResult(GetAzureCredential(clientId));
+            return Task.FromResult(GetAzureCredential(appEnv, clientId));
         }
     }
 }
diff --git a/App/backend-api/Microsoft.GS.DPS.Host/appsettings.json b/App/backend-api/Microsoft.GS.DPS.Host/appsettings.json
@@ -28,15 +28,16 @@
       }
     },
     "Services": {
-      "CognitiveService": {
-        "DocumentIntelligence": {
-          "Endpoint": "",
-          "APIKey": ""
-        }
-      },
-      "KernelMemory": {
-        "Endpoint": ""
-      }
+        "CognitiveService": {
+            "DocumentIntelligence": {
+                "Endpoint": "",
+                "APIKey": ""
+            }
+        },
+        "KernelMemory": {
+            "Endpoint": ""
+        },
+        "APP_ENV": "prod"
     }
   }
 }
diff --git a/App/kernel-memory/Helpers/azure_credential_utils.cs b/App/kernel-memory/Helpers/azure_credential_utils.cs
@@ -1,16 +1,17 @@
-﻿using System;
+﻿// Copyright (c) Microsoft. All rights reserved.
+using System;
 using System.Threading.Tasks;
 using Azure.Core;
 using Azure.Identity;
 namespace Helpers;
 
-public static class azure_credential_utils
+public class azure_credential_utils
 {
     public static TokenCredential GetAzureCredential(string clientId = null)
     {
-        var env = Environment.GetEnvironmentVariable("APP_ENV") ?? "prod";
+        var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";
 
-        if (string.Equals(env, "dev", StringComparison.OrdinalIgnoreCase))
+        if (string.Equals(env, "Development", StringComparison.OrdinalIgnoreCase))
         {
             return new DefaultAzureCredential(); // For local development
         }
diff --git a/App/kernel-memory/infra/modules/container-app.bicep b/App/kernel-memory/infra/modules/container-app.bicep
@@ -172,6 +172,10 @@ resource kmService 'Microsoft.App/containerApps@2023-05-01' = {
               name: 'KernelMemory__Services__AzureAIDocIntel__Endpoint'
               value: AzureAIDocIntel_Endpoint
             }
+            {
+              name: 'APP_ENV'
+              value: 'prod'
+            }
           ]
         }
       ]
diff --git a/App/kernel-memory/service/Service/appsettings.json b/App/kernel-memory/service/Service/appsettings.json
@@ -465,7 +465,8 @@
         "MemoryTableName": "KMMemories",
         "EmbeddingsTableName": "KMEmbeddings",
         "TagsTableName": "KMMemoriesTags"
-      }
+      },
+      "APP_ENV": "prod"
     }
   }
 }
diff --git a/Deployment/appconfig/aiservice/appconfig.jsonl b/Deployment/appconfig/aiservice/appconfig.jsonl
@@ -18,6 +18,7 @@
 	"Application:Services:PersistentStorage:CosmosMongo:ConnectionString": "{cosmosmongo-connection-string}",
 	"Application:Services:AzureAISearch:APIKey" : "{azureaisearch-apikey}",
 	"Application:Services:AzureAISearch:Endpoint" : "{azureaisearch-endpoint}",
+	"Application:Services:APP_ENV": "prod",
 	"KernelMemory:Services:AzureAIDocIntel:APIKey": "{azureaidocintel-apikey}",
 	"KernelMemory:Services:AzureAIDocIntel:Endpoint": "{azureaidocintel-endpoint}",
 	"KernelMemory:Services:AzureAISearch:APIKey": "{azureaisearch-apikey}",
@@ -32,5 +33,6 @@
 	"KernelMemory:Services:AzureOpenAIText:Deployment": "{azureopenaitext-deployment}",
 	"KernelMemory:Services:AzureOpenAIText:Endpoint": "{azureopenaitext-endpoint}",
 	"KernelMemory:Services:AzureQueues:Account": "{azurequeues-account}",
-	"KernelMemory:Services:AzureQueues:ConnectionString": "{azurequeues-connection-string}"
+	"KernelMemory:Services:AzureQueues:ConnectionString": "{azurequeues-connection-string}",
+	"KernelMemory:Services:APP_ENV": "prod"
 }

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ public class Services`
`6`	`6`	`public KernelMemoryConfig KernelMemory { get; set; }`
`7`	`7`	`public PersistentStorageConfig PersistentStorage { get; set; }`
`8`	`8`	`public AzureAISearchConfig AzureAISearch { get; set; }`
	`9`	`+ public string APP_ENV { get; set; }`
`9`	`10`
`10`	`11`	`public class AzureAISearchConfig`
`11`	`12`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,12 @@ namespace Microsoft.GS.DPSHost.Helpers`
`7`	`7`	`{`
`8`	`8`	`public static class AzureCredentialHelper`
`9`	`9`	`{`
`10`		`- public static TokenCredential GetAzureCredential(string clientId = null)`
	`10`	`+ public static TokenCredential GetAzureCredential(string appEnv = "prod", string clientId = null)`
`11`	`11`	`{`
`12`		`- var env = Environment.GetEnvironmentVariable("APP_ENV") ?? "prod";`
	`12`	`+ //var env = Environment.GetEnvironmentVariable("APP_ENV") ?? "prod";`
	`13`	`+ Console.WriteLine($"Current APP_ENV: {appEnv}");`
`13`	`14`
`14`		`- if (string.Equals(env, "dev", StringComparison.OrdinalIgnoreCase))`
	`15`	`+ if (string.Equals(appEnv, "dev", StringComparison.OrdinalIgnoreCase))`
`15`	`16`	`{`
`16`	`17`	`return new DefaultAzureCredential(); // For local development`
`17`	`18`	`}`
`@@ -23,9 +24,9 @@ public static TokenCredential GetAzureCredential(string clientId = null)`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`
`26`		`- public static Task<TokenCredential> GetAzureCredentialAsync(string clientId = null)`
	`27`	`+ public static Task<TokenCredential> GetAzureCredentialAsync(string appEnv = "prod", string clientId = null)`
`27`	`28`	`{`
`28`		`- return Task.FromResult(GetAzureCredential(clientId));`
	`29`	`+ return Task.FromResult(GetAzureCredential(appEnv, clientId));`
`29`	`30`	`}`
`30`	`31`	`}`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,17 @@`
`1`		`-using System;`
	`1`	`+// Copyright (c) Microsoft. All rights reserved.`
	`2`	`+using System;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`	`using Azure.Core;`
`4`	`5`	`using Azure.Identity;`
`5`	`6`	`namespace Helpers;`
`6`	`7`
`7`		`-public static class azure_credential_utils`
	`8`	`+public class azure_credential_utils`
`8`	`9`	`{`
`9`	`10`	`public static TokenCredential GetAzureCredential(string clientId = null)`
`10`	`11`	`{`
`11`		`- var env = Environment.GetEnvironmentVariable("APP_ENV") ?? "prod";`
	`12`	`+ var env = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Production";`
`12`	`13`
`13`		`- if (string.Equals(env, "dev", StringComparison.OrdinalIgnoreCase))`
	`14`	`+ if (string.Equals(env, "Development", StringComparison.OrdinalIgnoreCase))`
`14`	`15`	`{`
`15`	`16`	`return new DefaultAzureCredential(); // For local development`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,10 @@ resource kmService 'Microsoft.App/containerApps@2023-05-01' = {`
`172`	`172`	`name: 'KernelMemory__Services__AzureAIDocIntel__Endpoint'`
`173`	`173`	`value: AzureAIDocIntel_Endpoint`
`174`	`174`	`}`
	`175`	`+ {`
	`176`	`+ name: 'APP_ENV'`
	`177`	`+ value: 'prod'`
	`178`	`+ }`
`175`	`179`	`]`
`176`	`180`	`}`
`177`	`181`	`]`
Original file line number	Diff line number	Diff line change
`@@ -465,7 +465,8 @@`
`465`	`465`	`"MemoryTableName": "KMMemories",`
`466`	`466`	`"EmbeddingsTableName": "KMEmbeddings",`
`467`	`467`	`"TagsTableName": "KMMemoriesTags"`
`468`		`- }`
	`468`	`+ },`
	`469`	`+ "APP_ENV": "prod"`
`469`	`470`	`}`
`470`	`471`	`}`
`471`	`472`	`}`