added support for user assigned identity

Azure-Samples · Nov 24, 2023 · 5c12f35 · 5c12f35
1 parent 7b2c81b
commit 5c12f35
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/...c/main/java/com/microsoft/openai/samples/rag/config/AzureAuthenticationConfiguration.java b/...c/main/java/com/microsoft/openai/samples/rag/config/AzureAuthenticationConfiguration.java
@@ -4,13 +4,18 @@
 import com.azure.core.credential.TokenCredential;
 import com.azure.identity.AzureCliCredentialBuilder;
 import com.azure.identity.ManagedIdentityCredentialBuilder;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
+import org.springframework.util.StringUtils;
 
 @Configuration
 public class AzureAuthenticationConfiguration {
 
+    @Value("${azure.identity.client-id}")
+    String clientId;
+
     @Profile("dev")
     @Bean
     public TokenCredential localTokenCredential() {
@@ -20,6 +25,10 @@ public TokenCredential localTokenCredential() {
     @Bean
     @Profile("default")
     public TokenCredential managedIdentityTokenCredential() {
-        return new ManagedIdentityCredentialBuilder().build();
+        if (this.clientId.equals("system-managed-identity"))
+            return new ManagedIdentityCredentialBuilder().build();
+        else
+            return new ManagedIdentityCredentialBuilder().clientId(this.clientId).build();
+
     }
 }
diff --git a/app/backend/src/main/resources/application.properties b/app/backend/src/main/resources/application.properties
@@ -15,4 +15,7 @@ storage-account.service=${AZURE_STORAGE_ACCOUNT}
 blob.container.name=${AZURE_STORAGE_CONTAINER:content}
 
 logging.level.com.microsoft.openai.samples.rag.ask.approaches.semantickernel=DEBUG
-server.error.include-message=always
+server.error.include-message=always
+
+# Support for User Assigned Managed identity
+azure.identity.client-id=${AZURE_CLIENT_ID:system-managed-identity}