Skip to content

Commit 7fe7bc1

Browse files
JoshuaLaibeltr0n
andauthored
[Communication] - Testing - Introduce CloudConfig into test.yml (Azure#15105)
* [test.yml] introduce the cloud config * [TestResource] updating new test resources * [testyml] remove the int setting * Update sdk/communication/test-resources.json as per Bert suggestion Co-authored-by: Bert Ong <823691+beltr0n@users.noreply.github.com> * [test-resource] fixing the case sensitive and adding azure subscription id * [test.yml] fixing the config as per PR feedback * [test..yml] update the format to add new line * [testresource] remove communication_endpoint Co-authored-by: Bert Ong <823691+beltr0n@users.noreply.github.com>
1 parent c7d1f11 commit 7fe7bc1

File tree

5 files changed

+56
-21
lines changed

5 files changed

+56
-21
lines changed

sdk/communication/communication-chat/tests.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,10 @@ stages:
77
ServiceDirectory: communication
88
MatrixFilters:
99
- DependencyVersion=^$
10+
CloudConfig:
11+
Public:
12+
SubscriptionConfigurations:
13+
- $(sub-config-azure-cloud-test-resources)
14+
- $(sub-config-communication-services-cloud-test-resources-common)
15+
- $(sub-config-communication-services-cloud-test-resources-js)
16+
Clouds: Public

sdk/communication/communication-identity/tests.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ stages:
55
parameters:
66
PackageName: "@azure/communication-identity"
77
ServiceDirectory: communication
8-
EnvVars:
9-
AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
10-
AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
11-
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
8+
CloudConfig:
9+
Public:
10+
SubscriptionConfigurations:
11+
- $(sub-config-azure-cloud-test-resources)
12+
- $(sub-config-communication-services-cloud-test-resources-common)
13+
- $(sub-config-communication-services-cloud-test-resources-js)
14+
Clouds: Public

sdk/communication/communication-phone-numbers/tests.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,10 @@ stages:
55
parameters:
66
PackageName: "@azure/communication-phone-numbers"
77
ServiceDirectory: communication
8-
EnvVars:
9-
AZURE_SUBSCRIPTION_ID: $(acs-subscription-id)
10-
AZURE_COMMUNICATION_LIVETEST_CONNECTION_STRING: $(communication-livetest-connection-string)
11-
AZURE_PHONE_NUMBER: $(js-communication-livetest-phone-number)
12-
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
13-
AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
14-
AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
15-
COMMUNICATION_SAMPLES_CONNECTION_STRING: $(communication-livetest-connection-string)
8+
CloudConfig:
9+
Public:
10+
SubscriptionConfigurations:
11+
- $(sub-config-azure-cloud-test-resources)
12+
- $(sub-config-communication-services-cloud-test-resources-common)
13+
- $(sub-config-communication-services-cloud-test-resources-js)
14+
Clouds: Public

sdk/communication/communication-sms/tests.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ stages:
55
parameters:
66
PackageName: "@azure/communication-sms"
77
ServiceDirectory: communication
8-
EnvVars:
9-
AZURE_SUBSCRIPTION_ID: $(acs-subscription-id)
10-
AZURE_COMMUNICATION_LIVETEST_CONNECTION_STRING: $(communication-livetest-connection-string)
11-
AZURE_PHONE_NUMBER: $(js-communication-livetest-phone-number)
12-
AZURE_TENANT_ID: $(aad-azure-sdk-test-tenant-id)
13-
AZURE_CLIENT_SECRET: $(aad-azure-sdk-test-client-secret)
14-
AZURE_CLIENT_ID: $(aad-azure-sdk-test-client-id)
8+
CloudConfig:
9+
Public:
10+
SubscriptionConfigurations:
11+
- $(sub-config-azure-cloud-test-resources)
12+
- $(sub-config-communication-services-cloud-test-resources-common)
13+
- $(sub-config-communication-services-cloud-test-resources-js)
14+
Clouds: Public

sdk/communication/test-resources.json

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,24 @@
1818
"metadata": {
1919
"description": "The client OID to grant access to test resources."
2020
}
21+
},
22+
"tenantId": {
23+
"type": "string",
24+
"metadata": {
25+
"description": "The tenant id to which the application and resources belong."
26+
}
27+
},
28+
"testApplicationId": {
29+
"type": "string",
30+
"metadata": {
31+
"description": "The application client id used to run tests."
32+
}
33+
},
34+
"testApplicationSecret": {
35+
"type": "string",
36+
"metadata": {
37+
"description": "The application client secret used to run tests."
38+
}
2139
}
2240
},
2341
"variables": {
@@ -46,9 +64,17 @@
4664
}
4765
],
4866
"outputs": {
49-
"COMMUNICATION_ENDPOINT": {
67+
"AZURE_TENANT_ID": {
68+
"type": "string",
69+
"value": "[parameters('tenantId')]"
70+
},
71+
"AZURE_CLIENT_ID": {
72+
"type": "string",
73+
"value": "[parameters('testApplicationId')]"
74+
},
75+
"AZURE_CLIENT_SECRET": {
5076
"type": "string",
51-
"value": "[concat('https://', parameters('baseName'), '-', parameters('endpointPrefix'), '.communication.azure.com')]"
77+
"value": "[parameters('testApplicationSecret')]"
5278
},
5379
"COMMUNICATION_CONNECTION_STRING": {
5480
"type": "string",

0 commit comments

Comments
 (0)