Skip to content

Commit 2b933ef

Browse files
nzthiagonzthiago
authored
Merge pull request #18 from irajbalakrish/master
Resolving Breaking Changes in Deployment
2 parents f6b8872 + 3a9a680 commit 2b933ef

File tree

7 files changed

+26
-23
lines changed

7 files changed

+26
-23
lines changed

‎audio/deploy/microservice.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
"applicationInsightsLocation": {
1818
"type": "string",
19-
"defaultValue": "westus2"
19+
"defaultValue": "[resourceGroup().location]"
2020
}
2121
},
2222
"variables": {
@@ -31,7 +31,7 @@
3131
"blobAccountName": "[concat(variables('resourceNamePrefix'), 'blob', parameters('uniqueResourceNameSuffix'))]",
3232

3333
"cognitiveServicesAccountName": "[concat(variables('resourceNamePrefix'), 'cs', parameters('uniqueResourceNameSuffix'))]",
34-
"cognitiveServicesApiUrl": "https://speech.platform.bing.com/speech/recognition/interactive/cognitiveservices/v1?language=en-us&format=detailed",
34+
"cognitiveServicesApiUrl": "https://westeurope.stt.speech.microsoft.com/speech/recognition/conversation/cognitiveservices/v1&format=detailed",
3535

3636
"eventGridTopicResourceId": "[resourceId(parameters('eventsResourceGroupName'), 'Microsoft.EventGrid/topics', parameters('eventGridTopicName'))]"
3737
},
@@ -119,7 +119,8 @@
119119
"CognitiveServicesSpeechApiKey": "[listKeys(variables('cognitiveServicesAccountName'),'2016-02-01-preview').key1]",
120120
"EventGridTopicEndpoint": "[reference(variables('eventGridTopicResourceId'), '2018-01-01').endpoint]",
121121
"EventGridTopicKey": "[listKeys(variables('eventGridTopicResourceId'), '2018-01-01').key1]",
122-
"BlobConnectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('blobAccountName'), ';AccountKey=', listKeys(variables('blobAccountName'),'2015-05-01-preview').key1)]"
122+
"BlobConnectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('blobAccountName'), ';AccountKey=', listKeys(variables('blobAccountName'),'2015-05-01-preview').key1)]",
123+
"AzureWebJobsSecretStorageType":"Files"
123124
},
124125
"dependsOn": [
125126
"[resourceId('Microsoft.Web/sites', variables('functionsApiAppName'))]",
@@ -159,7 +160,8 @@
159160
"CognitiveServicesSpeechApiKey": "[listKeys(variables('cognitiveServicesAccountName'),'2016-02-01-preview').key1]",
160161
"EventGridTopicEndpoint": "[reference(variables('eventGridTopicResourceId'), '2018-01-01').endpoint]",
161162
"EventGridTopicKey": "[listKeys(variables('eventGridTopicResourceId'), '2018-01-01').key1]",
162-
"BlobConnectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('blobAccountName'), ';AccountKey=', listKeys(variables('blobAccountName'),'2015-05-01-preview').key1)]"
163+
"BlobConnectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('blobAccountName'), ';AccountKey=', listKeys(variables('blobAccountName'),'2015-05-01-preview').key1)]",
164+
"AzureWebJobsSecretStorageType":"Files"
163165
},
164166
"dependsOn": [
165167
"[resourceId('Microsoft.Web/sites', variables('functionsWorkerApiAppName'))]",
@@ -177,12 +179,12 @@
177179
{
178180
"name": "[variables('cognitiveServicesAccountName')]",
179181
"type": "Microsoft.CognitiveServices/accounts",
180-
"location": "global",
182+
"location": "[resourceGroup().location]",
181183
"apiVersion": "2016-02-01-preview",
182184
"sku": {
183185
"name": "S0"
184186
},
185-
"kind": "Bing.Speech",
187+
"kind": "SpeechServices",
186188
"properties": {}
187189
}
188190
]

‎categories/deploy/microservice.json

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@
1414
"type": "string"
1515
},
1616

