|
8 | 8 | "net/http" |
9 | 9 | "net/url" |
10 | 10 | "os" |
| 11 | + "strings" |
11 | 12 | "testing" |
12 | 13 |
|
13 | 14 | "github.com/Azure/azure-sdk-for-go/sdk/azcore" |
@@ -53,17 +54,28 @@ func TestAzurePipelinesCredential(t *testing.T) { |
53 | 54 | if recording.GetRecordMode() != recording.LiveMode { |
54 | 55 | t.Skip("this test runs only live in an Azure Pipeline with a configured service connection") |
55 | 56 | } |
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") |
58 | 59 | 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, ", ")) |
64 | 76 | } |
65 | 77 | cred, err := NewAzurePipelinesCredential(tenantID, clientID, connectionID, systemAccessToken, nil) |
66 | 78 | require.NoError(t, err) |
67 | | - testGetTokenSuccess(t, cred, "https://vault.azure.net/.default") |
| 79 | + testGetTokenSuccess(t, cred) |
68 | 80 | }) |
69 | 81 | } |
0 commit comments