Skip to content

Commit 3abe79c

Browse files
vcolin7vcolin7
authored
Update credentials used in Synapse tests (#41116)
* Updated the types of credentials to use in test files. * Updated CHANGELOGs to fix failing Analyze step in pipeline. * Updated POM version for Synapse Monitoring. * Updated version_client.txt
1 parent 6c103b8 commit 3abe79c

File tree

6 files changed

+111
-10
lines changed

6 files changed

+111
-10
lines changed

‎eng/versioning/version_client.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ com.azure:azure-analytics-synapse-accesscontrol;1.0.0-beta.4;1.0.0-beta.5
6161
com.azure:azure-analytics-synapse-artifacts;1.0.0-beta.15;1.0.0-beta.16
6262
com.azure:azure-analytics-synapse-spark;1.0.0-beta.5;1.0.0-beta.6
6363
com.azure:azure-analytics-synapse-managedprivateendpoints;1.0.0-beta.5;1.0.0-beta.6
64-
com.azure:azure-analytics-synapse-monitoring;1.0.0-beta.3;1.0.0-beta.4
64+
com.azure:azure-analytics-synapse-monitoring;1.0.0-beta.4;1.0.0-beta.5
6565
com.azure:azure-aot-graalvm-support;1.0.0-beta.3;1.0.0-beta.4
6666
com.azure:azure-aot-graalvm-support-netty;1.0.0-beta.3;1.0.0-beta.4
6767
com.azure:azure-aot-graalvm-samples;1.0.0-beta.1;1.0.0-beta.1

‎sdk/synapse/azure-analytics-synapse-accesscontrol/CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
## 1.0.0-beta.5 (Unreleased)
44

5+
### Features Added
6+
7+
### Breaking Changes
8+
9+
### Bugs Fixed
10+
11+
### Other Changes
512

613
## 1.0.0-beta.4 (2021-08-10)
714
- Update to 2020-12-01 API version

‎sdk/synapse/azure-analytics-synapse-artifacts/src/test/java/com/azure/analytics/synapse/artifacts/ArtifactsClientTestBase.java

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,13 @@
2525
import com.azure.core.test.utils.MockTokenCredential;
2626
import com.azure.core.util.Configuration;
2727
import com.azure.core.util.CoreUtils;
28+
import com.azure.identity.AzureCliCredentialBuilder;
29+
import com.azure.identity.AzureDeveloperCliCredentialBuilder;
30+
import com.azure.identity.AzurePipelinesCredentialBuilder;
31+
import com.azure.identity.AzurePowerShellCredentialBuilder;
32+
import com.azure.identity.ChainedTokenCredentialBuilder;
2833
import com.azure.identity.DefaultAzureCredentialBuilder;
34+
import com.azure.identity.EnvironmentCredentialBuilder;
2935

3036
import java.util.ArrayList;
3137
import java.util.List;
@@ -66,10 +72,46 @@ protected String getEndpoint() {
6672
<T> T clientSetup(Function<HttpPipeline, T> clientBuilder) {
6773
TokenCredential credential;
6874

69-
if (interceptorManager.isPlaybackMode()) {
70-
credential = new MockTokenCredential();
71-
} else {
72-
credential = new DefaultAzureCredentialBuilder().build();
75+
switch (getTestMode()) {
76+
case RECORD:
77+
credential = new DefaultAzureCredentialBuilder().build();
78+
79+
break;
80+
case LIVE:
81+
Configuration config = Configuration.getGlobalConfiguration();
82+
83+
ChainedTokenCredentialBuilder chainedTokenCredentialBuilder = new ChainedTokenCredentialBuilder()
84+
.addLast(new EnvironmentCredentialBuilder().build())
85+
.addLast(new AzureCliCredentialBuilder().build())
86+
.addLast(new AzureDeveloperCliCredentialBuilder().build())
87+
.addLast(new AzurePowerShellCredentialBuilder().build());
88+
89+
String serviceConnectionId = config.get("AZURESUBSCRIPTION_SERVICE_CONNECTION_ID");
90+
String clientId = config.get("AZURESUBSCRIPTION_CLIENT_ID");
91+
String tenantId = config.get("AZURESUBSCRIPTION_TENANT_ID");
92+
String systemAccessToken = config.get("SYSTEM_ACCESSTOKEN");
93+
94+
if (!CoreUtils.isNullOrEmpty(serviceConnectionId)
95+
&& !CoreUtils.isNullOrEmpty(clientId)
96+
&& !CoreUtils.isNullOrEmpty(tenantId)
97+
&& !CoreUtils.isNullOrEmpty(systemAccessToken)) {
98+
99+
chainedTokenCredentialBuilder.addLast(new AzurePipelinesCredentialBuilder()
100+
.systemAccessToken(systemAccessToken)
101+
.clientId(clientId)
102+
.tenantId(tenantId)
103+
.serviceConnectionId(serviceConnectionId)
104+
.build());
105+
}
106+
107+
credential = chainedTokenCredentialBuilder.build();
108+
109+
break;
110+
default:
111+
// On PLAYBACK mode
112+
credential = new MockTokenCredential();
113+
114+
break;
73115
}
74116

75117
HttpClient httpClient;

‎sdk/synapse/azure-analytics-synapse-monitoring/CHANGELOG.md

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

3+
## 1.0.0-beta.5 (Unreleased)
4+
5+
### Features Added
6+
7+
### Breaking Changes
8+
9+
### Bugs Fixed
10+
11+
### Other Changes
12+
313
## 1.0.0-beta.4 (2021-08-10)
414

515
### Features Added

‎sdk/synapse/azure-analytics-synapse-monitoring/pom.xml

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

1414
<groupId>com.azure</groupId>
1515
<artifactId>azure-analytics-synapse-monitoring</artifactId>
16-
<version>1.0.0-beta.4</version> <!-- {x-version-update;com.azure:azure-analytics-synapse-monitoring;current} -->
16+
<version>1.0.0-beta.5</version> <!-- {x-version-update;com.azure:azure-analytics-synapse-monitoring;current} -->
1717

1818
<name>Microsoft Azure client library for Synapse Monitoring</name>
1919
<description>This package contains the Microsoft Azure Synapse Analytics Monitoring SDK.</description>

‎sdk/synapse/azure-analytics-synapse-spark/src/test/java/com/azure/analytics/synapse/spark/SparkClientTestBase.java

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,13 @@
2424
import com.azure.core.test.utils.MockTokenCredential;
2525
import com.azure.core.util.Configuration;
2626
import com.azure.core.util.CoreUtils;
27+
import com.azure.identity.AzureCliCredentialBuilder;
28+
import com.azure.identity.AzureDeveloperCliCredentialBuilder;
29+
import com.azure.identity.AzurePipelinesCredentialBuilder;
30+
import com.azure.identity.AzurePowerShellCredentialBuilder;
31+
import com.azure.identity.ChainedTokenCredentialBuilder;
2732
import com.azure.identity.DefaultAzureCredentialBuilder;
33+
import com.azure.identity.EnvironmentCredentialBuilder;
2834

2935
import java.util.ArrayList;
3036
import java.util.List;
@@ -65,10 +71,46 @@ protected String getSparkPoolName() {
6571
<T> T clientSetup(Function<HttpPipeline, T> clientBuilder) {
6672
TokenCredential credential;
6773

68-
if (interceptorManager.isPlaybackMode()) {
69-
credential = new MockTokenCredential();
70-
} else {
71-
credential = new DefaultAzureCredentialBuilder().build();
74+
switch (getTestMode()) {
75+
case RECORD:
76+
credential = new DefaultAzureCredentialBuilder().build();
77+
78+
break;
79+
case LIVE:
80+
Configuration config = Configuration.getGlobalConfiguration();
81+
82+
ChainedTokenCredentialBuilder chainedTokenCredentialBuilder = new ChainedTokenCredentialBuilder()
83+
.addLast(new EnvironmentCredentialBuilder().build())
84+
.addLast(new AzureCliCredentialBuilder().build())
85+
.addLast(new AzureDeveloperCliCredentialBuilder().build())
86+
.addLast(new AzurePowerShellCredentialBuilder().build());
87+
88+
String serviceConnectionId = config.get("AZURESUBSCRIPTION_SERVICE_CONNECTION_ID");
89+
String clientId = config.get("AZURESUBSCRIPTION_CLIENT_ID");
90+
String tenantId = config.get("AZURESUBSCRIPTION_TENANT_ID");
91+
String systemAccessToken = config.get("SYSTEM_ACCESSTOKEN");
92+
93+
if (!CoreUtils.isNullOrEmpty(serviceConnectionId)
94+
&& !CoreUtils.isNullOrEmpty(clientId)
95+
&& !CoreUtils.isNullOrEmpty(tenantId)
96+
&& !CoreUtils.isNullOrEmpty(systemAccessToken)) {
97+
98+
chainedTokenCredentialBuilder.addLast(new AzurePipelinesCredentialBuilder()
99+
.systemAccessToken(systemAccessToken)
100+
.clientId(clientId)
101+
.tenantId(tenantId)
102+
.serviceConnectionId(serviceConnectionId)
103+
.build());
104+
}
105+
106+
credential = chainedTokenCredentialBuilder.build();
107+
108+
break;
109+
default:
110+
// On PLAYBACK mode
111+
credential = new MockTokenCredential();
112+
113+
break;
72114
}
73115

74116
HttpClient httpClient;

0 commit comments

Comments
 (0)