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

Communication: fix test-resources config #11434

Merged
merged 1 commit into from
Sep 23, 2020
Merged

Communication: fix test-resources config #11434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion sdk/communication/communication-administration/sample.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Used in most samples. Retrieve these values from a Cognitive Services instance
# Used in most samples. Retrieve these values from a Communication Services resource
# in the Azure Portal.
COMMUNICATION_CONNECTION_STRING="endpoint=<endpoint>;accessKey=<accessKey>"

Expand Down
33 changes: 6 additions & 27 deletions sdk/communication/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,30 @@
"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"
memontic-ms marked this conversation as resolved.
Show resolved Hide resolved
},
"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": "UnitedStates"
}
},
{
"type": "Microsoft.Authorization/roleAssignments",
Expand All @@ -69,7 +48,7 @@
"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",
Expand Down