Skip to content
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

Jump to bottom

Update identity release versions Nov 2020 #17367

Merged
merged 4 commits into from
Nov 9, 2020
Merged

Update identity release versions Nov 2020 #17367

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90b231f
Identity updates
Nov 9, 2020
dea4b54
update changelog
Nov 9, 2020
a438766
update README
Nov 9, 2020
05169a0
remove identity unreleased version in version_client.txt
Nov 9, 2020
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
2 changes: 1 addition & 1 deletion eng/jacoco-test-coverage/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion eng/versioning/version_client.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
g2vinay marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
2 changes: 1 addition & 1 deletion sdk/e2e/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/azure-identity-perf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
</dependency>
<dependency>
<groupId>com.azure</groupId>
Expand Down
6 changes: 5 additions & 1 deletion sdk/identity/azure-identity/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/azure-identity/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Maven dependency for Azure Secret Client library. Add it to your project's pom f
<dependency>
<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.1.3</version>
<version>1.2.0</version>
</dependency>
```
[//]: # ({x-version-update-end})
Expand Down
2 changes: 1 addition & 1 deletion sdk/identity/azure-identity/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.azure</groupId>
<artifactId>azure-identity</artifactId>
<version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->

<name>Microsoft Azure client library for Identity</name>
<description>This module contains client library for Microsoft Azure Identity.</description>
Expand Down
12 changes: 4 additions & 8 deletions sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
}
Expand Down