ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-14 02:58:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Give function app resource group scoped contributor role (#1698)

Browse Source 
* Give function app resource group scoped contributor role

* Reenable autoscaling

* We don't know what the minimum capacity for a sku is yet

* Lint
This commit is contained in:
Teo Voinea
2022-03-09 13:07:22 -05:00
committed by GitHub
parent fa8589a3d6
commit 40b0e6685a
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api-service/__app__/onefuzzlib/workers/scalesets.py
View File

@ -268,6 +268,11 @@ class Scaleset(BASE_SCALESET, ORMMixin):
self.scaleset_id, self.scaleset_id,
) )
auto_scaling = self.try_to_enable_auto_scaling()
if isinstance(auto_scaling, Error):
self.set_failed(auto_scaling)
return
identity_result = self.try_set_identity(vmss) identity_result = self.try_set_identity(vmss)
if identity_result: if identity_result:
self.set_failed(identity_result) self.set_failed(identity_result)
@ -869,6 +874,8 @@ class Scaleset(BASE_SCALESET, ORMMixin):
logging.error(capacity_failed) logging.error(capacity_failed)
return capacity_failed return capacity_failed
auto_scale_profile = create_auto_scale_profile(1, capacity, pool_queue_uri) auto_scale_profile = create_auto_scale_profile(
capacity, capacity, pool_queue_uri
)
logging.info("Added auto scale resource to scaleset: %s" % self.scaleset_id) logging.info("Added auto scale resource to scaleset: %s" % self.scaleset_id)
return add_auto_scale_to_vmss(self.scaleset_id, auto_scale_profile) return add_auto_scale_to_vmss(self.scaleset_id, auto_scale_profile)

16
src/deployment/azuredeploy.json
View File

@ -67,6 +67,7 @@
"Storage Account Contributor": "17d1049b-9a84-46fb-8f53-869881c3d3ab", "Storage Account Contributor": "17d1049b-9a84-46fb-8f53-869881c3d3ab",
"Virtual Machine Contributor": "9980e02c-c2be-4d73-94e8-173b1dc7cf3c", "Virtual Machine Contributor": "9980e02c-c2be-4d73-94e8-173b1dc7cf3c",
"Storage Blob Data Reader": "2a2b9908-6ea1-4ae2-8e65-a410df84e7d1", "Storage Blob Data Reader": "2a2b9908-6ea1-4ae2-8e65-a410df84e7d1",
"Contributor": "b24988ac-6180-42a0-ab88-20f7382dd24c",
"keyVaultName": "[concat('of-kv-', uniquestring(resourceGroup().id))]" "keyVaultName": "[concat('of-kv-', uniquestring(resourceGroup().id))]"
}, },
"functions": [ "functions": [
@ -819,6 +820,21 @@
"OWNER": "[parameters('owner')]" "OWNER": "[parameters('owner')]"
} }
}, },
{
"type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2017-09-01",
"name": "[guid(concat(resourceGroup().id, '-contributor'))]",
"properties": {
"roleDefinitionId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/', variables('Contributor'))]",
"principalId": "[reference(resourceId('Microsoft.Web/sites', parameters('name')), '2018-02-01', 'Full').identity.principalId]"
},
"DependsOn": [
"[resourceId('Microsoft.Web/sites', parameters('name'))]"
],
"tags": {
"OWNER": "[parameters('owner')]"
}
},
{ {
"type": "Microsoft.Authorization/roleAssignments", "type": "Microsoft.Authorization/roleAssignments",
"apiVersion": "2018-07-01", "apiVersion": "2018-07-01",