17-
"applicationInsightsLocation": {
18-
"type": "string",
19-
"defaultValue": "westus2"
20-
},
21-
2217
"bigHugeThesaurusApiKey": {
2318
"type": "string",
2419
"defaultValue": ""
@@ -48,7 +43,7 @@
4843
"name": "[variables('applicationInsightsName')]",
4944
"type": "Microsoft.Insights/components",
5045
"apiVersion": "2014-04-01",
51-
"location": "[parameters('applicationInsightsLocation')]",
46+
"location": "[resourceGroup().location]",
5247
"kind": "other",
5348
"properties": {
5449
"applicationId": "[variables('applicationInsightsName')]"
@@ -109,7 +104,8 @@
109104
"CognitiveServicesSearchApiEndpoint": "[variables('cognitiveServicesSearchApiUrl')]",
110105
"CognitiveServicesSearchApiKey": "[listKeys(variables('cognitiveServicesAccountName'),'2016-02-01-preview').key1]",
111106
"BigHugeThesaurusApiEndpoint": "[variables('bigHugeThesaurusApiUrl')]",
112-
"BigHugeThesaurusApiKey": "[parameters('bigHugeThesaurusApiKey')]"
107+
"BigHugeThesaurusApiKey": "[parameters('bigHugeThesaurusApiKey')]",
108+
"AzureWebJobsSecretStorageType":"Files"
113109
},
114110
"dependsOn": [
115111
"[resourceId('Microsoft.Web/sites', variables('functionsApiAppName'))]",
@@ -153,7 +149,8 @@
153149
"CognitiveServicesSearchApiEndpoint": "[variables('cognitiveServicesSearchApiUrl')]",
154150
"CognitiveServicesSearchApiKey": "[listKeys(variables('cognitiveServicesAccountName'),'2016-02-01-preview').key1]",
155151
"BigHugeThesaurusApiEndpoint": "[variables('bigHugeThesaurusApiUrl')]",
156-
"BigHugeThesaurusApiKey": "[parameters('bigHugeThesaurusApiKey')]"
152+
"BigHugeThesaurusApiKey": "[parameters('bigHugeThesaurusApiKey')]",
153+
"AzureWebJobsSecretStorageType":"Files"
157154
},
158155
"dependsOn": [
159156
"[resourceId('Microsoft.Web/sites', variables('functionsWorkerApiAppName'))]",

‎images/deploy/microservice.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
"applicationInsightsLocation": {
1818
"type": "string",
19-
"defaultValue": "westus2"
19+
"defaultValue": "[resourceGroup().location]"
2020
}
2121
},
2222
"variables": {
@@ -117,7 +117,8 @@
117117
"APPINSIGHTS_INSTRUMENTATIONKEY": "[reference(resourceId('Microsoft.Insights/components', variables('applicationInsightsName')), '2014-04-01').InstrumentationKey]",
118118
"EventGridTopicEndpoint": "[reference(variables('eventGridTopicResourceId'), '2018-01-01').endpoint]",
119119
"EventGridTopicKey": "[listKeys(variables('eventGridTopicResourceId'), '2018-01-01').key1]",
120-
"BlobConnectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('blobAccountName'), ';AccountKey=', listKeys(variables('blobAccountName'),'2015-05-01-preview').key1)]"
120+
"BlobConnectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('blobAccountName'), ';AccountKey=', listKeys(variables('blobAccountName'),'2015-05-01-preview').key1)]",
121+
"AzureWebJobsSecretStorageType":"Files"
121122
},
122123
"dependsOn": [
123124
"[resourceId('Microsoft.Web/sites', variables('functionsApiAppName'))]",
@@ -157,7 +158,8 @@
157158
"EventGridTopicKey": "[listKeys(variables('eventGridTopicResourceId'), '2018-01-01').key1]",
158159
"BlobConnectionString": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('blobAccountName'), ';AccountKey=', listKeys(variables('blobAccountName'),'2015-05-01-preview').key1)]",
159160
"CognitiveServicesVisionApiEndpoint": "[reference(variables('cognitiveServicesAccountName'),'2016-02-01-preview').endpoint]",
160-
"CognitiveServicesVisionApiKey": "[listKeys(variables('cognitiveServicesAccountName'),'2016-02-01-preview').key1]"
161+
"CognitiveServicesVisionApiKey": "[listKeys(variables('cognitiveServicesAccountName'),'2016-02-01-preview').key1]",
162+
"AzureWebJobsSecretStorageType":"Files"
161163
},
162164
"dependsOn": [
163165
"[resourceId('Microsoft.Web/sites', variables('functionsWorkerApiAppName'))]",

‎text/deploy/microservice.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
"applicationInsightsLocation": {
1818
"type": "string",
19-
"defaultValue": "westus2"
19+
"defaultValue": "[resourceGroup().location]"
2020
}
2121
},
2222
"variables": {
@@ -95,7 +95,8 @@
9595
"CosmosDBAccountEndpointUrl": "[reference(variables('cosmosDbAccountName')).documentEndpoint]",
9696
"CosmosDBAccountKey": "[listKeys(variables('cosmosDbAccountName'), '2015-04-08').primaryMasterKey]",
9797
"DatabaseName": "[variables('cosmosDbDatabaseName')]",
98-
"CollectionName": "[variables('cosmosDbCollectionName')]"
98+
"CollectionName": "[variables('cosmosDbCollectionName')]",
99+
"AzureWebJobsSecretStorageType":"Files"
99100
},
100101
"dependsOn": [
101102
"[resourceId('Microsoft.Web/sites', variables('functionsApiAppName'))]",

‎web/deploy/template.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
},
1212
"applicationInsightsLocation": {
1313
"type": "string",
14-
"defaultValue": "westus2"
14+
"defaultValue": "[resourceGroup().location]"
1515
},
1616
"appServicePlanSkuName": {
1717
"type": "string",
@@ -97,7 +97,8 @@
9797
},
9898
"properties": {
9999
"FUNCTION_API_PROXY_ROOT": "[variables('functionAppProxyUrl')]",
100-
"WEBSITE_NODE_DEFAULT_VERSION" : "6.9.1"
100+
"WEBSITE_NODE_DEFAULT_VERSION" : "6.9.1",
101+
"APPINSIGHTS_INSTRUMENTATIONKEY": "[reference(resourceId('Microsoft.Insights/components', variables('applicationInsightsName')), '2014-04-01').InstrumentationKey]"
101102
}
102103
}
103104
],

‎web/src/signalr-web/SignalRMiddleware/EventApp/src/environments/environment.prod.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
export const environment = {
22
production: true,
33
appInsights: {
4-
instrumentationKey: "%INSTRUMENTATION_KEY%"
4+
instrumentationKey: "3e0ab8f5-c675-448c-8a15-08ba5ec45317" /*The web middleware should return the key to the Angular Environment*/
55
}
66
};

‎web/src/signalr-web/SignalRMiddleware/EventApp/src/environments/environment.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
export const environment = {
77
production: false,
88
appInsights: {
9-
instrumentationKey: "%INSTRUMENTATION_KEY%"
9+
instrumentationKey: "3e0ab8f5-c675-448c-8a15-08ba5ec45317"
1010
}
1111
};

0 commit comments

Comments
 (0)