Skip to content

Commit 69a47d0

Browse files
authored
[AZINTS] fix forwarder v4 model upgrade (#938)
1 parent 5c9c801 commit 69a47d0

1 file changed

Lines changed: 49 additions & 6 deletions

File tree

azure/eventhub_log_forwarder/function_template.json

Lines changed: 49 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
},
6565
"variables": {
6666
"storageAccountName": "[concat(uniquestring(resourceGroup().id), 'storageacct')]",
67-
"authRule": "[resourceId('Microsoft.EventHub/namespaces/authorizationRules', parameters('eventhubNamespace'),'RootManageSharedAccessKey')]"
67+
"eventHubAuthRule": "[resourceId('Microsoft.EventHub/namespaces/authorizationRules', parameters('eventhubNamespace'),'RootManageSharedAccessKey')]"
6868
},
6969
"resources": [
7070
{
@@ -129,7 +129,7 @@
129129
},
130130
{
131131
"name": "EVENTHUB_CONNECTION_STRING",
132-
"value": "[listKeys(variables('authRule'),'2017-04-01').primaryConnectionString]"
132+
"value": "[listKeys(variables('eventHubAuthRule'),'2017-04-01').primaryConnectionString]"
133133
},
134134
{
135135
"name": "WEBSITE_CONTENTAZUREFILECONNECTIONSTRING",
@@ -143,10 +143,6 @@
143143
"name": "WEBSITE_NODE_DEFAULT_VERSION",
144144
"value": "~20"
145145
},
146-
{
147-
"name": "WEBSITE_RUN_FROM_PACKAGE",
148-
"value": "1"
149-
},
150146
{
151147
"name": "SCM_DO_BUILD_DURING_DEPLOYMENT",
152148
"value": "true"
@@ -165,6 +161,53 @@
165161
"dependsOn": [
166162
"[resourceId('Microsoft.Web/sites', parameters('functionAppName'))]"
167163
]
164+
},
165+
{
166+
"type": "Microsoft.ManagedIdentity/userAssignedIdentities",
167+
"apiVersion": "2023-01-31",
168+
"name": "[concat('syncFunctionTriggers-', parameters('functionAppName'), '-identity')]",
169+
"location": "[parameters('location')]"
170+
},
171+
{
172+
"type": "Microsoft.Authorization/roleAssignments",
173+
"apiVersion": "2022-04-01",
174+
"name": "[guid('syncFunctionTriggers-', parameters('functionAppName'))]",
175+
"properties": {
176+
"roleDefinitionId": "[resourceId('Microsoft.Authorization/roleDefinitions', 'de139f84-1756-47ae-9be6-808fbbe84772')]",
177+
"principalId": "[reference(resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', concat('syncFunctionTriggers-', parameters('functionAppName'), '-identity')), '2023-01-31').principalId]",
178+
"principalType": "ServicePrincipal"
179+
},
180+
"dependsOn": [
181+
"[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', concat('syncFunctionTriggers-', parameters('functionAppName'), '-identity'))]"
182+
]
183+
},
184+
{
185+
"type": "Microsoft.Resources/deploymentScripts",
186+
"apiVersion": "2023-08-01",
187+
"name": "[concat('syncFunctionTriggers-', parameters('functionAppName'))]",
188+
"location": "[parameters('location')]",
189+
"kind": "AzureCLI",
190+
"identity": {
191+
"type": "UserAssigned",
192+
"userAssignedIdentities": {
193+
"[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', concat('syncFunctionTriggers-', parameters('functionAppName'), '-identity'))]": {}
194+
}
195+
},
196+
"properties": {
197+
"azCliVersion": "2.67.0",
198+
"scriptContent": "[format('az rest --url ''{0}{1}/syncfunctiontriggers?api-version=2024-04-01'' --method post', environment().resourceManager, resourceId('Microsoft.Web/sites', parameters('functionAppName')))]",
199+
"timeout": "PT30M",
200+
"cleanupPreference": "OnSuccess",
201+
"retentionInterval": "P1D",
202+
"storageAccountSettings": {
203+
"storageAccountName": "[variables('storageAccountName')]",
204+
"storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('storageAccountName')), '2019-06-01').keys[0].value]"
205+
}
206+
},
207+
"dependsOn": [
208+
"[resourceId('Microsoft.ManagedIdentity/userAssignedIdentities', concat('syncFunctionTriggers-', parameters('functionAppName'), '-identity'))]",
209+
"[resourceId('Microsoft.Web/sites/extensions', parameters('functionAppName'), 'zipdeploy')]"
210+
]
168211
}
169212
]
170213
}

0 commit comments

Comments
 (0)