Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updating test-resources for communication #15551

Merged
merged 21 commits into from
Oct 1, 2020
Merged

Updating test-resources for communication #15551

Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
13d8912
Updating test-resources.json to automate live tests
Sep 24, 2020
fbe4cc1
Update spacing
Sep 29, 2020
444fd16
Remove discrepency
Sep 30, 2020
1c56f58
Run against the public cloud
Sep 30, 2020
b564fd6
Skip SMS automation tests for now
Sep 30, 2020
2efb8d5
Skip SMS automation tests for now
Sep 30, 2020
4e33ccb
Merge changes
Oct 1, 2020
e17e758
Remove the test csproj
Oct 1, 2020
5e85b68
Update service projects to remove sms automated tests
Oct 1, 2020
cf5aabb
Update service projects to remove sms automated tests
Oct 1, 2020
21fadf7
Update service projects to remove sms automated tests
Oct 1, 2020
0a7ed52
Update service projects to remove sms automated tests
Oct 1, 2020
db78634
Testing chat fix
Oct 1, 2020
ae865b0
Adding condition to remove sms
Oct 1, 2020
a959d65
Updating condition to remove sms
Oct 1, 2020
81ef3fc
Merge branch 'master' of https://github.com/Azure/azure-sdk-for-net i…
Oct 1, 2020
0070220
Adding sleep to failing chat tests
Oct 1, 2020
e2bc828
Testing chat fix
Oct 1, 2020
6dd939b
Comment out flakey assert
Oct 1, 2020
55dcc00
Clean up
Oct 1, 2020
32b6136
Adding TODOs for tests
Oct 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 11 additions & 32 deletions sdk/communication/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,71 +9,50 @@
"description": "The base resource name."
}
},
"location": {
"type": "string",
"defaultValue": "[resourceGroup().location]",
"metadata": {
"description": "The location of the resource. By default, this is the same as the resource group."
}
},
"endpointPrefix": {
"defaultValue": "communication",
"type": "string"
},
"endpointSuffix": {
"defaultValue": ".communications.azure.net",
"type": "string"
},
"testApplicationOid": {
"type": "string",
"metadata": {
"description": "The client OID to grant access to test resources."
}
},
"testApplicationId": {
"type": "string",
"metadata": {
"description": "The application client ID used to run tests."
}
},
"testApplicationSecret": {
"type": "string",
"metadata": {
"description": "The application client secret used to run tests."
}
}
},
"variables": {
"uniqueSubDomainName": "[format('{0}-{1}', parameters('baseName'), parameters('endpointPrefix'))]",
"endpointValue": "[format('https://{0}-{1}{2}', parameters('baseName'), parameters('endpointPrefix'), parameters('endpointSuffix'))]",
"contributorRoleId": "b24988ac-6180-42a0-ab88-20f7382dd24c"
},
"resources": [
{
"type": "Microsoft.Communication/CommunicationServices",
"apiVersion": "2019-10-10-preview",
"apiVersion": "2020-08-20-preview",
"name": "[variables('uniqueSubDomainName')]",
"location":"[parameters('location')]"
"location": "global",
"properties": {
"dataLocation": "United States"
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2019-04-01-preview",
"name": "[guid(resourceGroup().id, deployment().name, parameters('baseName'), variables('contributorRoleId'))]",
"properties": {
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('contributorRoleId'))]",
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', variables('contributorRoleId'))]",
"principalId": "[parameters('testApplicationOid')]",
"scope": "[resourceGroup().id]"
}
}
],
"outputs": {
"COMMUNICATION_CONNECTION_STRING": {
"type": "string",
"value": "[listKeys(resourceId('Microsoft.Communication/CommunicationServices',variables('uniqueSubDomainName')), '2019-10-10-preview').primaryConnectionString]"
"value": "[listKeys(resourceId('Microsoft.Communication/CommunicationServices',variables('uniqueSubDomainName')), '2020-08-20-preview').primaryConnectionString]"
},
"RESOURCE_GROUP_NAME": {
"type": "string",
"value": "[resourceGroup().Name]"
}
}
}
}
}