Skip to content

Commit 2abad16

Browse files
authored
Update identity release versions Nov 2020 (Azure#17367)
1 parent 1d7b4fb commit 2abad16

File tree

8 files changed

+15
-16
lines changed

8 files changed

+15
-16
lines changed

eng/jacoco-test-coverage/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@
169169
<dependency>
170170
<groupId>com.azure</groupId>
171171
<artifactId>azure-identity</artifactId>
172-
<version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
172+
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
173173
</dependency>
174174
<dependency>
175175
<groupId>com.azure</groupId>

eng/versioning/version_client.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ com.azure:azure-data-schemaregistry-avro;1.0.0-beta.4;1.0.0-beta.5
6868
com.azure:azure-data-tables;12.0.0-beta.2;12.0.0-beta.3
6969
com.azure:azure-digitaltwins-core;1.0.1;1.1.0-beta.1
7070
com.azure:azure-e2e;1.0.0-beta.1;1.0.0-beta.1
71-
com.azure:azure-identity;1.1.3;1.2.0-beta.3
71+
com.azure:azure-identity;1.1.3;1.2.0
7272
com.azure:azure-identity-perf;1.0.0-beta.1;1.0.0-beta.1
7373
com.azure:azure-messaging-eventgrid;2.0.0-beta.3;2.0.0-beta.4
7474
com.azure:azure-messaging-eventhubs;5.3.1;5.4.0-beta.1
@@ -177,7 +177,6 @@ com.microsoft:microsoft-opentelemetry-exporter-azuremonitor;1.0.0-beta.1;1.0.0-b
177177
# unreleased_<groupId>:<artifactId>;dependency-version
178178
# note: The unreleased dependencies will not be manipulated with the automatic PR creation code.
179179
unreleased_com.azure:azure-core-experimental;1.0.0-beta.9
180-
unreleased_com.azure:azure-identity;1.2.0-beta.2
181180
unreleased_com.azure:azure-messaging-servicebus;7.0.0-beta.7
182181
unreleased_com.azure:azure-messaging-eventhubs;5.3.0
183182

sdk/e2e/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>com.azure</groupId>
3535
<artifactId>azure-identity</artifactId>
36-
<version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
36+
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
3737
</dependency>
3838
<dependency>
3939
<groupId>com.azure</groupId>

sdk/identity/azure-identity-perf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<dependency>
2828
<groupId>com.azure</groupId>
2929
<artifactId>azure-identity</artifactId>
30-
<version>1.2.0-beta.3</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
30+
<version>1.2.0</version> <!-- {x-version-update;com.azure:azure-identity;current} -->
3131
</dependency>
3232
<dependency>
3333
<groupId>com.azure</groupId>

sdk/identity/azure-identity/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
# Release History
22

3-
## 1.2.0-beta.3 (Unreleased)
3+
## 1.2.0 (2020-11-09)
44

55
### New Features
66
- Added Azure Service Fabric Managed Identity support to `ManagedIdentityCredential`
77
- Added Azure Arc Managed Identity support to `ManagedIdentityCredential`
8+
- Added support for Docker Containers in `DefaultAzureCredential`
9+
10+
### Fixes and improvements
11+
- Prevent `VisualStudioCodeCredential` using invalid authentication data when no user is signed in to Visual Studio Code
812

913
### Dependency Updates
1014
- Upgraded `azure-core` dependency to 1.10.0

sdk/identity/azure-identity/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Maven dependency for Azure Secret Client library. Add it to your project's pom f
2424
<dependency>
2525
<groupId>com.azure</groupId>
2626
<artifactId>azure-identity</artifactId>
27-
<version>1.1.3</version>
27+
<version>1.2.0</version>
2828
</dependency>
2929
```
3030
[//]: # ({x-version-update-end})

sdk/identity/azure-identity/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

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

1111
<name>Microsoft Azure client library for Identity</name>
1212
<description>This module contains client library for Microsoft Azure Identity.</description>

sdk/identity/azure-identity/src/main/java/com/azure/identity/ManagedIdentityCredential.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,10 @@ public final class ManagedIdentityCredential implements TokenCredential {
3838
.identityClientOptions(identityClientOptions)
3939
.build();
4040
Configuration configuration = Configuration.getGlobalConfiguration().clone();
41-
//<<<<<<< HEAD
42-
// if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) {
43-
// appServiceMSICredential = new AppServiceMsiCredential(clientId, identityClient);
44-
// virtualMachineMSICredential = null;
45-
//=======
46-
if (configuration.contains(Configuration.PROPERTY_IDENTITY_ENDPOINT)) {
41+
42+
if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) {
43+
managedIdentityServiceCredential = new AppServiceMsiCredential(clientId, identityClient);
44+
} else if (configuration.contains(Configuration.PROPERTY_IDENTITY_ENDPOINT)) {
4745
if (configuration.contains(Configuration.PROPERTY_IDENTITY_HEADER)) {
4846
if (configuration.contains(PROPERTY_IDENTITY_SERVER_THUMBPRINT)) {
4947
managedIdentityServiceCredential = new ServiceFabricMsiCredential(clientId, identityClient);
@@ -55,8 +53,6 @@ public final class ManagedIdentityCredential implements TokenCredential {
5553
} else {
5654
managedIdentityServiceCredential = new VirtualMachineMsiCredential(clientId, identityClient);
5755
}
58-
} else if (configuration.contains(Configuration.PROPERTY_MSI_ENDPOINT)) {
59-
managedIdentityServiceCredential = new AppServiceMsiCredential(clientId, identityClient);
6056
} else {
6157
managedIdentityServiceCredential = new VirtualMachineMsiCredential(clientId, identityClient);
6258
}

0 commit comments

Comments
 (0)