Skip to content

Commit 5c12f35

Browse files
committed
added support for user assigned identity
1 parent 7b2c81b commit 5c12f35

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

app/backend/src/main/java/com/microsoft/openai/samples/rag/config/AzureAuthenticationConfiguration.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@
44
import com.azure.core.credential.TokenCredential;
55
import com.azure.identity.AzureCliCredentialBuilder;
66
import com.azure.identity.ManagedIdentityCredentialBuilder;
7+
import org.springframework.beans.factory.annotation.Value;
78
import org.springframework.context.annotation.Bean;
89
import org.springframework.context.annotation.Configuration;
910
import org.springframework.context.annotation.Profile;
11+
import org.springframework.util.StringUtils;
1012

1113
@Configuration
1214
public class AzureAuthenticationConfiguration {
1315

16+
@Value("${azure.identity.client-id}")
17+
String clientId;
18+
1419
@Profile("dev")
1520
@Bean
1621
public TokenCredential localTokenCredential() {
@@ -20,6 +25,10 @@ public TokenCredential localTokenCredential() {
2025
@Bean
2126
@Profile("default")
2227
public TokenCredential managedIdentityTokenCredential() {
23-
return new ManagedIdentityCredentialBuilder().build();
28+
if (this.clientId.equals("system-managed-identity"))
29+
return new ManagedIdentityCredentialBuilder().build();
30+
else
31+
return new ManagedIdentityCredentialBuilder().clientId(this.clientId).build();
32+
2433
}
2534
}

app/backend/src/main/resources/application.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@ storage-account.service=${AZURE_STORAGE_ACCOUNT}
1515
blob.container.name=${AZURE_STORAGE_CONTAINER:content}
1616

1717
logging.level.com.microsoft.openai.samples.rag.ask.approaches.semantickernel=DEBUG
18-
server.error.include-message=always
18+
server.error.include-message=always
19+
20+
# Support for User Assigned Managed identity
21+
azure.identity.client-id=${AZURE_CLIENT_ID:system-managed-identity}

0 commit comments

Comments
 (0)