From 90b231fa0d9cad7dadfd91ca2094a40267aacf1f Mon Sep 17 00:00:00 2001 From: g2vinay Date: Mon, 9 Nov 2020 13:10:39 -0800 Subject: [PATCH 1/4] Identity updates --- eng/jacoco-test-coverage/pom.xml | 2 +- eng/versioning/version_client.txt | 2 +- sdk/e2e/pom.xml | 2 +- sdk/identity/azure-identity-perf/pom.xml | 2 +- sdk/identity/azure-identity/pom.xml | 2 +- .../azure/identity/ManagedIdentityCredential.java | 12 ++++-------- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/eng/jacoco-test-coverage/pom.xml b/eng/jacoco-test-coverage/pom.xml index d3ac8b616de74..56270fc5c27c7 100644 --- a/eng/jacoco-test-coverage/pom.xml +++ b/eng/jacoco-test-coverage/pom.xml @@ -169,7 +169,7 @@ com.azure azure-identity - 1.2.0-beta.3 + 1.2.0 com.azure diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index f62077bfded3c..bddc27b451217 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -68,7 +68,7 @@ com.azure:azure-data-schemaregistry-avro;1.0.0-beta.4;1.0.0-beta.5 com.azure:azure-data-tables;12.0.0-beta.2;12.0.0-beta.3 com.azure:azure-digitaltwins-core;1.0.1;1.1.0-beta.1 com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1 -com.azure:azure-identity;1.1.3;1.2.0-beta.3 +com.azure:azure-identity;1.1.3;1.2.0 com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1 com.azure:azure-messaging-eventgrid;2.0.0-beta.3;2.0.0-beta.4 com.azure:azure-messaging-eventhubs;5.3.1;5.4.0-beta.1 diff --git a/sdk/e2e/pom.xml b/sdk/e2e/pom.xml index 25b3e8e067cef..445e04eefdec4 100644 --- a/sdk/e2e/pom.xml +++ b/sdk/e2e/pom.xml @@ -33,7 +33,7 @@ com.azure azure-identity - 1.2.0-beta.3 + 1.2.0 com.azure diff --git a/sdk/identity/azure-identity-perf/pom.xml b/sdk/identity/azure-identity-perf/pom.xml index 01eeec8a4c4d0..878c4f5cb5e33 100644 --- a/sdk/identity/azure-identity-perf/pom.xml +++ b/sdk/identity/azure-identity-perf/pom.xml @@ -27,7 +27,7 @@ com.azure azure-identity - 1.2.0-beta.3 + 1.2.0 com.azure diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml index 6338f5ecda7dc..d2651107b7522 100644 --- a/sdk/identity/azure-identity/pom.xml +++ b/sdk/identity/azure-identity/pom.xml @@ -6,7 +6,7 @@ com.azure azure-identity - 1.2.0-beta.3 + 1.2.0 Microsoft Azure client library for Identity This module contains client library for Microsoft Azure Identity. diff --git a/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java b/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java index f21c644a22a80..3aa5429b5848a 100644 --- a/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java +++ b/sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java @@ -38,12 +38,10 @@ public final class ManagedIdentityCredential implements TokenCredential { .identityClientOptions(identityClientOptions) .build(); Configuration configuration = Configuration.getGlobalConfiguration().clone(); -//<<<<<<< HEAD -// if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) { -// appServiceMSICredential = new AppServiceMsiCredential(clientId, identityClient); -// virtualMachineMSICredential = null; -//======= - if (configuration.contains(Configuration.PROPERTY_IDENTITY_ENDPOINT)) { + + if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) { + managedIdentityServiceCredential = new AppServiceMsiCredential(clientId, identityClient); + } else if (configuration.contains(Configuration.PROPERTY_IDENTITY_ENDPOINT)) { if (configuration.contains(Configuration.PROPERTY_IDENTITY_HEADER)) { if (configuration.contains(PROPERTY_IDENTITY_SERVER_THUMBPRINT)) { managedIdentityServiceCredential = new ServiceFabricMsiCredential(clientId, identityClient); @@ -55,8 +53,6 @@ public final class ManagedIdentityCredential implements TokenCredential { } else { managedIdentityServiceCredential = new VirtualMachineMsiCredential(clientId, identityClient); } - } else if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) { - managedIdentityServiceCredential = new AppServiceMsiCredential(clientId, identityClient); } else { managedIdentityServiceCredential = new VirtualMachineMsiCredential(clientId, identityClient); } From dea4b54a3d9b8e6021d071cec54ce1dc4cabbb2e Mon Sep 17 00:00:00 2001 From: g2vinay Date: Mon, 9 Nov 2020 13:21:44 -0800 Subject: [PATCH 2/4] update changelog --- sdk/identity/azure-identity/CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/CHANGELOG.md b/sdk/identity/azure-identity/CHANGELOG.md index 9c2930b1c93ce..8ca622e8f38d6 100644 --- a/sdk/identity/azure-identity/CHANGELOG.md +++ b/sdk/identity/azure-identity/CHANGELOG.md @@ -1,10 +1,14 @@ # Release History -## 1.2.0-beta.3 (Unreleased) +## 1.2.0 (2020-11-09) ### New Features - Added Azure Service Fabric Managed Identity support to `ManagedIdentityCredential` - Added Azure Arc Managed Identity support to `ManagedIdentityCredential` +- Added support for Docker Containers in `DefaultAzureCredential` + +### Fixes and improvements +- Prevent `VisualStudioCodeCredential` using invalid authentication data when no user is signed in to Visual Studio Code ### Dependency Updates - Upgraded `azure-core` dependency to 1.10.0 From a4387669832246d962619cd6f98b67d408876ae1 Mon Sep 17 00:00:00 2001 From: g2vinay Date: Mon, 9 Nov 2020 13:24:04 -0800 Subject: [PATCH 3/4] update README --- sdk/identity/azure-identity/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/identity/azure-identity/README.md b/sdk/identity/azure-identity/README.md index 65edc037e5fc1..aaacf628e61dc 100644 --- a/sdk/identity/azure-identity/README.md +++ b/sdk/identity/azure-identity/README.md @@ -24,7 +24,7 @@ Maven dependency for Azure Secret Client library. Add it to your project's pom f com.azure azure-identity - 1.1.3 + 1.2.0 ``` [//]: # ({x-version-update-end}) From 05169a080fddb6eb819b4e79c02bdc30e96d68be Mon Sep 17 00:00:00 2001 From: g2vinay Date: Mon, 9 Nov 2020 14:09:00 -0800 Subject: [PATCH 4/4] remove identity unreleased version in version_client.txt --- eng/versioning/version_client.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/eng/versioning/version_client.txt b/eng/versioning/version_client.txt index bddc27b451217..7afea5f3cbf93 100644 --- a/eng/versioning/version_client.txt +++ b/eng/versioning/version_client.txt @@ -177,7 +177,6 @@ com.microsoft:microsoft-opentelemetry-exporter-azuremonitor;1.0.0-beta.1;1.0.0-b # unreleased_:;dependency-version # note: The unreleased dependencies will not be manipulated with the automatic PR creation code. unreleased_com.azure:azure-core-experimental;1.0.0-beta.9 -unreleased_com.azure:azure-identity;1.2.0-beta.2 unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.7 unreleased_com.azure:azure-messaging-eventhubs;5.3.0