Skip to content

Commit 3339bc6

Browse files
authored
Enable AzurePipelinesCredential live test (Azure#23127)
1 parent f8d473b commit 3339bc6

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

sdk/azidentity/azure_pipelines_credential_test.go

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"net/http"
99
"net/url"
1010
"os"
11+
"strings"
1112
"testing"
1213

1314
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
@@ -53,17 +54,28 @@ func TestAzurePipelinesCredential(t *testing.T) {
5354
if recording.GetRecordMode() != recording.LiveMode {
5455
t.Skip("this test runs only live in an Azure Pipeline with a configured service connection")
5556
}
56-
clientID := os.Getenv("AZURE_SERVICE_CONNECTION_CLIENT_ID")
57-
connectionID := os.Getenv("AZURE_SERVICE_CONNECTION_ID")
57+
clientID := os.Getenv("AZURESUBSCRIPTION_CLIENT_ID")
58+
connectionID := os.Getenv("AZURESUBSCRIPTION_SERVICE_CONNECTION_ID")
5859
systemAccessToken := os.Getenv("SYSTEM_ACCESSTOKEN")
59-
tenantID := os.Getenv("AZURE_SERVICE_CONNECTION_TENANT_ID")
60-
for _, s := range []string{clientID, connectionID, systemAccessToken, tenantID} {
61-
if s == "" {
62-
t.Skip("set AZURE_SERVICE_CONNECTION_CLIENT_ID, AZURE_SERVICE_CONNECTION_ID, AZURE_SERVICE_CONNECTION_TENANT_ID and SYSTEM_ACCESSTOKEN to run this test")
63-
}
60+
tenantID := os.Getenv("AZURESUBSCRIPTION_TENANT_ID")
61+
unset := []string{}
62+
if clientID == "" {
63+
unset = append(unset, "AZURESUBSCRIPTION_CLIENT_ID")
64+
}
65+
if connectionID == "" {
66+
unset = append(unset, "AZURESUBSCRIPTION_SERVICE_CONNECTION_ID")
67+
}
68+
if systemAccessToken == "" {
69+
unset = append(unset, "SYSTEM_ACCESSTOKEN")
70+
}
71+
if tenantID == "" {
72+
unset = append(unset, "AZURESUBSCRIPTION_TENANT_ID")
73+
}
74+
if len(unset) > 0 {
75+
t.Skip("no value for ", strings.Join(unset, ", "))
6476
}
6577
cred, err := NewAzurePipelinesCredential(tenantID, clientID, connectionID, systemAccessToken, nil)
6678
require.NoError(t, err)
67-
testGetTokenSuccess(t, cred, "https://vault.azure.net/.default")
79+
testGetTokenSuccess(t, cred)
6880
})
6981
}

sdk/azidentity/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ extends:
2626
parameters:
2727
CloudConfig:
2828
Public:
29+
ServiceConnection: azure-sdk-tests
2930
SubscriptionConfigurations:
3031
- $(sub-config-azure-cloud-test-resources)
3132
- $(sub-config-identity-test-resources)
32-
EnvVars:
33-
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
3433
RunLiveTests: true
3534
ServiceDirectory: azidentity
35+
UseFederatedAuth: true
3636
UsePipelineProxy: false
3737

3838
${{ if endsWith(variables['Build.DefinitionName'], 'weekly') }}:

0 commit comments

Comments
 (0)