From 1f1cbd58b0dc314dafb5381b21273fe1519f0e01 Mon Sep 17 00:00:00 2001 From: Luyunmt <2534523917@qq.com> Date: Mon, 23 Mar 2020 10:36:23 +0800 Subject: [PATCH 1/5] add env authorityhost --- .../src/main/java/com/azure/core/util/Configuration.java | 8 +++++++- .../identity/implementation/IdentityClientOptions.java | 4 +++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java index bf7b8cbd4a8e9..d899fa9e601f9 100644 --- a/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java +++ b/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java @@ -84,7 +84,12 @@ public class Configuration implements Cloneable { * Name of the Azure cloud to connect to. */ public static final String PROPERTY_AZURE_CLOUD = "AZURE_CLOUD"; - + + /** + * The Azure Active Directory endpoint to connect to. + */ + public static final String PROPERTY_AZURE_AUTHORITY_HOST = "AZURE_AUTHORITY_HOST"; + /** * Disables telemetry collection. */ @@ -117,6 +122,7 @@ public class Configuration implements Cloneable { PROPERTY_AZURE_TENANT_ID, PROPERTY_AZURE_RESOURCE_GROUP, PROPERTY_AZURE_CLOUD, + PROPERTY_AZURE_AUTHORITY_HOST, PROPERTY_AZURE_TELEMETRY_DISABLED, PROPERTY_AZURE_LOG_LEVEL, PROPERTY_AZURE_TRACING_DISABLED, diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java index fb8db6f635ebc..a363378e2bd8a 100644 --- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java +++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java @@ -26,7 +26,9 @@ public final class IdentityClientOptions { * Creates an instance of IdentityClientOptions with default settings. */ public IdentityClientOptions() { - authorityHost = DEFAULT_AUTHORITY_HOST; + Configuration configuration = Configuration.getGlobalConfiguration(); + authorityHost = configuration.contains(configuration.PROPERTY_AZURE_AUTHORITY_HOST) + ? configuration.get(configuration.PROPERTY_AZURE_AUTHORITY_HOST) : DEFAULT_AUTHORITY_HOST; maxRetry = MAX_RETRY_DEFAULT_LIMIT; retryTimeout = i -> Duration.ofSeconds((long) Math.pow(2, i.getSeconds() - 1)); } From 93afcb85632a84e65f9bcf2463b8afd7d2347758 Mon Sep 17 00:00:00 2001 From: Luyunmt <2534523917@qq.com> Date: Mon, 23 Mar 2020 14:54:57 +0800 Subject: [PATCH 2/5] add env authorityhost --- .../com/azure/identity/implementation/IdentityClientOptions.java | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java index a363378e2bd8a..f08514d47bb48 100644 --- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java +++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java @@ -5,6 +5,7 @@ import com.azure.core.http.HttpPipeline; import com.azure.core.http.ProxyOptions; +import com.azure.core.util.Configuration; import java.time.Duration; import java.util.function.Function; From 2ea0e325e5f4f3f6f16ac91cd4cceec7722f6716 Mon Sep 17 00:00:00 2001 From: Luyunmt <2534523917@qq.com> Date: Mon, 23 Mar 2020 17:23:35 +0800 Subject: [PATCH 3/5] add .clone() --- .../azure/identity/implementation/IdentityClientOptions.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java index f08514d47bb48..44c96cd4aab56 100644 --- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java +++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java @@ -27,7 +27,7 @@ public final class IdentityClientOptions { * Creates an instance of IdentityClientOptions with default settings. */ public IdentityClientOptions() { - Configuration configuration = Configuration.getGlobalConfiguration(); + Configuration configuration = Configuration.getGlobalConfiguration().clone(); authorityHost = configuration.contains(configuration.PROPERTY_AZURE_AUTHORITY_HOST) ? configuration.get(configuration.PROPERTY_AZURE_AUTHORITY_HOST) : DEFAULT_AUTHORITY_HOST; maxRetry = MAX_RETRY_DEFAULT_LIMIT; From 28228409c08cd351e00ddeec6c751af406871c60 Mon Sep 17 00:00:00 2001 From: Luyunmt <2534523917@qq.com> Date: Tue, 24 Mar 2020 09:43:21 +0800 Subject: [PATCH 4/5] remove .clone() --- .../azure/identity/implementation/IdentityClientOptions.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java index 44c96cd4aab56..d36973fec4978 100644 --- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java +++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java @@ -27,9 +27,8 @@ public final class IdentityClientOptions { * Creates an instance of IdentityClientOptions with default settings. */ public IdentityClientOptions() { - Configuration configuration = Configuration.getGlobalConfiguration().clone(); - authorityHost = configuration.contains(configuration.PROPERTY_AZURE_AUTHORITY_HOST) - ? configuration.get(configuration.PROPERTY_AZURE_AUTHORITY_HOST) : DEFAULT_AUTHORITY_HOST; + Configuration configuration = Configuration.getGlobalConfiguration(); + authorityHost = configuration.get(Configuration.PROPERTY_AZURE_AUTHORITY_HOST, DEFAULT_AUTHORITY_HOST); maxRetry = MAX_RETRY_DEFAULT_LIMIT; retryTimeout = i -> Duration.ofSeconds((long) Math.pow(2, i.getSeconds() - 1)); } From 3dbaa67b087ad757bb8c1036eb8a8592452d26d6 Mon Sep 17 00:00:00 2001 From: Luyunmt <2534523917@qq.com> Date: Wed, 1 Apr 2020 10:13:19 +0800 Subject: [PATCH 5/5] change azureidentity azurecore version in pom.xml --- sdk/identity/azure-identity/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index faa1e6082757e..67e07146c744e 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -27,7 +27,7 @@ com.azure azure-core - 1.2.0 + 1.4.0-beta.1 org.slf4j