From 4099b2b819bfb1bb7bcf7004d87e11461f7bd936 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Thu, 13 Feb 2025 14:16:40 -0500 Subject: [PATCH 1/3] remove beta link --- src/data/Extensions.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/data/Extensions.json b/src/data/Extensions.json index ab1dc4c20c95..7f9d8ddcb38e 100644 --- a/src/data/Extensions.json +++ b/src/data/Extensions.json @@ -28,10 +28,6 @@ "helpText": "This integration allows you to manage your CSP licensing from CIPP. Purchase new licenses while adding or editing users in CIPP. Not a Sherweb partner? Sign up for the Sherweb Cloud Services for MSPs program.", "mappingRequired": true, "links": [ - { - "name": "Register for beta", - "url": "https://go.cyberdrain.com/sherweb" - }, { "name": "Sherweb Cloud Services for MSPs", "url": "https://info.sherweb.com/sherweb-cloud-services-for-msps" @@ -495,7 +491,7 @@ "label": "Enable Integration" }, { - "type": "password", + "type": "textField", "name": "CFZTNA.ClientID", "label": "CloudFlare Tunnel Service Account Client ID" }, From d80c64fa18865d973c2e519e8823f9c4439b0d60 Mon Sep 17 00:00:00 2001 From: John Duprey Date: Thu, 13 Feb 2025 14:16:52 -0500 Subject: [PATCH 2/3] fix table width --- src/pages/cipp/advanced/table-maintenance.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/cipp/advanced/table-maintenance.js b/src/pages/cipp/advanced/table-maintenance.js index 849bed69bb43..d6cb9caf1a2b 100644 --- a/src/pages/cipp/advanced/table-maintenance.js +++ b/src/pages/cipp/advanced/table-maintenance.js @@ -274,7 +274,7 @@ const Page = () => { }; return ( - + {pageTitle} @@ -282,7 +282,7 @@ const Page = () => { This page allows you to view and manage data in Azure Tables. This is advanced functionality that should only be used when directed by CyberDrain support. - + Date: Thu, 13 Feb 2025 15:44:34 -0500 Subject: [PATCH 3/3] add role assignments to arm --- deployment/AzureDeploymentTemplate.json | 13 +++++++++++++ .../AzureDeploymentTemplate_regionoptions.json | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/deployment/AzureDeploymentTemplate.json b/deployment/AzureDeploymentTemplate.json index 91ce52c678a7..54cacf9f1064 100644 --- a/deployment/AzureDeploymentTemplate.json +++ b/deployment/AzureDeploymentTemplate.json @@ -241,6 +241,19 @@ "functionAppResourceId": "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]", "functionAppRegion": "[resourceGroup().location]" } + }, + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "2022-04-01", + "name": "[guid(resourceGroup().id, variables('funcAppName'), 'Contributor')]", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]" + ], + "properties": { + "roleDefinitionId": "[concat(subscription().id, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]", + "principalId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]", + "scope": "[resourceGroup().id]" + } } ], "outputs": {} diff --git a/deployment/AzureDeploymentTemplate_regionoptions.json b/deployment/AzureDeploymentTemplate_regionoptions.json index 7e23726404c2..71e0cef97aca 100644 --- a/deployment/AzureDeploymentTemplate_regionoptions.json +++ b/deployment/AzureDeploymentTemplate_regionoptions.json @@ -241,6 +241,19 @@ "functionAppResourceId": "[resourceId('Microsoft.Web/sites/', variables('funcAppName'))]", "functionAppRegion": "[resourceGroup().location]" } + }, + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "2022-04-01", + "name": "[guid(resourceGroup().id, variables('funcAppName'), 'Contributor')]", + "dependsOn": [ + "[resourceId('Microsoft.Web/sites', variables('funcAppName'))]" + ], + "properties": { + "roleDefinitionId": "[concat(subscription().id, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]", + "principalId": "[reference(resourceId('Microsoft.Web/sites', variables('funcAppName')),'2019-08-01', 'full').identity.principalId]", + "scope": "[resourceGroup().id]" + } } ], "outputs": {}