Merge pull request #11756 from daviditkin/bug-function-app

Function App Recompilation

Author: v-prasadboke

Solutions/BloodHound Enterprise/Data Connectors/AzureFunctionBloodHoundEnterprise/function.json

@@ -4,7 +4,7 @@
       "name": "myTimer",
       "type": "timerTrigger",
       "direction": "in",
-      "schedule": "0 0 1,13 * * *" 
+      "schedule": "%Schedule%" 
     }
   ]
 }

Solutions/BloodHound Enterprise/Data Connectors/BloodHoundEnterprise_API_FunctionApp.json

@@ -79,18 +79,7 @@
     },
     {
       "title": "",
-      "description": "**STEP 2 - Choose ONE from the following two deployment options to deploy the connector and the associated Azure Function**\n\n>**IMPORTANT:** Before deploying the BloodHound Enterprise connector, have the Workspace Name (can be copied from the following), as well as the BloodHound Enterprise API authorization key(s) or Token, readily available.",
-      "instructions": [
-        {
-          "parameters": {
-            "fillWith": [
-              "workspaceName"
-            ],
-            "label": "Workspace Name"
-          },
-          "type": "CopyableLabel"
-        }
-      ]
+      "description": "**STEP 2 - Choose ONE from the following two deployment options to deploy the connector and the associated Azure Function**\n\n>**IMPORTANT:** Before deploying the BloodHound Enterprise connector, have the Log Analytics Workspace Name, as well as the BloodHound Enterprise API authorization key(s) or Token, readily available."
     },
     {
       "title": "",

Solutions/BloodHound Enterprise/Data Connectors/Makefile

@@ -0,0 +1,30 @@
+.PHONY: build clean package
+
+# Packaging variables
+FUNCTION_NAME := function
+BINARY_NAME := function
+ZIP_NAME := bhe-funcapp.zip
+
+# Go build variables
+GOOS := linux
+GOARCH := amd64
+
+# Package the function app
+package: build
+	@echo "Packaging"
+	rm -f $(ZIP_NAME)
+	zip -r $(ZIP_NAME) AzureFunctionBloodHoundEnterprise/ AzureFunctionBloodHoundEnterprise/function.json function host.json
+	@echo "Packaging complete"
+
+# Build binary
+build: clean
+	@echo "Building $(BINARY_NAME)"
+	GOOS=$(GOOS) GOARCH=$(GOARCH) go build -o $(BINARY_NAME) 
+
+# Clean up build artifacts
+clean:
+	@echo "Clean"
+	go clean
+	rm -f $(ZIP_NAME)
+
+

Solutions/BloodHound Enterprise/Data Connectors/azuredeploy_BloodHoundEnterprise_API_FunctionApp.json

@@ -34,6 +34,13 @@
             "metadata": {
                 "description": "Token Key from the BloodHound Enterprise API"
             }
+        },
+        "Schedule": {
+            "type": "string",
+            "defaultValue": "0 0 1,13 * * *",
+            "metadata": {
+                "description": "Please enter a valid Quartz cron schedule. The default runs at 1am and 1pm"
+            }
         }
     },
     "variables": {
@@ -77,6 +84,9 @@
                     "workspaceID": {
                         "value": "[resourceId('Microsoft.OperationalInsights/workspaces', parameters('workspaceName'))]"
                     },
+                    "Schedule": {
+                        "value": "[parameters('Schedule')]"
+                    },
                     "BHEDomain": {
                         "value": "[parameters('BHEDomain')]"
                     },

Solutions/BloodHound Enterprise/Data Connectors/bhe-funcapp.zip

@@ -46,6 +46,13 @@
             "metadata": {
                 "description": " The immutable Id of the Data Collection Rule"
             }
+        },
+        "Schedule": {
+            "type": "string",
+            "defaultValue": "0 0 1,13 * * *",
+            "metadata": {
+                "description": "Please enter a valid Quartz cron schedule. The default runs at 1am and 1pm"
+            }
         }
     },
     "variables": {
@@ -55,6 +62,7 @@
         "KeyVaultName": "[substring(variables('functionName'), 0, 22)]",
         "BHETokenId": "BHETokenId",
         "BHETokenKey": "BHETokenKey",
+        "Schedule": "[parameters('Schedule')]",
         "keyVaultSecretReader": "[format('/subscriptions/){0}/providers/Microsoft.Authorization/roleDefinitions/4633458b-17de-408a-b874-0445c86b69e6', subscription().subscriptionId)]",
         "metricsPublisher": "[format('/subscriptions/){0}/providers/Microsoft.Authorization/roleDefinitions/3913510d-42f4-4e42-8a64-420c390055eb', subscription().subscriptionId)]",
         "uniqueRoleGuidMetricsPublisher": "[guid(resourceId('Microsoft.Storage/storageAccounts', variables('functionName')))]",
@@ -204,6 +212,7 @@
                         "logAnalyticsUri": "[variables('LogAnaltyicsUri')]",
                         "logsIngestionUrl": "[parameters('logsIngestionUrl')]",
                         "dcrImmutableId": "[parameters('dcrImmutableId')]",
+                        "Schedule": "[variables('Schedule')]",
                         "WEBSITE_RUN_FROM_PACKAGE": "https://raw.githubusercontent.com/Azure/Azure-Sentinel/master/Solutions/BloodHound%20Enterprise/Data%20Connectors/bhe-funcapp.zip"
                     }
                 }