Skip to content

AAD Auth: Adds an options to override AAD audience scope through environment variable. #46237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aavasthy merged 16 commits into from
Aug 4, 2025
Merged

AAD Auth: Adds an options to override AAD audience scope through environment variable. #46237

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
4bd9061
Adds AAD scope override feature.
aavasthy Jul 31, 2025
87847d3
Merge branch 'main' into update_aad_scope
aavasthy Jul 31, 2025
34b339f
Update changelog and code cleanup.
aavasthy Jul 31, 2025
14542af
Update changelog and code cleanup.
aavasthy Jul 31, 2025
83a76e0
Update static method usage.
aavasthy Jul 31, 2025
6905867
Merge branch 'main' into update_aad_scope
aavasthy Jul 31, 2025
4f2f4d8
fix build errors with static class.
aavasthy Aug 1, 2025
b8fa0d5
Merge branch 'main' into update_aad_scope
aavasthy Aug 1, 2025
e4b97f6
Update test name.
aavasthy Aug 1, 2025
4e719bb
Merge branch 'main' into update_aad_scope
aavasthy Aug 1, 2025
76626d8
Merge branch 'main' into update_aad_scope
aavasthy Aug 2, 2025
b64fcb6
Update imports
aavasthy Aug 4, 2025
7e847a5
Merge branch 'main' into update_aad_scope
aavasthy Aug 4, 2025
cddcee1
Merge branch 'main' into update_aad_scope
aavasthy Aug 4, 2025
6c145fa
Update environment variable property.
aavasthy Aug 4, 2025
f2a80fe
Update environment variable property.
aavasthy Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Update environment variable property.
  • Loading branch information
@aavasthy
aavasthy committed Aug 4, 2025
commit f2a80feaca90659b3ac2ad22e1c61e806be69104
24 changes: 9 additions & 15 deletions sdk/cosmos/azure-cosmos/src/main/java/com/azure/cosmos/implementation/Configs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class Configs {
private static final String ADDRESS_REFRESH_RESPONSE_TIMEOUT_IN_SECONDS = "COSMOS.ADDRESS_REFRESH_RESPONSE_TIMEOUT_IN_SECONDS";

private static final String AAD_SCOPE_OVERRIDE = "COSMOS.AAD_SCOPE_OVERRIDE";
private static final String AAD_SCOPE_OVERRIDE_VARIABLE = "AZURE_COSMOS_AAD_SCOPE_OVERRIDE";
private static final String AAD_SCOPE_OVERRIDE_VARIABLE = "COSMOS_AAD_SCOPE_OVERRIDE";
private static final String DEFAULT_AAD_SCOPE_OVERRIDE = "";

public static final String NON_IDEMPOTENT_WRITE_RETRY_POLICY = "COSMOS.WRITE_RETRY_POLICY";
Expand Down Expand Up @@ -460,20 +460,6 @@ public int getGlobalEndpointManagerMaxInitializationTimeInSeconds() {
return getJVMConfigAsInt(GLOBAL_ENDPOINT_MANAGER_INITIALIZATION_TIME_IN_SECONDS, DEFAULT_GLOBAL_ENDPOINT_MANAGER_INITIALIZATION_TIME_IN_SECONDS);
}

public static String getAadScopeOverride() {
String valueFromSystemProperty = System.getProperty(AAD_SCOPE_OVERRIDE);
if (valueFromSystemProperty != null && !valueFromSystemProperty.isEmpty()) {
return valueFromSystemProperty;
}

String valueFromEnvVariable = System.getenv(AAD_SCOPE_OVERRIDE_VARIABLE);
if (valueFromEnvVariable != null && !valueFromEnvVariable.isEmpty()) {
return valueFromEnvVariable;
}

return DEFAULT_AAD_SCOPE_OVERRIDE;
}

public URI getThinclientEndpoint() {
String valueFromSystemProperty = System.getProperty(THINCLIENT_ENDPOINT);
if (valueFromSystemProperty != null && !valueFromSystemProperty.isEmpty()) {
Expand Down Expand Up @@ -1216,6 +1202,14 @@ public static boolean isReadAvailabilityStrategyEnabledWithPpaf() {
return Boolean.parseBoolean(isReadAvailabilityStrategyEnabledWithPpaf);
}

public static String getAadScopeOverride() {
return System.getProperty(
AAD_SCOPE_OVERRIDE,
firstNonNull(
emptyToNull(System.getenv().get(AAD_SCOPE_OVERRIDE_VARIABLE)),
DEFAULT_AAD_SCOPE_OVERRIDE));
}

public static int getWarnLevelLoggingThresholdForPpaf() {
String warnLevelLoggingThresholdForPpaf = System.getProperty(
WARN_LEVEL_LOGGING_THRESHOLD_FOR_PPAF,
Expand Down